Date: Sat, 12 Aug 2023 04:55:36 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 0bc26e325450 - main - clang: Minor build simplification now that armv[45] is not supported Message-ID: <202308120455.37C4ta61074474@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0bc26e32545069586676149efcafae98c3e3dea3 commit 0bc26e32545069586676149efcafae98c3e3dea3 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2022-07-05 16:19:32 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2023-08-12 04:55:10 +0000 clang: Minor build simplification now that armv[45] is not supported Simplify these expressions a little and remove an obsolete comment. Sponsored by: Netflix --- lib/clang/llvm.build.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index 666dff08c222..f9fd62e78f4e 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -38,12 +38,13 @@ TARGET_ARCH?= ${MACHINE_ARCH} BUILD_ARCH?= ${MACHINE_ARCH} # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it. -# arm (for armv4 and armv5 CPUs) always uses the soft float ABI. # For all other targets, we stick with 'unknown'. -.if ${TARGET_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") -TARGET_TRIPLE_ABI= -gnueabihf -.elif ${TARGET_ARCH:Marm*} -TARGET_TRIPLE_ABI= -gnueabi +.if ${TARGET_ARCH:Marm*} +.if !defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "" +TARGET_ABI= -gnueabihf +.else +TARGET_ABI= -gnueabi +.endif .else TARGET_TRIPLE_ABI= .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308120455.37C4ta61074474>