From 2e6e73bb01db56fc8daca2ac5c7b4ea2bd8a7120 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 18 Jul 2019 15:03:52 -0700 Subject: [PATCH] Remove unused BoardConfig variables. Determined via codesearch. Test: treehugger Change-Id: I5138e1b2294d39e11b46f9e1751c41b842c1743b --- core/combo/TARGET_linux-mips.mk | 6 ------ core/combo/TARGET_linux-mips64.mk | 6 ------ core/combo/arch/arm/armv7-a-neon.mk | 1 - core/combo/arch/arm/armv8-2a.mk | 1 - core/combo/arch/arm/armv8-a.mk | 1 - core/combo/arch/mips/mips32-fp.mk | 5 ----- core/combo/arch/mips/mips32r2-fp-xburst.mk | 6 ------ core/combo/arch/mips/mips32r2-fp.mk | 5 ----- core/combo/arch/mips/mips32r2dsp-fp.mk | 7 ------- core/combo/arch/mips/mips32r2dspr2-fp.mk | 7 ------- core/combo/arch/mips/mips32r6.mk | 4 ---- core/combo/arch/mips64/mips64r2.mk | 6 ------ core/combo/arch/mips64/mips64r6.mk | 3 --- core/combo/arch/x86/amberlake.mk | 7 ------- core/combo/arch/x86/atom.mk | 3 --- core/combo/arch/x86/broadwell.mk | 7 ------- core/combo/arch/x86/haswell.mk | 7 ------- core/combo/arch/x86/icelake.mk | 8 -------- core/combo/arch/x86/ivybridge.mk | 7 ------- core/combo/arch/x86/kabylake.mk | 7 ------- core/combo/arch/x86/sandybridge.mk | 7 ------- core/combo/arch/x86/silvermont.mk | 6 ------ core/combo/arch/x86/skylake.mk | 9 --------- core/combo/arch/x86/stoneyridge.mk | 8 -------- core/combo/arch/x86/tigerlake.mk | 8 -------- core/combo/arch/x86/whiskeylake.mk | 7 ------- core/combo/arch/x86/x86.mk | 6 ------ core/combo/arch/x86/x86_64.mk | 5 ----- core/combo/arch/x86_64/amberlake.mk | 7 ------- core/combo/arch/x86_64/broadwell.mk | 7 ------- core/combo/arch/x86_64/haswell.mk | 7 ------- core/combo/arch/x86_64/icelake.mk | 8 -------- core/combo/arch/x86_64/ivybridge.mk | 7 ------- core/combo/arch/x86_64/kabylake.mk | 7 ------- core/combo/arch/x86_64/sandybridge.mk | 7 ------- core/combo/arch/x86_64/silvermont.mk | 6 ------ core/combo/arch/x86_64/skylake.mk | 8 -------- core/combo/arch/x86_64/stoneyridge.mk | 8 -------- core/combo/arch/x86_64/tigerlake.mk | 8 -------- core/combo/arch/x86_64/whiskeylake.mk | 7 ------- core/combo/arch/x86_64/x86_64.mk | 8 -------- core/config.mk | 17 +++++++++++++++++ 42 files changed, 17 insertions(+), 255 deletions(-) delete mode 100644 core/combo/arch/mips/mips32-fp.mk delete mode 100644 core/combo/arch/mips/mips32r2-fp-xburst.mk delete mode 100644 core/combo/arch/mips/mips32r2-fp.mk delete mode 100644 core/combo/arch/mips/mips32r2dsp-fp.mk delete mode 100644 core/combo/arch/mips/mips32r2dspr2-fp.mk delete mode 100644 core/combo/arch/mips/mips32r6.mk delete mode 100644 core/combo/arch/mips64/mips64r2.mk delete mode 100644 core/combo/arch/mips64/mips64r6.mk diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index ba76969d8a..9f14aa20d2 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -33,12 +33,6 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),) TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := mips32r2-fp endif -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 MIPS architecture variant: $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)) -endif - -include $(TARGET_ARCH_SPECIFIC_MAKEFILE) include $(BUILD_SYSTEM)/combo/fdo.mk define $(combo_var_prefix)transform-shared-lib-to-toc diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk index b498d1f25c..ae17e465ac 100644 --- a/core/combo/TARGET_linux-mips64.mk +++ b/core/combo/TARGET_linux-mips64.mk @@ -33,12 +33,6 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) TARGET_ARCH_VARIANT := mips64r6 endif -TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk -ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) -$(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT)) -endif - -include $(TARGET_ARCH_SPECIFIC_MAKEFILE) include $(BUILD_SYSTEM)/combo/fdo.mk define $(combo_var_prefix)transform-shared-lib-to-toc diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk index 01d2235a00..0c01ac3efd 100644 --- a/core/combo/arch/arm/armv7-a-neon.mk +++ b/core/combo/arch/arm/armv7-a-neon.mk @@ -1,7 +1,6 @@ # Configuration for Linux on ARM. # Generating binaries for the ARMv7-a architecture and higher with NEON # -ARCH_ARM_HAVE_ARMV7A := true ARCH_ARM_HAVE_VFP := true ARCH_ARM_HAVE_VFP_D32 := true ARCH_ARM_HAVE_NEON := true diff --git a/core/combo/arch/arm/armv8-2a.mk b/core/combo/arch/arm/armv8-2a.mk index c1d818243e..7e2ca18aa8 100644 --- a/core/combo/arch/arm/armv8-2a.mk +++ b/core/combo/arch/arm/armv8-2a.mk @@ -3,7 +3,6 @@ # # Many libraries are not aware of armv8-2a, and AArch32 is (almost) a superset # of armv7-a-neon. So just let them think we are just like v7. -ARCH_ARM_HAVE_ARMV7A := true ARCH_ARM_HAVE_VFP := true ARCH_ARM_HAVE_VFP_D32 := true ARCH_ARM_HAVE_NEON := true diff --git a/core/combo/arch/arm/armv8-a.mk b/core/combo/arch/arm/armv8-a.mk index 9ef5c4944e..19bc014382 100644 --- a/core/combo/arch/arm/armv8-a.mk +++ b/core/combo/arch/arm/armv8-a.mk @@ -3,7 +3,6 @@ # # Many libraries are not aware of armv8-a, and AArch32 is (almost) a superset # of armv7-a-neon. So just let them think we are just like v7. -ARCH_ARM_HAVE_ARMV7A := true ARCH_ARM_HAVE_VFP := true ARCH_ARM_HAVE_VFP_D32 := true ARCH_ARM_HAVE_NEON := true diff --git a/core/combo/arch/mips/mips32-fp.mk b/core/combo/arch/mips/mips32-fp.mk deleted file mode 100644 index 4b09bc1a50..0000000000 --- a/core/combo/arch/mips/mips32-fp.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Configuration for Android on MIPS. -# Generating binaries for MIPS32/hard-float/little-endian - -ARCH_MIPS_HAS_FPU :=true -ARCH_HAVE_ALIGNED_DOUBLES :=true diff --git a/core/combo/arch/mips/mips32r2-fp-xburst.mk b/core/combo/arch/mips/mips32r2-fp-xburst.mk deleted file mode 100644 index 83fb12ee9e..0000000000 --- a/core/combo/arch/mips/mips32r2-fp-xburst.mk +++ /dev/null @@ -1,6 +0,0 @@ -# Configuration for Android on Ingenic xb4780/Xburst MIPS CPU. -# Generating binaries for MIPS32R2/hard-float/little-endian without -# support for the Madd family of instructions. - -ARCH_MIPS_HAS_FPU :=true -ARCH_HAVE_ALIGNED_DOUBLES :=true diff --git a/core/combo/arch/mips/mips32r2-fp.mk b/core/combo/arch/mips/mips32r2-fp.mk deleted file mode 100644 index 97c14c3ce7..0000000000 --- a/core/combo/arch/mips/mips32r2-fp.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Configuration for Android on MIPS. -# Generating binaries for MIPS32R2/hard-float/little-endian - -ARCH_MIPS_HAS_FPU :=true -ARCH_HAVE_ALIGNED_DOUBLES :=true diff --git a/core/combo/arch/mips/mips32r2dsp-fp.mk b/core/combo/arch/mips/mips32r2dsp-fp.mk deleted file mode 100644 index 522b6b95f0..0000000000 --- a/core/combo/arch/mips/mips32r2dsp-fp.mk +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration for Android on MIPS. -# Generating binaries for MIPS32R2/hard-float/little-endian/dsp - -ARCH_MIPS_HAS_DSP :=true -ARCH_MIPS_DSP_REV :=1 -ARCH_MIPS_HAS_FPU :=true -ARCH_HAVE_ALIGNED_DOUBLES :=true diff --git a/core/combo/arch/mips/mips32r2dspr2-fp.mk b/core/combo/arch/mips/mips32r2dspr2-fp.mk deleted file mode 100644 index 886d378909..0000000000 --- a/core/combo/arch/mips/mips32r2dspr2-fp.mk +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration for Android on MIPS. -# Generating binaries for MIPS32R2/hard-float/little-endian/dsp - -ARCH_MIPS_HAS_DSP :=true -ARCH_MIPS_DSP_REV :=2 -ARCH_MIPS_HAS_FPU :=true -ARCH_HAVE_ALIGNED_DOUBLES :=true diff --git a/core/combo/arch/mips/mips32r6.mk b/core/combo/arch/mips/mips32r6.mk deleted file mode 100644 index 7bc6cac4d2..0000000000 --- a/core/combo/arch/mips/mips32r6.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Configuration for Android on MIPS. -# Generating binaries for MIPS32R6/hard-float/little-endian - -ARCH_MIPS_REV6 := true diff --git a/core/combo/arch/mips64/mips64r2.mk b/core/combo/arch/mips64/mips64r2.mk deleted file mode 100644 index 54aa387720..0000000000 --- a/core/combo/arch/mips64/mips64r2.mk +++ /dev/null @@ -1,6 +0,0 @@ -# Configuration for Android on mips64r2. - -# This target is for temporary use only, until mips64r6 is supported by Android's qemu. - -ARCH_MIPS_HAS_FPU :=true -ARCH_HAVE_ALIGNED_DOUBLES :=true diff --git a/core/combo/arch/mips64/mips64r6.mk b/core/combo/arch/mips64/mips64r6.mk deleted file mode 100644 index 42d6c9e061..0000000000 --- a/core/combo/arch/mips64/mips64r6.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Configuration for Android on mips64r6. - -ARCH_MIPS64_REV6 := true diff --git a/core/combo/arch/x86/amberlake.mk b/core/combo/arch/x86/amberlake.mk index 37100a40ef..a7ae6ed679 100644 --- a/core/combo/arch/x86/amberlake.mk +++ b/core/combo/arch/x86/amberlake.mk @@ -3,11 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86/atom.mk b/core/combo/arch/x86/atom.mk index 43a170c6fb..bae7946722 100644 --- a/core/combo/arch/x86/atom.mk +++ b/core/combo/arch/x86/atom.mk @@ -4,6 +4,3 @@ # # See build/make/core/combo/arch/x86/x86.mk for differences. # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_MOVBE := true -ARCH_X86_HAVE_POPCNT := false # popcnt is not supported by current Atom CPUs diff --git a/core/combo/arch/x86/broadwell.mk b/core/combo/arch/x86/broadwell.mk index 37100a40ef..a7ae6ed679 100644 --- a/core/combo/arch/x86/broadwell.mk +++ b/core/combo/arch/x86/broadwell.mk @@ -3,11 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86/haswell.mk b/core/combo/arch/x86/haswell.mk index 50c27b4f79..ffa3bac8cf 100644 --- a/core/combo/arch/x86/haswell.mk +++ b/core/combo/arch/x86/haswell.mk @@ -1,11 +1,4 @@ # Configuration for Linux on x86. # Generating binaries for Haswell processors. # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AES_NI := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86/icelake.mk b/core/combo/arch/x86/icelake.mk index 76fe212969..a7ae6ed679 100644 --- a/core/combo/arch/x86/icelake.mk +++ b/core/combo/arch/x86/icelake.mk @@ -3,12 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_AVX512 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86/ivybridge.mk b/core/combo/arch/x86/ivybridge.mk index 44035d8e00..a1358e63fd 100644 --- a/core/combo/arch/x86/ivybridge.mk +++ b/core/combo/arch/x86/ivybridge.mk @@ -1,11 +1,4 @@ # Configuration for Linux on x86. # Generating binaries for Ivy Bridge processors. # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AES_NI := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := false diff --git a/core/combo/arch/x86/kabylake.mk b/core/combo/arch/x86/kabylake.mk index 50518d6859..9906259215 100644 --- a/core/combo/arch/x86/kabylake.mk +++ b/core/combo/arch/x86/kabylake.mk @@ -3,11 +3,4 @@ # that support AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86/sandybridge.mk b/core/combo/arch/x86/sandybridge.mk index a4c1bd9129..d6552ab2fb 100644 --- a/core/combo/arch/x86/sandybridge.mk +++ b/core/combo/arch/x86/sandybridge.mk @@ -1,11 +1,4 @@ # Configuration for Linux on x86. # Generating binaries for SandyBridge processors. # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AES_NI := false -ARCH_X86_HAVE_AVX := false -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := false diff --git a/core/combo/arch/x86/silvermont.mk b/core/combo/arch/x86/silvermont.mk index cba107902f..8ac2b98ef6 100644 --- a/core/combo/arch/x86/silvermont.mk +++ b/core/combo/arch/x86/silvermont.mk @@ -4,10 +4,4 @@ # See build/make/core/combo/arch/x86/x86-atom.mk for differences. # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AES_NI := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86/skylake.mk b/core/combo/arch/x86/skylake.mk index 03705c0d79..9906259215 100644 --- a/core/combo/arch/x86/skylake.mk +++ b/core/combo/arch/x86/skylake.mk @@ -3,13 +3,4 @@ # that support AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_AVX512 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true - diff --git a/core/combo/arch/x86/stoneyridge.mk b/core/combo/arch/x86/stoneyridge.mk index 30405a173d..05ff77aa69 100644 --- a/core/combo/arch/x86/stoneyridge.mk +++ b/core/combo/arch/x86/stoneyridge.mk @@ -1,12 +1,4 @@ # Configuration for Linux on x86. # Generating binaries for Stoney Ridge processors. # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AES_NI := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86/tigerlake.mk b/core/combo/arch/x86/tigerlake.mk index 76fe212969..a7ae6ed679 100644 --- a/core/combo/arch/x86/tigerlake.mk +++ b/core/combo/arch/x86/tigerlake.mk @@ -3,12 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_AVX512 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86/whiskeylake.mk b/core/combo/arch/x86/whiskeylake.mk index 37100a40ef..a7ae6ed679 100644 --- a/core/combo/arch/x86/whiskeylake.mk +++ b/core/combo/arch/x86/whiskeylake.mk @@ -3,11 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86/x86.mk b/core/combo/arch/x86/x86.mk index db55ff813c..066f66ab6b 100644 --- a/core/combo/arch/x86/x86.mk +++ b/core/combo/arch/x86/x86.mk @@ -8,9 +8,3 @@ # These features are optional and shall not be included in the base platform # Otherwise, sdk_x86-eng system images might fail to run on some # developer machines. -ARCH_X86_HAVE_SSSE3 := false -ARCH_X86_HAVE_MOVBE := false -ARCH_X86_HAVE_POPCNT := false -ARCH_X86_HAVE_AVX := false -ARCH_X86_HAVE_AVX2 := false -ARCH_X86_HAVE_AVX512 := false diff --git a/core/combo/arch/x86/x86_64.mk b/core/combo/arch/x86/x86_64.mk index fc2a0873b9..eff406b47d 100644 --- a/core/combo/arch/x86/x86_64.mk +++ b/core/combo/arch/x86/x86_64.mk @@ -4,9 +4,4 @@ # The generic 'x86' variant cannot be used, since it resets some flags used # by the 'x86_64' variant. -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_MOVBE := false # Only supported on Atom. -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true diff --git a/core/combo/arch/x86_64/amberlake.mk b/core/combo/arch/x86_64/amberlake.mk index 37100a40ef..a7ae6ed679 100644 --- a/core/combo/arch/x86_64/amberlake.mk +++ b/core/combo/arch/x86_64/amberlake.mk @@ -3,11 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86_64/broadwell.mk b/core/combo/arch/x86_64/broadwell.mk index 37100a40ef..a7ae6ed679 100644 --- a/core/combo/arch/x86_64/broadwell.mk +++ b/core/combo/arch/x86_64/broadwell.mk @@ -3,11 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86_64/haswell.mk b/core/combo/arch/x86_64/haswell.mk index f9c6ebdd2b..faf12fa9af 100644 --- a/core/combo/arch/x86_64/haswell.mk +++ b/core/combo/arch/x86_64/haswell.mk @@ -1,11 +1,4 @@ # Configuration for Linux on x86_64. # Generating binaries for Haswell processors. # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AES_NI := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86_64/icelake.mk b/core/combo/arch/x86_64/icelake.mk index 76fe212969..a7ae6ed679 100644 --- a/core/combo/arch/x86_64/icelake.mk +++ b/core/combo/arch/x86_64/icelake.mk @@ -3,12 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_AVX512 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86_64/ivybridge.mk b/core/combo/arch/x86_64/ivybridge.mk index 69011d6894..464fa98854 100644 --- a/core/combo/arch/x86_64/ivybridge.mk +++ b/core/combo/arch/x86_64/ivybridge.mk @@ -1,11 +1,4 @@ # Configuration for Linux on x86_64. # Generating binaries for Ivy Bridge processors. # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AES_NI := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := false diff --git a/core/combo/arch/x86_64/kabylake.mk b/core/combo/arch/x86_64/kabylake.mk index 37100a40ef..a7ae6ed679 100644 --- a/core/combo/arch/x86_64/kabylake.mk +++ b/core/combo/arch/x86_64/kabylake.mk @@ -3,11 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86_64/sandybridge.mk b/core/combo/arch/x86_64/sandybridge.mk index 2092d1964c..a09db2a87d 100644 --- a/core/combo/arch/x86_64/sandybridge.mk +++ b/core/combo/arch/x86_64/sandybridge.mk @@ -1,11 +1,4 @@ # Configuration for Linux on x86_64. # Generating binaries for SandyBridge processors. # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AES_NI := false -ARCH_X86_HAVE_AVX := false -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := false diff --git a/core/combo/arch/x86_64/silvermont.mk b/core/combo/arch/x86_64/silvermont.mk index cba107902f..8ac2b98ef6 100644 --- a/core/combo/arch/x86_64/silvermont.mk +++ b/core/combo/arch/x86_64/silvermont.mk @@ -4,10 +4,4 @@ # See build/make/core/combo/arch/x86/x86-atom.mk for differences. # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AES_NI := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86_64/skylake.mk b/core/combo/arch/x86_64/skylake.mk index 76fe212969..a7ae6ed679 100644 --- a/core/combo/arch/x86_64/skylake.mk +++ b/core/combo/arch/x86_64/skylake.mk @@ -3,12 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_AVX512 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86_64/stoneyridge.mk b/core/combo/arch/x86_64/stoneyridge.mk index f7d95835ec..5950d9abde 100644 --- a/core/combo/arch/x86_64/stoneyridge.mk +++ b/core/combo/arch/x86_64/stoneyridge.mk @@ -1,12 +1,4 @@ # Configuration for Linux on x86_64. # Generating binaries for Stoney Ridge processors. # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AES_NI := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86_64/tigerlake.mk b/core/combo/arch/x86_64/tigerlake.mk index 76fe212969..a7ae6ed679 100644 --- a/core/combo/arch/x86_64/tigerlake.mk +++ b/core/combo/arch/x86_64/tigerlake.mk @@ -3,12 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_AVX512 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86_64/whiskeylake.mk b/core/combo/arch/x86_64/whiskeylake.mk index 37100a40ef..a7ae6ed679 100644 --- a/core/combo/arch/x86_64/whiskeylake.mk +++ b/core/combo/arch/x86_64/whiskeylake.mk @@ -3,11 +3,4 @@ # that have AVX2 feature flag # -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := true -ARCH_X86_HAVE_AVX2 := true -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_MOVBE := true diff --git a/core/combo/arch/x86_64/x86_64.mk b/core/combo/arch/x86_64/x86_64.mk index e7c89283a3..17413c7537 100755 --- a/core/combo/arch/x86_64/x86_64.mk +++ b/core/combo/arch/x86_64/x86_64.mk @@ -5,12 +5,4 @@ # that are run in the emulator under KVM emulation (i.e. running directly on # the host development machine's CPU). -ARCH_X86_HAVE_SSSE3 := true -ARCH_X86_HAVE_MOVBE := false # Only supported on Atom. -ARCH_X86_HAVE_POPCNT := true -ARCH_X86_HAVE_SSE4 := true ARCH_X86_HAVE_SSE4_1 := true -ARCH_X86_HAVE_SSE4_2 := true -ARCH_X86_HAVE_AVX := false -ARCH_X86_HAVE_AVX2 := false -ARCH_X86_HAVE_AVX512 := false diff --git a/core/config.mk b/core/config.mk index 5016ff2377..df454899f0 100644 --- a/core/config.mk +++ b/core/config.mk @@ -101,6 +101,23 @@ $(KATI_obsolete_var BUILD_BROKEN_ENG_DEBUG_TAGS) $(KATI_obsolete_export It is a global setting. See $(CHANGES_URL)#export_keyword) $(KATI_obsolete_var BUILD_BROKEN_ANDROIDMK_EXPORTS) $(KATI_obsolete_var PRODUCT_STATIC_BOOT_CONTROL_HAL,Use shared library module instead. See $(CHANGES_URL)#PRODUCT_STATIC_BOOT_CONTROL_HAL) +$(KATI_obsolete_var \ + ARCH_ARM_HAVE_ARMV7A \ + ARCH_DSP_REV \ + ARCH_HAVE_ALIGNED_DOUBLES \ + ARCH_MIPS_HAS_DSP \ + ARCH_MIPS_HAS_FPU \ + ARCH_MIPS_REV6 \ + ARCH_X86_HAVE_AES_NI \ + ARCH_X86_HAVE_AVX \ + ARCH_X86_HAVE_AVX2 \ + ARCH_X86_HAVE_AVX512 \ + ARCH_X86_HAVE_MOVBE \ + ARCH_X86_HAVE_POPCNT \ + ARCH_X86_HAVE_SSE4 \ + ARCH_X86_HAVE_SSE4_2 \ + ARCH_X86_HAVE_SSSE3 \ +) # Used to force goals to build. Only use for conditionally defined goals. .PHONY: FORCE