summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2014-11-26 23:28:16 +0000
committerdim <dim@FreeBSD.org>2014-11-26 23:28:16 +0000
commitfbc02fc7b5c32d815c9a2fa4bb1ce1905cdf531b (patch)
tree268bad5c11057deec9f7edc5ea56270f90aedefa
parent9b5367f5960a93b4e560cebb5362018d6804cead (diff)
downloadFreeBSD-src-fbc02fc7b5c32d815c9a2fa4bb1ce1905cdf531b.zip
FreeBSD-src-fbc02fc7b5c32d815c9a2fa4bb1ce1905cdf531b.tar.gz
Since for clang 3.5.0 ARM EHABI is now the default, the -mllvm
-arm-enable-ehabi flag is no longer supported. Use it only for older versions of clang.
-rw-r--r--sys/conf/Makefile.arm6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index e82505b..86b11c6 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -47,8 +47,10 @@ CFLAGS.clang += -mfpu=none
.if !empty(DDB_ENABLED)
CFLAGS += -funwind-tables
-# clang requires us to tell it to emit assembly with unwind information
-CFLAGS.clang += -mllvm -arm-enable-ehabi
+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30500
+# clang < 3.5.0 requires us to tell it to emit assembly with unwind information
+CFLAGS += -mllvm -arm-enable-ehabi
+.endif
.endif
# hack because genassym.c includes sys/bus.h which includes these.
OpenPOWER on IntegriCloud