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

Commit 737a51dd authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Refactor llvm_config.mk and support the 2nd arch"

parents 5e9a2033 1f982838

core/binary.mk

+10 −10
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true) 
  my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)

endif



ifeq ($(strip $(WITHOUT_CLANG)),true)

ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_CLANG)),true)

  LOCAL_CLANG :=

endif
@@ -171,9 +171,9 @@ my_target_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_C_INCLUDES) 
endif # LOCAL_SDK_VERSION



ifeq ($(LOCAL_CLANG),true)

my_target_global_cflags := $(CLANG_TARGET_GLOBAL_CFLAGS)

my_target_global_cppflags := $(CLANG_TARGET_GLOBAL_CPPFLAGS)

my_target_global_ldflags := $(CLANG_TARGET_GLOBAL_LDFLAGS)

my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CFLAGS)

my_target_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CPPFLAGS)

my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_LDFLAGS)

my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES)

else

my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CFLAGS)
@@ -294,8 +294,8 @@ normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb) 
arm_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(arm_objects_mode)_CFLAGS)

normal_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(normal_objects_mode)_CFLAGS)

ifeq ($(strip $(LOCAL_CLANG)),true)

arm_objects_cflags := $(call convert-to-$(my_host)clang-flags,$(arm_objects_cflags))

normal_objects_cflags := $(call convert-to-$(my_host)clang-flags,$(normal_objects_cflags))

arm_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(arm_objects_cflags))

normal_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(normal_objects_cflags))

endif



else
@@ -795,10 +795,10 @@ endif 
###########################################################



ifeq ($(LOCAL_CLANG),true)

my_cflags := $(call convert-to-$(my_host)clang-flags,$(my_cflags))

my_cppflags := $(call convert-to-$(my_host)clang-flags,$(my_cppflags))

my_asflags := $(call convert-to-$(my_host)clang-flags,$(my_asflags))

my_ldflags := $(call convert-to-$(my_host)clang-flags,$(my_ldflags))

my_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_cflags))

my_cppflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_cppflags))

my_asflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_asflags))

my_ldflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_ldflags))

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_YACCFLAGS := $(LOCAL_YACCFLAGS)

core/clang/HOST_x86.mk

0 → 100644
+55 −0
Original line number Diff line number Diff line 


include $(BUILD_SYSTEM)/clang/x86.mk



ifeq ($(HOST_OS),linux)

CLANG_CONFIG_x86_HOST_TRIPLE := i686-linux-gnu

endif

ifeq ($(HOST_OS),darwin)

CLANG_CONFIG_x86_HOST_TRIPLE := i686-apple-darwin

endif

ifeq ($(HOST_OS),windows)

CLANG_CONFIG_x86_HOST_TRIPLE := i686-pc-mingw32

endif



CLANG_CONFIG_x86_HOST_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \

  -target $(CLANG_CONFIG_x86_HOST_TRIPLE) \



CLANG_CONFIG_x86_HOST_EXTRA_CFLAGS := \

  $(CLANG_CONFIG_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_HOST_EXTRA_ASFLAGS)



CLANG_CONFIG_x86_HOST_EXTRA_CPPFLAGS := \

  $(CLANG_CONFIG_EXTRA_CPPFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_CPPFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \



CLANG_CONFIG_x86_HOST_EXTRA_LDFLAGS := \

  $(CLANG_CONFIG_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \

  -target $(CLANG_CONFIG_x86_HOST_TRIPLE) \





define convert-to-host-clang-flags

  $(strip \

  $(call subst-clang-incompatible-x86-flags,\

  $(filter-out $(CLANG_CONFIG_x86_UNKNOWN_CFLAGS),\

  $(1))))

endef



CLANG_HOST_GLOBAL_CFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_GLOBAL_CFLAGS)) \

  $(CLANG_CONFIG_x86_HOST_EXTRA_CFLAGS)



CLANG_HOST_GLOBAL_CPPFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_GLOBAL_CPPFLAGS)) \

  $(CLANG_CONFIG_x86_HOST_EXTRA_CPPFLAGS)



CLANG_HOST_GLOBAL_LDFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_GLOBAL_LDFLAGS)) \

  $(CLANG_CONFIG_x86_HOST_EXTRA_LDFLAGS)

core/clang/HOST_x86_64.mk

0 → 100644
+55 −0
Original line number Diff line number Diff line 


include $(BUILD_SYSTEM)/clang/x86_64.mk



ifeq ($(HOST_OS),linux)

CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-linux-gnu

endif

ifeq ($(HOST_OS),darwin)

CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-apple-darwin

endif

ifeq ($(HOST_OS),windows)

CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-pc-mingw64

endif



CLANG_CONFIG_x86_64_HOST_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_ASFLAGS) \

  -target $(CLANG_CONFIG_x86_64_HOST_TRIPLE) \



CLANG_CONFIG_x86_64_HOST_EXTRA_CFLAGS := \

  $(CLANG_CONFIG_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_64_HOST_EXTRA_ASFLAGS)



CLANG_CONFIG_x86_64_HOST_EXTRA_CPPFLAGS := \

  $(CLANG_CONFIG_EXTRA_CPPFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_CPPFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_CPPFLAGS) \



