am 69a86400: Merge "Remove the -O1 WAR for SROA.cpp compilation."

[android-x86/external-llvm.git] / llvm-host-build.mk

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index ca2f258..afe6b4c 100644 (file)
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -1,10 +1,6 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
 LOCAL_CFLAGS :=        \
        -D_GNU_SOURCE   \
        -D__STDC_LIMIT_MACROS   \
-       -D__STDC_CONSTANT_MACROS        \
        -O2     \
        -fomit-frame-pointer    \
        -Wall   \
@@ -15,9 +11,9 @@ LOCAL_CFLAGS :=       \
 
 ifeq ($(LLVM_ENABLE_ASSERTION),true)
 LOCAL_CFLAGS :=        \
+       $(LOCAL_CFLAGS) \
        -D_DEBUG        \
-       -UNDEBUG        \
-       $(LOCAL_CFLAGS)
+       -UNDEBUG
 endif
 
 ifneq ($(REQUIRES_EH),1)
@@ -35,7 +31,8 @@ endif
 
 LOCAL_CPPFLAGS :=      \
        $(LOCAL_CPPFLAGS)       \
-       -Woverloaded-virtual
+       -Woverloaded-virtual    \
+       -Wno-sign-promo
 
 # Make sure bionic is first so we can include system headers.
 LOCAL_C_INCLUDES :=    \
@@ -51,14 +48,13 @@ LOCAL_IS_HOST_MODULE := true
 ###########################################################
 define transform-host-td-to-out
 @mkdir -p $(dir $@)
-@echo "Host TableGen: $(LOCAL_MODULE) (gen-$(1)) <= $<"
+@echo "Host TableGen: $(TBLGEN_LOCAL_MODULE) (gen-$(1)) <= $<"
 $(hide) $(TBLGEN) \
        -I $(dir $<)    \
        -I $(LLVM_ROOT_PATH)/include    \
        -I $(LLVM_ROOT_PATH)/host/include       \
        -I $(LLVM_ROOT_PATH)/lib/Target \
-    -gen-$(strip $(1)) \
-    -o $@ $<
+       $(if $(strip $(CLANG_ROOT_PATH)),-I $(CLANG_ROOT_PATH)/include,)        \
+       -gen-$(strip $(1))      \
+       -o $@ $<
 endef
-
-endif