Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9956bb6a authored by Stephen Hines's avatar Stephen Hines Committed by Gerrit Code Review
Browse files

Merge "Build changes necessary for LLVM 3.5 switch."

parents 847fd031 43d5e1bb

core/binary.mk

+0 −3
Original line number Diff line number Diff line
@@ -149,9 +149,6 @@ ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT)) 
endif



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

core/clang/TARGET_arm.mk

+2 −0
Original line number Diff line number Diff line
@@ -16,12 +16,14 @@ CLANG_CONFIG_arm_TARGET_EXTRA_CFLAGS := \ 
  $(CLANG_CONFIG_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_arm_EXTRA_CFLAGS) \

  -target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \

  $(CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS)



CLANG_CONFIG_arm_TARGET_EXTRA_CPPFLAGS := \

  $(CLANG_CONFIG_EXTRA_CPPFLAGS) \

  $(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \

  $(CLANG_CONFIG_arm_EXTRA_CPPFLAGS) \

  -target $(CLANG_CONFIG_arm_TARGET_TRIPLE)



CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS := \

  $(CLANG_CONFIG_EXTRA_LDFLAGS) \

core/clang/arm.mk

+8 −3
Original line number Diff line number Diff line 
# 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 := \

  -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

CLANG_CONFIG_arm_UNKNOWN_CFLAGS := \

core/clang/arm64.mk

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
CLANG_CONFIG_arm64_EXTRA_ASFLAGS :=



CLANG_CONFIG_arm64_EXTRA_CFLAGS := \

  -mllvm -arm-enable-ehabi



CLANG_CONFIG_arm64_EXTRA_LDFLAGS :=

core/clang/config.mk

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ WITHOUT_TARGET_CLANG := true 
WITHOUT_HOST_CLANG := true

endif



LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.4/bin

LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.4/lib/clang/3.4/include/

LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.5/bin

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_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX)