StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move to a single clang unknown flags list

Browse Source 
Soong is using a single list of unknown clang flags for all
architectures, instead of the per-architecture list here. Collapse this
down to a single list as well so that it can be verified against the
Soong list, and eventually replaced by the Soong version.

Change-Id: If43cd892105da5155907c05965a74b835920a369
This commit is contained in:
Dan Willemsen
2016-05-19 14:39:25 -07:00
parent 15409e8f20
commit 02268f01df
16 changed files with 30 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/clang/HOST_x86.mk
View File

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

7
core/clang/HOST_x86_64.mk
View File

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

7
core/clang/TARGET_arm.mk
View File

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

7
core/clang/TARGET_arm64.mk
View File

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

7
core/clang/TARGET_mips.mk
View File

@@ -37,13 +37,6 @@ CLANG_CONFIG_mips_TARGET_EXTRA_LDFLAGS := \
-B$(CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX)
define $(clang_2nd_arch_prefix)convert-to-clang-flags
$(strip \
$(call subst-clang-incompatible-mips-flags,\
$(filter-out $(CLANG_CONFIG_mips_UNKNOWN_CFLAGS),\
$(1))))
endef
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=
RS_COMPAT_TRIPLE := mipsel-linux-android

7
core/clang/TARGET_mips64.mk
View File

@@ -36,13 +36,6 @@ CLANG_CONFIG_mips64_TARGET_EXTRA_LDFLAGS := \
-B$(CLANG_CONFIG_mips64_TARGET_TOOLCHAIN_PREFIX)
define convert-to-clang-flags
$(strip \
$(call subst-clang-incompatible-mips64-flags,\
$(filter-out $(CLANG_CONFIG_mips64_UNKNOWN_CFLAGS),\
$(1))))
endef
RS_TRIPLE := aarch64-linux-android
RS_TRIPLE_CFLAGS :=
RS_COMPAT_TRIPLE := mips64el-linux-android

7
core/clang/TARGET_x86.mk
View File

