diff options
| author | dim <dim@FreeBSD.org> | 2014-01-12 14:37:39 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-01-12 14:37:39 +0000 |
| commit | efe1ed416377f5fae081eecae69aadc367892ba9 (patch) | |
| tree | f075cf0d25dde049143e29e3183ac10f3cf402c6 | |
| parent | dfee5da730b0bd74cac19faaa369cdc53715343b (diff) | |
| download | FreeBSD-src-efe1ed416377f5fae081eecae69aadc367892ba9.zip FreeBSD-src-efe1ed416377f5fae081eecae69aadc367892ba9.tar.gz | |
MFC r260494:
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
| -rw-r--r-- | sys/conf/Makefile.arm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index 5bacbe3..c13272b 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -39,16 +39,20 @@ SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M} 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} \ |
