Author: dim
Date: Thu Jan 9 22:16:30 2014
New Revision: 260494
URL: http://svnweb.freebsd.org/changeset/base/260494
Log:
Fix a braino with r259730: we cannot currently use CFLAGS.gcc or
CFLAGS.clang in sys/conf/Makefile.arm, since the main kernel build does
not use <bsd.sys.mk>. So revert that particular change for now.
Pointy hat to: me
Noticed by: zbb
MFC after: 3 days
X-MFC-With: r259730
Modified:
head/sys/conf/Makefile.arm
Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm Thu Jan 9 20:57:19 2014 (r260493)
+++ head/sys/conf/Makefile.arm Thu Jan 9 22:16:30 2014 (r260494)
@@ -39,16 +39,20 @@ SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscri
STRIP_FLAGS = -S
.endif
-CFLAGS.gcc += -mno-thumb-interwork
+.if ${COMPILER_TYPE} != "clang"
+CFLAGS += -mno-thumb-interwork
+.endif
.if empty(DDB_ENABLED)
-.if defined(WITHOUT_ARM_EABI)
-CFLAGS.gcc += -mno-apcs-frame
+.if defined(WITHOUT_ARM_EABI) && ${COMPILER_TYPE} != "clang"
+CFLAGS += -mno-apcs-frame
.endif
.elif !defined(WITHOUT_ARM_EABI)
CFLAGS += -funwind-tables
+.if ${COMPILER_TYPE} == "clang"
# clang requires us to tell it to emit assembly with unwind information
-CFLAGS.clang += -mllvm -arm-enable-ehabi
+CFLAGS += -mllvm -arm-enable-ehabi
+.endif
.endif
SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader ${LDFLAGS} \
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
