From 056609ccfe3867e493a3a5313fc410f56e2e2e7a Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 16 May 2016 22:07:31 -0700 Subject: [PATCH] Remove unnecessary variables These are all either recently unused due to the removal of CFLAGS/etc, or have been exported by Soong and are no longer necessary. Change-Id: I5930d43fda21acc8202b3d8ea010fbefb6ae4cf1 --- core/clang/HOST_CROSS_x86.mk | 38 --------------- core/clang/HOST_CROSS_x86_64.mk | 38 --------------- core/clang/HOST_x86.mk | 52 --------------------- core/clang/HOST_x86_64.mk | 52 --------------------- core/clang/HOST_x86_common.mk | 51 -------------------- core/clang/TARGET_arm.mk | 40 ---------------- core/clang/TARGET_arm64.mk | 39 ---------------- core/clang/TARGET_mips.mk | 40 ---------------- core/clang/TARGET_mips64.mk | 39 ---------------- core/clang/TARGET_x86.mk | 46 ------------------- core/clang/TARGET_x86_64.mk | 38 --------------- core/clang/arm.mk | 15 ------ core/clang/arm64.mk | 7 --- core/clang/config.mk | 60 ------------------------ core/clang/mips.mk | 5 -- core/clang/mips64.mk | 5 -- core/clang/x86.mk | 6 --- core/clang/x86_64.mk | 5 -- core/combo/HOST_CROSS_windows-x86.mk | 11 ----- core/combo/HOST_CROSS_windows-x86_64.mk | 11 ----- core/combo/HOST_darwin-x86.mk | 9 ---- core/combo/HOST_darwin-x86_64.mk | 9 ---- core/combo/HOST_linux-x86.mk | 3 -- core/combo/HOST_linux-x86_64.mk | 3 -- core/combo/TARGET_linux-arm.mk | 60 ------------------------ core/combo/TARGET_linux-arm64.mk | 35 -------------- core/combo/TARGET_linux-mips.mk | 47 ------------------- core/combo/TARGET_linux-mips64.mk | 48 ------------------- core/combo/TARGET_linux-x86.mk | 26 ----------- core/combo/TARGET_linux-x86_64.mk | 26 ----------- core/combo/arch/arm/armv5te.mk | 11 ----- core/combo/arch/arm/armv7-a-neon.mk | 53 --------------------- core/combo/arch/arm/armv7-a.mk | 11 ----- core/combo/arch/arm64/armv8-a.mk | 5 -- core/combo/arch/mips/mips32-fp.mk | 8 ---- core/combo/arch/mips/mips32r2-fp-xburst.mk | 10 ---- core/combo/arch/mips/mips32r2-fp.mk | 8 ---- core/combo/arch/mips/mips32r2dsp-fp.mk | 9 ---- core/combo/arch/mips/mips32r2dspr2-fp.mk | 9 ---- core/combo/arch/mips/mips32r6.mk | 8 ---- core/combo/arch/mips64/mips64r2.mk | 4 -- core/combo/arch/mips64/mips64r6.mk | 4 -- core/combo/arch/x86/atom.mk | 6 --- core/combo/arch/x86/haswell.mk | 6 --- core/combo/arch/x86/ivybridge.mk | 6 --- core/combo/arch/x86/sandybridge.mk | 6 --- core/combo/arch/x86/silvermont.mk | 6 --- core/combo/arch/x86/x86.mk | 6 --- core/combo/arch/x86/x86_64.mk | 6 --- core/combo/arch/x86_64/haswell.mk | 4 -- core/combo/arch/x86_64/ivybridge.mk | 4 -- core/combo/arch/x86_64/sandybridge.mk | 4 -- core/combo/arch/x86_64/silvermont.mk | 4 -- core/combo/arch/x86_64/x86_64.mk | 5 -- core/combo/mac_version.mk | 50 -------------------- core/combo/select.mk | 5 -- core/config.mk | 74 +++++------------------------- core/envsetup.mk | 1 + core/executable_internal.mk | 6 +-- core/shared_library_internal.mk | 4 +- 60 files changed, 18 insertions(+), 1189 deletions(-) delete mode 100644 core/clang/HOST_x86_common.mk delete mode 100644 core/clang/arm.mk delete mode 100644 core/clang/arm64.mk delete mode 100644 core/clang/mips.mk delete mode 100644 core/clang/mips64.mk delete mode 100644 core/clang/x86.mk delete mode 100644 core/clang/x86_64.mk delete mode 100644 core/combo/mac_version.mk diff --git a/core/clang/HOST_CROSS_x86.mk b/core/clang/HOST_CROSS_x86.mk index f7b2583e4..bf48f955e 100644 --- a/core/clang/HOST_CROSS_x86.mk +++ b/core/clang/HOST_CROSS_x86.mk @@ -1,39 +1 @@ - -include $(BUILD_SYSTEM)/clang/x86.mk - -CLANG_CONFIG_x86_HOST_CROSS_TRIPLE := i686-pc-mingw32 - -CLANG_CONFIG_x86_HOST_CROSS_EXTRA_ASFLAGS := \ - $(CLANG_CONFIG_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_HOST_CROSS_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_ASFLAGS) \ - -target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE) - -CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CFLAGS := \ - $(CLANG_CONFIG_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_HOST_CROSS_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_ASFLAGS) - -CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CONLYFLAGS := \ - $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_HOST_CROSS_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CONLYFLAGS) - -CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CPPFLAGS := \ - $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_HOST_CROSS_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CPPFLAGS) - -CLANG_CONFIG_x86_HOST_CROSS_EXTRA_LDFLAGS := \ - $(CLANG_CONFIG_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_HOST_CROSS_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_LDFLAGS) \ - -target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE) - $(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a diff --git a/core/clang/HOST_CROSS_x86_64.mk b/core/clang/HOST_CROSS_x86_64.mk index 6d67a7e4c..f921a1c1c 100644 --- a/core/clang/HOST_CROSS_x86_64.mk +++ b/core/clang/HOST_CROSS_x86_64.mk @@ -1,39 +1 @@ - -include $(BUILD_SYSTEM)/clang/x86_64.mk - -CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE := x86_64-pc-mingw32 - -CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_ASFLAGS := \ - $(CLANG_CONFIG_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_HOST_CROSS_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_ASFLAGS) \ - -target $(CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE) - -CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CFLAGS := \ - $(CLANG_CONFIG_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_HOST_CROSS_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_ASFLAGS) - -CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CONLYFLAGS := \ - $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_HOST_CROSS_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CONLYFLAGS) - -CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CPPFLAGS := \ - $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_HOST_CROSS_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CPPFLAGS) - -CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_LDFLAGS := \ - $(CLANG_CONFIG_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_HOST_CROSS_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_LDFLAGS) \ - -target $(CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE) - $(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a diff --git a/core/clang/HOST_x86.mk b/core/clang/HOST_x86.mk index b6e12058f..0722b2a6e 100644 --- a/core/clang/HOST_x86.mk +++ b/core/clang/HOST_x86.mk @@ -1,53 +1 @@ - -include $(BUILD_SYSTEM)/clang/x86.mk -include $(BUILD_SYSTEM)/clang/HOST_x86_common.mk - -ifeq ($(HOST_OS),linux) -CLANG_CONFIG_x86_HOST_TRIPLE := i686-linux-gnu -CLANG_CONFIG_x86_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS) -CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS) -CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS) -CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS) -endif -ifeq ($(HOST_OS),darwin) -CLANG_CONFIG_x86_HOST_TRIPLE := i686-apple-darwin -CLANG_CONFIG_x86_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS) -CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS) -CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CPPFLAGS) -CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_LDFLAGS) -endif - -CLANG_CONFIG_x86_HOST_EXTRA_ASFLAGS := \ - $(CLANG_CONFIG_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_HOST_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_x86_HOST_COMBO_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_COMBO_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_HOST_EXTRA_ASFLAGS) - -CLANG_CONFIG_x86_HOST_EXTRA_CONLYFLAGS := \ - $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_HOST_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CONLYFLAGS) - -CLANG_CONFIG_x86_HOST_EXTRA_CPPFLAGS := \ - $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_HOST_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS) - -CLANG_CONFIG_x86_HOST_EXTRA_LDFLAGS := \ - $(CLANG_CONFIG_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_HOST_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS) \ - -target $(CLANG_CONFIG_x86_HOST_TRIPLE) - $(clang_2nd_arch_prefix)HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a diff --git a/core/clang/HOST_x86_64.mk b/core/clang/HOST_x86_64.mk index e4f72f8df..4fdffd844 100644 --- a/core/clang/HOST_x86_64.mk +++ b/core/clang/HOST_x86_64.mk @@ -1,53 +1 @@ - -include $(BUILD_SYSTEM)/clang/x86_64.mk -include $(BUILD_SYSTEM)/clang/HOST_x86_common.mk - -ifeq ($(HOST_OS),linux) -CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-linux-gnu -CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS) -CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS) -CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS) -CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS) -endif -ifeq ($(HOST_OS),darwin) -CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-apple-darwin -CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS) -CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS) -CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CPPFLAGS) -CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_LDFLAGS) -endif - -CLANG_CONFIG_x86_64_HOST_EXTRA_ASFLAGS := \ - $(CLANG_CONFIG_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_HOST_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_COMBO_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_COMBO_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_EXTRA_ASFLAGS) - -CLANG_CONFIG_x86_64_HOST_EXTRA_CONLYFLAGS := \ - $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_HOST_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CONLYFLAGS) - -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_COMBO_EXTRA_CPPFLAGS) - -CLANG_CONFIG_x86_64_HOST_EXTRA_LDFLAGS := \ - $(CLANG_CONFIG_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_HOST_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS) \ - -target $(CLANG_CONFIG_x86_64_HOST_TRIPLE) - HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a diff --git a/core/clang/HOST_x86_common.mk b/core/clang/HOST_x86_common.mk deleted file mode 100644 index 733329732..000000000 --- a/core/clang/HOST_x86_common.mk +++ /dev/null @@ -1,51 +0,0 @@ -# Shared by HOST_x86.mk and HOST_x86_64.mk. - -ifeq ($(HOST_OS),darwin) -CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS := \ - -integrated-as - -CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS := \ - -integrated-as - -CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS += -fstack-protector-strong -endif - -ifeq ($(HOST_OS),linux) -CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \ - --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \ - --sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \ - -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin - -CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \ - --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) - -CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS += -fstack-protector-strong - -ifneq ($(strip $($(clang_2nd_arch_prefix)HOST_IS_64_BIT)),) -CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \ - -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8 \ - -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/x86_64-linux \ - -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward - -CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \ - --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \ - --sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \ - -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \ - -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8 \ - -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8 \ - -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64 -else -CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \ - -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8 \ - -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/x86_64-linux/32 \ - -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward - -CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \ - --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \ - --sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \ - -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \ - -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8/32 \ - -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8/32 \ - -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32 -endif -endif # Linux diff --git a/core/clang/TARGET_arm.mk b/core/clang/TARGET_arm.mk index a0de716a3..30313f975 100644 --- a/core/clang/TARGET_arm.mk +++ b/core/clang/TARGET_arm.mk @@ -1,42 +1,3 @@ - -include $(BUILD_SYSTEM)/clang/arm.mk - -CLANG_CONFIG_arm_TARGET_TRIPLE := arm-linux-androideabi -CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX := \ - $($(clang_2nd_arch_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) \ - -target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \ - $(CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS) - -CLANG_CONFIG_arm_TARGET_EXTRA_CONLYFLAGS := \ - $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_arm_EXTRA_CONLYFLAGS) - -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) - - $(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 @@ -44,5 +5,4 @@ $(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := armv7-none-linux-gnueabi $(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-arm-android.a # Address sanitizer clang config -$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-arm-android $(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan diff --git a/core/clang/TARGET_arm64.mk b/core/clang/TARGET_arm64.mk index cb62c6105..d50460076 100644 --- a/core/clang/TARGET_arm64.mk +++ b/core/clang/TARGET_arm64.mk @@ -1,41 +1,3 @@ - -include $(BUILD_SYSTEM)/clang/arm64.mk - -CLANG_CONFIG_arm64_TARGET_TRIPLE := aarch64-linux-android -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_CONLYFLAGS := \ - $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_arm64_EXTRA_CONLYFLAGS) - -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) - - RS_TRIPLE := aarch64-linux-android RS_TRIPLE_CFLAGS := RS_COMPAT_TRIPLE := aarch64-linux-android @@ -43,5 +5,4 @@ RS_COMPAT_TRIPLE := aarch64-linux-android TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-aarch64-android.a # Address sanitizer clang config -ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-aarch64-android ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan64 diff --git a/core/clang/TARGET_mips.mk b/core/clang/TARGET_mips.mk index 9e0a4173a..df96c5a5f 100644 --- a/core/clang/TARGET_mips.mk +++ b/core/clang/TARGET_mips.mk @@ -1,42 +1,3 @@ - -include $(BUILD_SYSTEM)/clang/mips.mk - -CLANG_CONFIG_mips_TARGET_TRIPLE := mipsel-linux-android -CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX := \ - $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/mips64el-linux-android/bin - -CLANG_CONFIG_mips_TARGET_EXTRA_ASFLAGS := \ - $(CLANG_CONFIG_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_mips_EXTRA_ASFLAGS) \ - -fPIC \ - -target $(CLANG_CONFIG_mips_TARGET_TRIPLE) \ - -B$(CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX) - -CLANG_CONFIG_mips_TARGET_EXTRA_CFLAGS := \ - $(CLANG_CONFIG_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_mips_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_mips_TARGET_EXTRA_ASFLAGS) - -CLANG_CONFIG_mips_TARGET_EXTRA_CONLYFLAGS := \ - $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_mips_EXTRA_CONLYFLAGS) - -CLANG_CONFIG_mips_TARGET_EXTRA_CPPFLAGS := \ - $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_mips_EXTRA_CPPFLAGS) \ - -CLANG_CONFIG_mips_TARGET_EXTRA_LDFLAGS := \ - $(CLANG_CONFIG_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_mips_EXTRA_LDFLAGS) \ - -target $(CLANG_CONFIG_mips_TARGET_TRIPLE) \ - -B$(CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX) - - $(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi $(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := RS_COMPAT_TRIPLE := mipsel-linux-android @@ -44,5 +5,4 @@ RS_COMPAT_TRIPLE := mipsel-linux-android $(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-mipsel-android.a # Address sanitizer clang config -$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-mips-android $(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan diff --git a/core/clang/TARGET_mips64.mk b/core/clang/TARGET_mips64.mk index 20eae5a55..785752a52 100644 --- a/core/clang/TARGET_mips64.mk +++ b/core/clang/TARGET_mips64.mk @@ -1,41 +1,3 @@ - -include $(BUILD_SYSTEM)/clang/mips64.mk - -CLANG_CONFIG_mips64_TARGET_TRIPLE := mips64el-linux-android -CLANG_CONFIG_mips64_TARGET_TOOLCHAIN_PREFIX := \ - $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_mips64_TARGET_TRIPLE)/bin - -CLANG_CONFIG_mips64_TARGET_EXTRA_ASFLAGS := \ - $(CLANG_CONFIG_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_mips64_EXTRA_ASFLAGS) \ - -target $(CLANG_CONFIG_mips64_TARGET_TRIPLE) \ - -B$(CLANG_CONFIG_mips64_TARGET_TOOLCHAIN_PREFIX) - -CLANG_CONFIG_mips64_TARGET_EXTRA_CFLAGS := \ - $(CLANG_CONFIG_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_mips64_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_mips64_TARGET_EXTRA_ASFLAGS) - -CLANG_CONFIG_mips64_TARGET_EXTRA_CONLYFLAGS := \ - $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_mips64_EXTRA_CONLYFLAGS) - -CLANG_CONFIG_mips64_TARGET_EXTRA_CPPFLAGS := \ - $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_mips64_EXTRA_CPPFLAGS) \ - -CLANG_CONFIG_mips64_TARGET_EXTRA_LDFLAGS := \ - $(CLANG_CONFIG_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_mips64_EXTRA_LDFLAGS) \ - -target $(CLANG_CONFIG_mips64_TARGET_TRIPLE) \ - -B$(CLANG_CONFIG_mips64_TARGET_TOOLCHAIN_PREFIX) - - RS_TRIPLE := aarch64-linux-android RS_TRIPLE_CFLAGS := RS_COMPAT_TRIPLE := mips64el-linux-android @@ -43,5 +5,4 @@ RS_COMPAT_TRIPLE := mips64el-linux-android TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-mips64el-android.a # Address sanitizer clang config -$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-mips64-android $(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan64 diff --git a/core/clang/TARGET_x86.mk b/core/clang/TARGET_x86.mk index d319a01de..f00eb4102 100644 --- a/core/clang/TARGET_x86.mk +++ b/core/clang/TARGET_x86.mk @@ -1,48 +1,3 @@ - -include $(BUILD_SYSTEM)/clang/x86.mk - -CLANG_CONFIG_x86_TARGET_TRIPLE := i686-linux-android -# NOTE: There is no i686-linux-android prebuilt, so we must hardcode the -# x86_64 target instead. -CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX := \ - $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin - -CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS := \ - $(CLANG_CONFIG_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \ - -target $(CLANG_CONFIG_x86_TARGET_TRIPLE) \ - -B$(CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX) - -CLANG_CONFIG_x86_TARGET_EXTRA_CFLAGS := \ - $(CLANG_CONFIG_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS) \ - -mstackrealign - -# -mstackrealign is needed to realign stack in native code -# that could be called from JNI, so that movaps instruction -# will work on assumed stack aligned local variables. - -CLANG_CONFIG_x86_TARGET_EXTRA_CONLYFLAGS := \ - $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_CONLYFLAGS) - -CLANG_CONFIG_x86_TARGET_EXTRA_CPPFLAGS := \ - $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \ - -CLANG_CONFIG_x86_TARGET_EXTRA_LDFLAGS := \ - $(CLANG_CONFIG_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \ - -target $(CLANG_CONFIG_x86_TARGET_TRIPLE) \ - -B$(CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX) - - $(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 @@ -50,5 +5,4 @@ $(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := i686-linux-android $(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686-android.a # Address sanitizer clang config -$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-i686-android $(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan diff --git a/core/clang/TARGET_x86_64.mk b/core/clang/TARGET_x86_64.mk index e57aaf843..0d615f290 100644 --- a/core/clang/TARGET_x86_64.mk +++ b/core/clang/TARGET_x86_64.mk @@ -1,41 +1,3 @@ - -include $(BUILD_SYSTEM)/clang/x86_64.mk - -CLANG_CONFIG_x86_64_TARGET_TRIPLE := x86_64-linux-android -CLANG_CONFIG_x86_64_TARGET_TOOLCHAIN_PREFIX := \ - $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_x86_64_TARGET_TRIPLE)/bin - -CLANG_CONFIG_x86_64_TARGET_EXTRA_ASFLAGS := \ - $(CLANG_CONFIG_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_ASFLAGS) \ - -target $(CLANG_CONFIG_x86_64_TARGET_TRIPLE) \ - -B$(CLANG_CONFIG_x86_64_TARGET_TOOLCHAIN_PREFIX) - -CLANG_CONFIG_x86_64_TARGET_EXTRA_CFLAGS := \ - $(CLANG_CONFIG_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_CFLAGS) \ - $(CLANG_CONFIG_x86_64_TARGET_EXTRA_ASFLAGS) - -CLANG_CONFIG_x86_64_TARGET_EXTRA_CONLYFLAGS := \ - $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_CONLYFLAGS) - -CLANG_CONFIG_x86_64_TARGET_EXTRA_CPPFLAGS := \ - $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_CPPFLAGS) \ - -CLANG_CONFIG_x86_64_TARGET_EXTRA_LDFLAGS := \ - $(CLANG_CONFIG_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \ - $(CLANG_CONFIG_x86_64_EXTRA_LDFLAGS) \ - -target $(CLANG_CONFIG_x86_64_TARGET_TRIPLE) \ - -B$(CLANG_CONFIG_x86_64_TARGET_TOOLCHAIN_PREFIX) - - RS_TRIPLE := aarch64-linux-android RS_TRIPLE_CFLAGS := -D__x86_64__ RS_COMPAT_TRIPLE := x86_64-linux-android diff --git a/core/clang/arm.mk b/core/clang/arm.mk deleted file mode 100644 index f8f9632c4..000000000 --- a/core/clang/arm.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Clang flags for arm arch, target or host. - -CLANG_CONFIG_arm_EXTRA_ASFLAGS := - -CLANG_CONFIG_arm_EXTRA_CFLAGS := - -CLANG_CONFIG_arm_EXTRA_CPPFLAGS := - -CLANG_CONFIG_arm_EXTRA_LDFLAGS := - -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 -endif diff --git a/core/clang/arm64.mk b/core/clang/arm64.mk deleted file mode 100644 index 94b17f59e..000000000 --- a/core/clang/arm64.mk +++ /dev/null @@ -1,7 +0,0 @@ -# Clang flags for arm64 arch, target or host. - -CLANG_CONFIG_arm64_EXTRA_ASFLAGS := - -CLANG_CONFIG_arm64_EXTRA_CFLAGS := - -CLANG_CONFIG_arm64_EXTRA_LDFLAGS := diff --git a/core/clang/config.mk b/core/clang/config.mk index ccfd0f2fe..a269839df 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -16,48 +16,6 @@ RS_CLANG := $(RS_LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX) RS_LLVM_AS := $(RS_LLVM_PREBUILTS_PATH)/llvm-as$(BUILD_EXECUTABLE_SUFFIX) RS_LLVM_LINK := $(RS_LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX) -# Clang flags for all host or target rules -CLANG_CONFIG_EXTRA_ASFLAGS := -CLANG_CONFIG_EXTRA_CFLAGS := -CLANG_CONFIG_EXTRA_CONLYFLAGS := -std=gnu99 -CLANG_CONFIG_EXTRA_CPPFLAGS := -CLANG_CONFIG_EXTRA_LDFLAGS := - -CLANG_CONFIG_EXTRA_CFLAGS += \ - -D__compiler_offsetof=__builtin_offsetof - -# Help catch common 32/64-bit errors. -CLANG_CONFIG_EXTRA_CFLAGS += \ - -Werror=int-conversion - -# Disable overly aggressive warning for macros defined with a leading underscore -# This used to happen in AndroidConfig.h, which was included everywhere. -# TODO: can we remove this now? -CLANG_CONFIG_EXTRA_CFLAGS += \ - -Wno-reserved-id-macro - -# Disable overly aggressive warning for format strings. -# Bug: 20148343 -CLANG_CONFIG_EXTRA_CFLAGS += \ - -Wno-format-pedantic - -# Workaround for ccache with clang. -# See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html. -CLANG_CONFIG_EXTRA_CFLAGS += \ - -Wno-unused-command-line-argument - -# Disable -Winconsistent-missing-override until we can clean up the existing -# codebase for it. -CLANG_CONFIG_EXTRA_CPPFLAGS += \ - -Wno-inconsistent-missing-override - -# Force clang to always output color diagnostics. Ninja will strip the ANSI -# color codes if it is not running in a terminal. -ifdef BUILDING_WITH_NINJA -CLANG_CONFIG_EXTRA_CFLAGS += \ - -fcolor-diagnostics -endif - CLANG_CONFIG_UNKNOWN_CFLAGS := \ -finline-functions \ -finline-limit=64 \ @@ -110,24 +68,6 @@ 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 := -CLANG_CONFIG_HOST_EXTRA_CFLAGS := -CLANG_CONFIG_HOST_EXTRA_CPPFLAGS := -CLANG_CONFIG_HOST_EXTRA_LDFLAGS := - -# Clang flags for all host cross rules -CLANG_CONFIG_HOST_CROSS_EXTRA_ASFLAGS := -CLANG_CONFIG_HOST_CROSS_EXTRA_CFLAGS := -CLANG_CONFIG_HOST_CROSS_EXTRA_CPPFLAGS := -CLANG_CONFIG_HOST_CROSS_EXTRA_LDFLAGS := - -# Clang flags for all target rules -CLANG_CONFIG_TARGET_EXTRA_ASFLAGS := -CLANG_CONFIG_TARGET_EXTRA_CFLAGS := -nostdlibinc -CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS := -CLANG_CONFIG_TARGET_EXTRA_LDFLAGS := - CLANG_DEFAULT_UB_CHECKS := \ bool \ integer-divide-by-zero \ diff --git a/core/clang/mips.mk b/core/clang/mips.mk deleted file mode 100644 index f5238c903..000000000 --- a/core/clang/mips.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Clang flags for mips arch, target or host. - -CLANG_CONFIG_mips_EXTRA_ASFLAGS := -CLANG_CONFIG_mips_EXTRA_CFLAGS := -CLANG_CONFIG_mips_EXTRA_LDFLAGS := diff --git a/core/clang/mips64.mk b/core/clang/mips64.mk deleted file mode 100644 index 4c410d337..000000000 --- a/core/clang/mips64.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Clang flags for mips64 arch, target or host. - -CLANG_CONFIG_mips64_EXTRA_ASFLAGS := -CLANG_CONFIG_mips64_EXTRA_CFLAGS := -CLANG_CONFIG_mips64_EXTRA_LDFLAGS := diff --git a/core/clang/x86.mk b/core/clang/x86.mk deleted file mode 100644 index f588209e8..000000000 --- a/core/clang/x86.mk +++ /dev/null @@ -1,6 +0,0 @@ -# Clang flags for x86 arch, target or host. - -CLANG_CONFIG_x86_EXTRA_ASFLAGS := \ - -msse3 -CLANG_CONFIG_x86_EXTRA_CFLAGS := -CLANG_CONFIG_x86_EXTRA_LDFLAGS := diff --git a/core/clang/x86_64.mk b/core/clang/x86_64.mk deleted file mode 100644 index c8f1f6ebe..000000000 --- a/core/clang/x86_64.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Clang flags for x86_64 arch, target or host. - -CLANG_CONFIG_x86_64_EXTRA_ASFLAGS := -CLANG_CONFIG_x86_64_EXTRA_CFLAGS := -CLANG_CONFIG_x86_64_EXTRA_LDFLAGS := diff --git a/core/combo/HOST_CROSS_windows-x86.mk b/core/combo/HOST_CROSS_windows-x86.mk index 5328982e8..d92490160 100644 --- a/core/combo/HOST_CROSS_windows-x86.mk +++ b/core/combo/HOST_CROSS_windows-x86.mk @@ -17,18 +17,7 @@ # Settings to use MinGW as a cross-compiler under Linux # Included by combo/select.make -$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include -$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/lib/gcc/x86_64-w64-mingw32/4.8.3/include - define $(combo_var_prefix)transform-shared-lib-to-toc $(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OBJDUMP) -x $(1) | grep "^Name" | cut -f3 -d" " > $(2) $(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)NM) -g -f p $(1) | cut -f1-2 -d" " >> $(2) endef - -$(combo_var_prefix)SHLIB_SUFFIX := .dll -$(combo_var_prefix)EXECUTABLE_SUFFIX := .exe - -$(combo_var_prefix)IS_64_BIT := - -# The mingw gcc is 4.8, 4.9 is required for color diagnostics -$(combo_var_prefix)UNKNOWN_CFLAGS := -fdiagnostics-color diff --git a/core/combo/HOST_CROSS_windows-x86_64.mk b/core/combo/HOST_CROSS_windows-x86_64.mk index b8101f424..d92490160 100644 --- a/core/combo/HOST_CROSS_windows-x86_64.mk +++ b/core/combo/HOST_CROSS_windows-x86_64.mk @@ -17,18 +17,7 @@ # Settings to use MinGW as a cross-compiler under Linux # Included by combo/select.make -$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include -$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/lib/gcc/x86_64-w64-mingw32/4.8.3/include - define $(combo_var_prefix)transform-shared-lib-to-toc $(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OBJDUMP) -x $(1) | grep "^Name" | cut -f3 -d" " > $(2) $(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)NM) -g -f p $(1) | cut -f1-2 -d" " >> $(2) endef - -$(combo_var_prefix)SHLIB_SUFFIX := .dll -$(combo_var_prefix)EXECUTABLE_SUFFIX := .exe - -$(combo_var_prefix)IS_64_BIT := true - -# The mingw gcc is 4.8, 4.9 is required for color diagnostics -$(combo_var_prefix)UNKNOWN_CFLAGS := -fdiagnostics-color diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 7c688da42..9e1ecc5ba 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -17,21 +17,12 @@ # Configuration for Darwin (Mac OS X) on x86. # Included by combo/select.mk -include $(BUILD_COMBOS)/mac_version.mk - define $(combo_var_prefix)transform-shared-lib-to-toc $(call _gen_toc_command_for_macho,$(1),$(2)) endef -$(combo_2nd_arch_prefix)HOST_SHLIB_SUFFIX := .dylib -$(combo_2nd_arch_prefix)HOST_JNILIB_SUFFIX := .jnilib - $(combo_2nd_arch_prefix)HOST_GLOBAL_ARFLAGS := cqs -# Use Darwin's libc++, as Darwin's libstdc++ is old and does not support C++11 -$(combo_2nd_arch_prefix)HOST_SYSTEMCPP_CPPFLAGS := -isystem $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -$(combo_2nd_arch_prefix)HOST_SYSTEMCPP_LDFLAGS := -stdlib=libc++ - ############################################################ ## Macros after this line are shared by the 64-bit config. diff --git a/core/combo/HOST_darwin-x86_64.mk b/core/combo/HOST_darwin-x86_64.mk index e61933e20..6cca167e4 100644 --- a/core/combo/HOST_darwin-x86_64.mk +++ b/core/combo/HOST_darwin-x86_64.mk @@ -17,21 +17,12 @@ # Configuration for Darwin (Mac OS X) on x86_64. # Included by combo/select.mk -include $(BUILD_COMBOS)/mac_version.mk - define $(combo_var_prefix)transform-shared-lib-to-toc $(call _gen_toc_command_for_macho,$(1),$(2)) endef -HOST_SHLIB_SUFFIX := .dylib -HOST_JNILIB_SUFFIX := .jnilib - HOST_GLOBAL_ARFLAGS := cqs -# Use Darwin's libc++, as Darwin's libstdc++ is old and does not support C++11 -HOST_SYSTEMCPP_CPPFLAGS := -isystem $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -HOST_SYSTEMCPP_LDFLAGS := -stdlib=libc++ - # We Reuse the following functions with the same name from HOST_darwin-x86.mk: # transform-host-o-to-shared-lib-inner # transform-host-o-to-executable-inner diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index 253bac0f4..4e83dc4c0 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -21,9 +21,6 @@ define $(combo_var_prefix)transform-shared-lib-to-toc $(call _gen_toc_command_for_elf,$(1),$(2)) endef -# gcc location for clang; to be updated when clang is updated -$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8 - ############################################################ ## Macros after this line are shared by the 64-bit config. diff --git a/core/combo/HOST_linux-x86_64.mk b/core/combo/HOST_linux-x86_64.mk index 68acaff55..845733f74 100644 --- a/core/combo/HOST_linux-x86_64.mk +++ b/core/combo/HOST_linux-x86_64.mk @@ -20,6 +20,3 @@ define $(combo_var_prefix)transform-shared-lib-to-toc $(call _gen_toc_command_for_elf,$(1),$(2)) endef - -# gcc location for clang; to be updated when clang is updated -HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8 diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index f08e088c5..2e179f6ed 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -33,11 +33,6 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),) TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te endif -# Decouple NDK library selection with platform compiler version -$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9 - -$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9 - TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT).mk ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) $(error Unknown ARM architecture version: $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)) @@ -46,65 +41,10 @@ endif include $(TARGET_ARCH_SPECIFIC_MAKEFILE) include $(BUILD_SYSTEM)/combo/fdo.mk -$(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-$($(combo_2nd_arch_prefix)TARGET_GCC_VERSION) - define $(combo_var_prefix)transform-shared-lib-to-toc $(call _gen_toc_command_for_elf,$(1),$(2)) endef -$(combo_2nd_arch_prefix)TARGET_arm_CFLAGS := -O2 \ - -fomit-frame-pointer \ - -fstrict-aliasing \ - -funswitch-loops - -# Modules can choose to compile some source as thumb. -$(combo_2nd_arch_prefix)TARGET_thumb_CFLAGS := -mthumb \ - -Os \ - -fomit-frame-pointer \ - -fno-strict-aliasing - -# Set FORCE_ARM_DEBUGGING to "true" in your buildspec.mk -# or in your environment to force a full arm build, even for -# files that are normally built as thumb; this can make -# gdb debugging easier. Don't forget to do a clean build. -# -# NOTE: if you try to build a -O0 build with thumb, several -# of the libraries (libpv, libwebcore, libkjs) need to be built -# with -mlong-calls. When built at -O0, those libraries are -# too big for a thumb "BL