summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc16
-rw-r--r--lib/clang/clang.build.mk6
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
OpenPOWER on IntegriCloud