@@ -43,13 +43,6 @@ CLANG_CONFIG_x86_TARGET_EXTRA_LDFLAGS := \
-B$(CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX)
define $(clang_2nd_arch_prefix)convert-to-clang-flags
$(strip \
$(call subst-clang-incompatible-x86-flags,\
$(filter-out $(CLANG_CONFIG_x86_UNKNOWN_CFLAGS),\
$(1))))
endef
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__
$(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := i686-linux-android

7
core/clang/TARGET_x86_64.mk
View File

@@ -36,13 +36,6 @@ CLANG_CONFIG_x86_64_TARGET_EXTRA_LDFLAGS := \
-B$(CLANG_CONFIG_x86_64_TARGET_TOOLCHAIN_PREFIX)
define convert-to-clang-flags
$(strip \
$(call subst-clang-incompatible-x86_64-flags,\
$(filter-out $(CLANG_CONFIG_x86_64_UNKNOWN_CFLAGS),\
$(1))))
endef
RS_TRIPLE := aarch64-linux-android
RS_TRIPLE_CFLAGS := -D__x86_64__
RS_COMPAT_TRIPLE := x86_64-linux-android

26
core/clang/arm.mk
View File

@@ -8,34 +8,8 @@ CLANG_CONFIG_arm_EXTRA_CPPFLAGS :=
CLANG_CONFIG_arm_EXTRA_LDFLAGS :=
# Include common unknown flags
CLANG_CONFIG_arm_UNKNOWN_CFLAGS := \
$(CLANG_CONFIG_UNKNOWN_CFLAGS) \
-mthumb-interwork \
-fgcse-after-reload \
-frerun-cse-after-loop \
-frename-registers \
-fno-align-jumps \
-fno-builtin-sin \
-fno-caller-saves \
-fno-early-inlining \
-fno-move-loop-invariants \
-fno-partial-inlining \
-fno-strict-volatile-bitfields \
-fno-tree-copy-prop \
-fno-tree-loop-optimize
ifneq (,$(filter krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
# Android's clang support's krait as a CPU whereas GCC doesn't. Specify
# -mcpu here rather than the more normal core/combo/arch/arm/armv7-a-neon.mk.
CLANG_CONFIG_arm_EXTRA_CFLAGS += -mcpu=krait -mfpu=neon-vfpv4
# This isn't really unknown, but allows us to only set -mcpu=krait
CLANG_CONFIG_arm_UNKNOWN_CFLAGS += -mcpu=cortex-a15
endif
define subst-clang-incompatible-arm-flags
$(subst -march=armv5te,-march=armv5t,\
$(subst -march=armv5e,-march=armv5,\
$(1)))
endef

14
core/clang/arm64.mk
View File

@@ -5,17 +5,3 @@ CLANG_CONFIG_arm64_EXTRA_ASFLAGS :=
CLANG_CONFIG_arm64_EXTRA_CFLAGS :=
CLANG_CONFIG_arm64_EXTRA_LDFLAGS :=
# Include common unknown flags
CLANG_CONFIG_arm64_UNKNOWN_CFLAGS := \
$(CLANG_CONFIG_UNKNOWN_CFLAGS) \
-fgcse-after-reload \
-frerun-cse-after-loop \
-frename-registers \
-fno-strict-volatile-bitfields \
-fno-align-jumps
# We don't have any arm64 flags to substitute yet.
define subst-clang-incompatible-arm64-flags
$(1)
endef

24
core/clang/config.mk
View File

@@ -85,6 +85,30 @@ CLANG_CONFIG_UNKNOWN_CFLAGS := \
-Wunused-but-set-parameter \
-Wunused-but-set-variable \
-fdiagnostics-color \
-mthumb-interwork \
-fgcse-after-reload \
-frerun-cse-after-loop \
-frename-registers \
-fno-align-jumps \
-fno-builtin-sin \
-fno-caller-saves \
-fno-early-inlining \
-fno-move-loop-invariants \
-fno-partial-inlining \
-fno-strict-volatile-bitfields \
-fno-tree-copy-prop \
-fno-tree-loop-optimize \
-msynci \
-mno-synci \
-mno-fused-madd \
-finline-limit=300 \
-fno-inline-functions-called-once \
-mfpmath=sse \
-mbionic
define convert-to-clang-flags
$(strip $(filter-out $(CLANG_CONFIG_UNKNOWN_CFLAGS),$(1)))
endef
# Clang flags for all host rules
CLANG_CONFIG_HOST_EXTRA_ASFLAGS :=

16
core/clang/mips.mk
View File

@@ -3,19 +3,3 @@
CLANG_CONFIG_mips_EXTRA_ASFLAGS :=
CLANG_CONFIG_mips_EXTRA_CFLAGS :=
CLANG_CONFIG_mips_EXTRA_LDFLAGS :=
# Include common unknown flags
CLANG_CONFIG_mips_UNKNOWN_CFLAGS := \
$(CLANG_CONFIG_UNKNOWN_CFLAGS) \
-fno-strict-volatile-bitfields \
-fgcse-after-reload \
-frerun-cse-after-loop \
-frename-registers \
-msynci \
-mno-synci \
-mno-fused-madd
# We don't have any mips flags to substitute yet.
define subst-clang-incompatible-mips-flags
$(1)
endef

16
core/clang/mips64.mk
View File

@@ -3,19 +3,3 @@
CLANG_CONFIG_mips64_EXTRA_ASFLAGS :=
CLANG_CONFIG_mips64_EXTRA_CFLAGS :=
CLANG_CONFIG_mips64_EXTRA_LDFLAGS :=
# Include common unknown flags
CLANG_CONFIG_mips64_UNKNOWN_CFLAGS := \
$(CLANG_CONFIG_UNKNOWN_CFLAGS) \
-fno-strict-volatile-bitfields \
-fgcse-after-reload \
-frerun-cse-after-loop \
-frename-registers \
-msynci \
-mno-synci \
-mno-fused-madd
# We don't have any mips64 flags to substitute yet.
define subst-clang-incompatible-mips64-flags
$(1)
endef

13
core/clang/x86.mk
View File

@@ -4,16 +4,3 @@ CLANG_CONFIG_x86_EXTRA_ASFLAGS := \
-msse3
CLANG_CONFIG_x86_EXTRA_CFLAGS :=
CLANG_CONFIG_x86_EXTRA_LDFLAGS :=
# Include common unknown flags
CLANG_CONFIG_x86_UNKNOWN_CFLAGS := \
$(CLANG_CONFIG_UNKNOWN_CFLAGS) \
-finline-limit=300 \
-fno-inline-functions-called-once \
-mfpmath=sse \
-mbionic
# We don't have any x86 flags to substitute yet.
define subst-clang-incompatible-x86-flags
$(1)
endef

13
core/clang/x86_64.mk
View File

@@ -3,16 +3,3 @@
CLANG_CONFIG_x86_64_EXTRA_ASFLAGS :=
CLANG_CONFIG_x86_64_EXTRA_CFLAGS :=
CLANG_CONFIG_x86_64_EXTRA_LDFLAGS :=
# Include common unknown flags
CLANG_CONFIG_x86_64_UNKNOWN_CFLAGS := \
$(CLANG_CONFIG_UNKNOWN_CFLAGS) \
-finline-limit=300 \
-fno-inline-functions-called-once \
-mfpmath=sse \
-mbionic
# We don't have any x86_64 flags to substitute yet.
define subst-clang-incompatible-x86_64-flags
$(1)
endef