CLANG_CONFIG_x86_64_HOST_EXTRA_LDFLAGS := \

  $(CLANG_CONFIG_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_LDFLAGS) \

  -target $(CLANG_CONFIG_x86_64_HOST_TRIPLE) \





define convert-to-host-clang-flags

  $(strip \

  $(call subst-clang-incompatible-x86_64-flags,\

  $(filter-out $(CLANG_CONFIG_x86_64_UNKNOWN_CFLAGS),\

  $(1))))

endef



CLANG_HOST_GLOBAL_CFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_GLOBAL_CFLAGS)) \

  $(CLANG_CONFIG_x86_64_HOST_EXTRA_CFLAGS)



CLANG_HOST_GLOBAL_CPPFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_GLOBAL_CPPFLAGS)) \

  $(CLANG_CONFIG_x86_64_HOST_EXTRA_CPPFLAGS)



CLANG_HOST_GLOBAL_LDFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_GLOBAL_LDFLAGS)) \

  $(CLANG_CONFIG_x86_64_HOST_EXTRA_LDFLAGS)

core/clang/TARGET_arm.mk

0 → 100644
+53 −0
Original line number Diff line number Diff line 


include $(BUILD_SYSTEM)/clang/arm.mk



CLANG_CONFIG_arm_TARGET_TRIPLE := arm-linux-androideabi

CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX := \

  $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm_TARGET_TRIPLE)/bin



CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_arm_EXTRA_ASFLAGS) \

  -target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \

  -B$(CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX)



CLANG_CONFIG_arm_TARGET_EXTRA_CFLAGS := \

  $(CLANG_CONFIG_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_arm_EXTRA_CFLAGS) \

  $(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) \



CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS := \

  $(CLANG_CONFIG_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_arm_EXTRA_LDFLAGS) \

  -target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \

  -B$(CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX)





define $(clang_2nd_arch_prefix)convert-to-clang-flags

  $(strip \

  $(call subst-clang-incompatible-arm-flags,\

  $(filter-out $(CLANG_CONFIG_arm_UNKNOWN_CFLAGS),\

  $(1))))

endef



$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CFLAGS := \

  $(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS)) \

  $(CLANG_CONFIG_arm_TARGET_EXTRA_CFLAGS)



$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CPPFLAGS := \

  $(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_CPPFLAGS)) \

  $(CLANG_CONFIG_arm_TARGET_EXTRA_CPPFLAGS)



$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \

  $(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS)) \

  $(CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS)



$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi

core/clang/TARGET_arm64.mk

0 → 100644
+54 −0
Original line number Diff line number Diff line 


include $(BUILD_SYSTEM)/clang/arm64.mk



CLANG_CONFIG_arm64_TARGET_TRIPLE := aarch64-linux-androideabi

CLANG_CONFIG_arm64_TARGET_TOOLCHAIN_PREFIX := \

  $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm64_TARGET_TRIPLE)/bin



CLANG_CONFIG_arm64_TARGET_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_arm64_EXTRA_ASFLAGS) \

  -target $(CLANG_CONFIG_arm64_TARGET_TRIPLE) \

  -B$(CLANG_CONFIG_arm64_TARGET_TOOLCHAIN_PREFIX)



CLANG_CONFIG_arm64_TARGET_EXTRA_CFLAGS := \

  $(CLANG_CONFIG_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_arm64_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_arm64_TARGET_EXTRA_ASFLAGS)



CLANG_CONFIG_arm64_TARGET_EXTRA_CPPFLAGS := \

  $(CLANG_CONFIG_EXTRA_CPPFLAGS) \

  $(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \

  $(CLANG_CONFIG_arm64_EXTRA_CPPFLAGS) \



CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS := \

  $(CLANG_CONFIG_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_arm64_EXTRA_LDFLAGS) \

  -target $(CLANG_CONFIG_arm64_TARGET_TRIPLE) \

  -B$(CLANG_CONFIG_arm64_TARGET_TOOLCHAIN_PREFIX)





define convert-to-clang-flags

  $(strip \

  $(call subst-clang-incompatible-arm64-flags,\

  $(filter-out $(CLANG_CONFIG_arm64_UNKNOWN_CFLAGS),\

  $(1))))

endef



CLANG_TARGET_GLOBAL_CFLAGS := \

  $(call convert-to-clang-flags,$(TARGET_GLOBAL_CFLAGS)) \

  $(CLANG_CONFIG_arm64_TARGET_EXTRA_CFLAGS)



CLANG_TARGET_GLOBAL_CPPFLAGS := \

  $(call convert-to-clang-flags,$(TARGET_GLOBAL_CPPFLAGS)) \

  $(CLANG_CONFIG_arm64_TARGET_EXTRA_CPPFLAGS)



CLANG_TARGET_GLOBAL_LDFLAGS := \

  $(call convert-to-clang-flags,$(TARGET_GLOBAL_LDFLAGS)) \

  $(CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS)



$(warning Incorrect arm64 RS_TRIPLE, fix me!)

RS_TRIPLE := armv7-none-linux-gnueabi