tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Split out ASFLAGS from CFLAGS in Clang config.

Browse source 
Change-Id: I4e3fc3c737fd7c1baff7e30f01d2b26bda557f71
This commit is contained in:
Evgeniy Stepanov 2012-08-21 15:45:56 +04:00 committed by Ying Wang
parent ab42a8341c
commit e1d27e210f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/llvm_config.mk
View file

@ -21,10 +21,12 @@ CLANG_CONFIG_UNKNOWN_CFLAGS := \
-funswitch-loops
ifeq ($(TARGET_ARCH),arm)
CLANG_CONFIG_EXTRA_CFLAGS += \
CLANG_CONFIG_EXTRA_ASFLAGS += \
-target arm-linux-androideabi \
-nostdlibinc \
-B$(TARGET_TOOLCHAIN_ROOT)/arm-linux-androideabi/bin \
-B$(TARGET_TOOLCHAIN_ROOT)/arm-linux-androideabi/bin
CLANG_CONFIG_EXTRA_CFLAGS += \
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
-mllvm -arm-enable-ehabi
CLANG_CONFIG_EXTRA_LDFLAGS += \
-target arm-linux-androideabi \
@ -40,10 +42,11 @@ ifeq ($(TARGET_ARCH),arm)
-Wa,--noexecstack
endif
ifeq ($(TARGET_ARCH),mips)
CLANG_CONFIG_EXTRA_CFLAGS += \
CLANG_CONFIG_EXTRA_ASFLAGS += \
-target mipsel-linux-androideabi \
-nostdlibinc \
-B$(TARGET_TOOLCHAIN_ROOT)/mipsel-linux-android/bin
CLANG_CONFIG_EXTRA_CFLAGS += $(CLANG_CONFIG_EXTRA_ASFLAGS)
CLANG_CONFIG_EXTRA_LDFLAGS += \
-target mipsel-linux-androideabi \
-B$(TARGET_TOOLCHAIN_ROOT)/mipsel-linux-android/bin
@ -59,10 +62,11 @@ ifeq ($(TARGET_ARCH),mips)
-mtune=mips32r2
endif
ifeq ($(TARGET_ARCH),x86)
CLANG_CONFIG_EXTRA_CFLAGS += \
CLANG_CONFIG_EXTRA_ASFLAGS += \
-target i686-linux-android \
-nostdlibinc \
-B$(TARGET_TOOLCHAIN_ROOT)/i686-linux-android/bin
CLANG_CONFIG_EXTRA_CFLAGS += $(CLANG_CONFIG_EXTRA_ASFLAGS)
CLANG_CONFIG_EXTRA_LDFLAGS += \
-target i686-linux-android \
-B$(TARGET_TOOLCHAIN_ROOT)/i686-linux-android/bin
@ -72,8 +76,6 @@ 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