diff options
author | andrew <andrew@FreeBSD.org> | 2014-10-01 12:47:25 +0000 |
---|---|---|
committer | andrew <andrew@FreeBSD.org> | 2014-10-01 12:47:25 +0000 |
commit | 482caa8bec718bad087d23095fc8ea28d420a9b7 (patch) | |
tree | c06ca459f01c1d866ea06831b1a213362ca84497 | |
parent | 76440c66c22f95d894ea83e4a21e65066e8b55cd (diff) | |
download | FreeBSD-src-482caa8bec718bad087d23095fc8ea28d420a9b7.zip FreeBSD-src-482caa8bec718bad087d23095fc8ea28d420a9b7.tar.gz |
Fix the TARGET_ABI value clang uses. It shpuld be gnueabi on all ARM
soft-float architectures, and gnueabihf for hard-float.
-rw-r--r-- | Makefile.inc1 | 6 | ||||
-rw-r--r-- | lib/clang/clang.build.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 44fddf4..3b92aef 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -337,10 +337,10 @@ XFLAGS+= -B${CROSS_BINUTILS_PREFIX} XFLAGS+= -B${WORLDTMP}/usr/bin .endif .if ${TARGET} == "arm" -.if ${TARGET_ARCH:M*eb*} == "" -TARGET_ABI= gnueabi -.elif ${TARGET_ARCH} == "armv6hf" +.if ${TARGET_ARCH:M*hf*} != "" TARGET_ABI= gnueabihf +.else +TARGET_ABI= gnueabi .endif .endif TARGET_ABI?= unknown diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk index d9a057d..241d15e 100644 --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -22,10 +22,10 @@ CFLAGS+= -fno-strict-aliasing TARGET_ARCH?= ${MACHINE_ARCH} BUILD_ARCH?= ${MACHINE_ARCH} -.if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") -TARGET_ABI= gnueabi -.elif ${TARGET_ARCH} == "armv6hf" +.if ${TARGET_ARCH:Marm*hf*} != "" TARGET_ABI= gnueabihf +.elif ${TARGET_ARCH:Marm*} != "" +TARGET_ABI= gnueabi .else TARGET_ABI= unknown .endif |