svn commit: r260564 - stable/10/sys/conf

[Dimitry Andric]

Author: dim
Date: Sun Jan 12 14:37:39 2014
New Revision: 260564
URL: http://svnweb.freebsd.org/changeset/base/260564

Log:
  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

Modified:
  stable/10/sys/conf/Makefile.arm
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/conf/Makefile.arm
==============================================================================
--- stable/10/sys/conf/Makefile.arm	Sun Jan 12 13:16:25 2014	(r260563)
+++ stable/10/sys/conf/Makefile.arm	Sun Jan 12 14:37:39 2014	(r260564)
@@ -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} \