Don't pass LOCAL_CFLAGS when compiling assembly code.

Bug: 6967574
Change-Id: Id428884dde3026c32fa6abcabbc88d188b7e9a38

diff --git a/core/binary.mk b/core/binary.mk
index 23bbc81..c59bbc1 100644 (file)
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -140,6 +140,7 @@ endif
 my_compiler_dependencies :=
 ifeq ($(strip $(LOCAL_CLANG)),true)
   LOCAL_CFLAGS += $(CLANG_CONFIG_EXTRA_CFLAGS)
+  LOCAL_ASFLAGS += $(CLANG_CONFIG_EXTRA_ASFLAGS)
   LOCAL_LDFLAGS += $(CLANG_CONFIG_EXTRA_LDFLAGS)
   my_compiler_dependencies := $(CLANG) $(CLANG_CXX)
 endif

diff --git a/core/definitions.mk b/core/definitions.mk
index bf8ce58..3da5d90 100644 (file)
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -924,15 +924,13 @@ $(hide) $(PRIVATE_CC) \
            $(PRIVATE_TARGET_GLOBAL_CFLAGS) \
            $(PRIVATE_ARM_CFLAGS) \
         ) \
-       $(PRIVATE_CFLAGS) \
-       $(1) \
-       $(PRIVATE_DEBUG_CFLAGS) \
+        $(1) \
        -MD -MF $(patsubst %.o,%.d,$@) -o $@ $<
 endef
 
 define transform-c-to-o-no-deps
 @echo "target $(PRIVATE_ARM_MODE) C: $(PRIVATE_MODULE) <= $<"
-$(call transform-c-or-s-to-o-no-deps, )
+$(call transform-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS))
 endef
 
 define transform-s-to-o-no-deps
@@ -958,7 +956,7 @@ endef
 
 define transform-m-to-o-no-deps
 @echo "target ObjC: $(PRIVATE_MODULE) <= $<"
-$(call transform-c-or-s-to-o-no-deps)
+$(call transform-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS))
 endef
 
 define transform-m-to-o
@@ -1013,15 +1011,13 @@ $(hide) $(PRIVATE_CC) \
        $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
            $(HOST_GLOBAL_CFLAGS) \
         ) \
-       $(PRIVATE_CFLAGS) \
        $(1) \
-       $(PRIVATE_DEBUG_CFLAGS) \
        -MD -MF $(patsubst %.o,%.d,$@) -o $@ $<
 endef
 
 define transform-host-c-to-o-no-deps
 @echo "host C: $(PRIVATE_MODULE) <= $<"
-$(call transform-host-c-or-s-to-o-no-deps, )
+$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS))
 endef
 
 define transform-host-s-to-o-no-deps
@@ -1045,7 +1041,7 @@ endef
 
 define transform-host-m-to-o-no-deps
 @echo "host ObjC: $(PRIVATE_MODULE) <= $<"
-$(call transform-host-c-or-s-to-o-no-deps)
+$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS))
 endef
 
 define transform-host-m-to-o

diff --git a/core/llvm_config.mk b/core/llvm_config.mk
index 6d08e78..b1b21e4 100644 (file)
--- a/core/llvm_config.mk
+++ b/core/llvm_config.mk
@@ -53,6 +53,8 @@ ifeq ($(TARGET_ARCH),x86)
     -mfpmath=sse \
     -mbionic
 endif
+#TODO: split out the asflags from CLANG_CONFIG_EXTRA_CFLAGS.
+CLANG_CONFIG_EXTRA_ASFLAGS := $(CLANG_CONFIG_EXTRA_CFLAGS)
 
 CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES := external/clang/lib/include $(TARGET_OUT_HEADERS)/clang