svn commit: r272357 - in head: . lib/clang
Andrew Turner
andrew at FreeBSD.org
Wed Oct 1 12:47:27 UTC 2014
Author: andrew
Date: Wed Oct 1 12:47:25 2014
New Revision: 272357
URL: https://svnweb.freebsd.org/changeset/base/272357
Log:
Fix the TARGET_ABI value clang uses. It shpuld be gnueabi on all ARM
soft-float architectures, and gnueabihf for hard-float.
Modified:
head/Makefile.inc1
head/lib/clang/clang.build.mk
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Wed Oct 1 12:44:16 2014 (r272356)
+++ head/Makefile.inc1 Wed Oct 1 12:47:25 2014 (r272357)
@@ -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
Modified: head/lib/clang/clang.build.mk
==============================================================================
--- head/lib/clang/clang.build.mk Wed Oct 1 12:44:16 2014 (r272356)
+++ head/lib/clang/clang.build.mk Wed Oct 1 12:47:25 2014 (r272357)
@@ -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
More information about the svn-src-head
mailing list