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

Commit 06935290 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Move to a single clang unknown flags list"

parents 15409e8f 02268f01

core/binary.mk

+6 −6
Original line number Diff line number Diff line
@@ -517,8 +517,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 ($(my_clang),true)

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))

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

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

endif



else
@@ -1344,10 +1344,10 @@ my_conlyflags += $(LOCAL_CLANG_CONLYFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PRE 
my_cppflags += $(LOCAL_CLANG_CPPFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CLANG_CPPFLAGS_$(my_32_64_bit_suffix))

my_ldflags += $(LOCAL_CLANG_LDFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CLANG_LDFLAGS_$(my_32_64_bit_suffix))

my_asflags += $(LOCAL_CLANG_ASFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CLANG_ASFLAGS_$(my_32_64_bit_suffix))

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))

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

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

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

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

else

# gcc does not handle hidden functions in a manner compatible with LLVM libcxx

# see b/27908145

core/clang/HOST_x86.mk

+0 −7
Original line number Diff line number Diff line
@@ -50,11 +50,4 @@ CLANG_CONFIG_x86_HOST_EXTRA_LDFLAGS := \ 
  $(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS) \

  -target $(CLANG_CONFIG_x86_HOST_TRIPLE)



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

  $(strip \

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

  $(filter-out $(CLANG_CONFIG_x86_UNKNOWN_CFLAGS),\

  $(1))))

endef



$(clang_2nd_arch_prefix)HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a

core/clang/HOST_x86_64.mk

+0 −7
Original line number Diff line number Diff line
@@ -50,11 +50,4 @@ CLANG_CONFIG_x86_64_HOST_EXTRA_LDFLAGS := \ 
  $(CLANG_CONFIG_x86_64_HOST_COMBO_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



HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a

core/clang/TARGET_arm.mk

+0 −7
Original line number Diff line number Diff line
@@ -37,13 +37,6 @@ CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS := \ 
  -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)RS_TRIPLE := armv7-linux-androideabi

$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=

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

core/clang/TARGET_arm64.mk

+0 −7
Original line number Diff line number Diff line
@@ -36,13 +36,6 @@ CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS := \ 
  -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



RS_TRIPLE := aarch64-linux-android

RS_TRIPLE_CFLAGS :=

RS_COMPAT_TRIPLE := aarch64-linux-android