diff options
| author | dim <dim@FreeBSD.org> | 2014-01-09 22:16:30 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-01-09 22:16:30 +0000 |
| commit | b0a91599c99ecbe8edbf4e7b91b2ffd5e07593cd (patch) | |
| tree | 2932ace13b053f132f5cd6a9cb48459671093161 /sys/conf | |
| parent | 0e1ecc8c5727903eefdbce8fb8d4060da0616f83 (diff) | |
| download | FreeBSD-src-b0a91599c99ecbe8edbf4e7b91b2ffd5e07593cd.zip FreeBSD-src-b0a91599c99ecbe8edbf4e7b91b2ffd5e07593cd.tar.gz | |
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
Diffstat (limited to 'sys/conf')
| -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 034bc4d..eacba7b 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} \ |
