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

am 9661b09f: am 9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."

Browse source 
* commit '9661b09ff1fb43014d7777b391531ebe59dd83bc':
  Build changes necessary for LLVM 3.5 switch.
This commit is contained in:
Stephen Hines 2014-04-25 20:57:30 +00:00 committed by Android Git Automerger
commit f0dda8d0cb
6 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/binary.mk
View file

@ -149,9 +149,6 @@ ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT))
endif endif
my_compiler_dependencies := my_compiler_dependencies :=
ifeq ($(strip $(LOCAL_CLANG)),true)
my_compiler_dependencies := $(CLANG) $(CLANG_CXX)
endif
#################################################### ####################################################
## Add FDO flags if FDO is turned on and supported ## Add FDO flags if FDO is turned on and supported

2
core/clang/TARGET_arm.mk
View file

@ -16,12 +16,14 @@ CLANG_CONFIG_arm_TARGET_EXTRA_CFLAGS := \
$(CLANG_CONFIG_EXTRA_CFLAGS) \ $(CLANG_CONFIG_EXTRA_CFLAGS) \
$(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \ $(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \
$(CLANG_CONFIG_arm_EXTRA_CFLAGS) \ $(CLANG_CONFIG_arm_EXTRA_CFLAGS) \
-target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \
$(CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS) $(CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS)
CLANG_CONFIG_arm_TARGET_EXTRA_CPPFLAGS := \ CLANG_CONFIG_arm_TARGET_EXTRA_CPPFLAGS := \
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_EXTRA_CPPFLAGS) \
$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
$(CLANG_CONFIG_arm_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_arm_EXTRA_CPPFLAGS) \
-target $(CLANG_CONFIG_arm_TARGET_TRIPLE)
CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS := \ CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS := \
$(CLANG_CONFIG_EXTRA_LDFLAGS) \ $(CLANG_CONFIG_EXTRA_LDFLAGS) \

11
core/clang/arm.mk
View file

@ -1,11 +1,16 @@
# Clang flags for arm arch, target or host. # Clang flags for arm arch, target or host.
CLANG_CONFIG_arm_EXTRA_ASFLAGS := CLANG_CONFIG_arm_EXTRA_ASFLAGS := \
-no-integrated-as
CLANG_CONFIG_arm_EXTRA_CFLAGS := \ CLANG_CONFIG_arm_EXTRA_CFLAGS := \
-mllvm -arm-enable-ehabi -no-integrated-as
CLANG_CONFIG_arm_EXTRA_LDFLAGS := CLANG_CONFIG_arm_EXTRA_CPPFLAGS := \
-no-integrated-as
CLANG_CONFIG_arm_EXTRA_LDFLAGS := \
-no-integrated-as
# Include common unknown flags # Include common unknown flags
CLANG_CONFIG_arm_UNKNOWN_CFLAGS := \ CLANG_CONFIG_arm_UNKNOWN_CFLAGS := \

1
core/clang/arm64.mk
View file

@ -3,7 +3,6 @@
CLANG_CONFIG_arm64_EXTRA_ASFLAGS := CLANG_CONFIG_arm64_EXTRA_ASFLAGS :=
CLANG_CONFIG_arm64_EXTRA_CFLAGS := \ CLANG_CONFIG_arm64_EXTRA_CFLAGS := \
-mllvm -arm-enable-ehabi
CLANG_CONFIG_arm64_EXTRA_LDFLAGS := CLANG_CONFIG_arm64_EXTRA_LDFLAGS :=

4
core/clang/config.mk
View file

@ -6,8 +6,8 @@ WITHOUT_TARGET_CLANG := true
WITHOUT_HOST_CLANG := true WITHOUT_HOST_CLANG := true
endif endif
LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.4/bin LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.5/bin
LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.4/lib/clang/3.4/include/ LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.5/lib/clang/3.5/include/
CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX) CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)
CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX) CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX)

13
core/clang/x86_common.mk
View file

@ -3,13 +3,14 @@ ifeq ($(HOST_OS),darwin)
endif endif
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \
--gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \ --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
--sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
-no-integrated-as
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \
--gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \ --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
-no-integrated-as
ifneq ($(strip $(BUILD_HOST_64bit)),) ifneq ($(strip $(BUILD_HOST_64bit)),)
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
@ -18,6 +19,7 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
-isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \ -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \
-isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux \ -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux \
-isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \ -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \
-no-integrated-as
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
--gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \ --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
@ -25,7 +27,8 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
-B$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \ -B$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \
-B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \ -B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \
-L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \ -L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \
-L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64/ -L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64/ \
-no-integrated-as
else else
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
--gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \ --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
@ -33,6 +36,7 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
-isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \ -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \
-isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux/32 \ -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux/32 \
-isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \ -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \
-no-integrated-as
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
--gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \ --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
@ -40,7 +44,8 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
-B$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \ -B$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \
-B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \ -B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \
-L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \ -L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \
-L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32/ -L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32/ \
-no-integrated-as
endif endif
endif endif