diff options
| -rw-r--r-- | android/arch.go | 4 | ||||
| -rw-r--r-- | cc/config/arm_device.go | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/android/arch.go b/android/arch.go index bb8cc023..de19dbe9 100644 --- a/android/arch.go +++ b/android/arch.go @@ -105,7 +105,6 @@ module { var archVariants = map[ArchType][]string{ Arm: { - "armv7-a", "armv7-a-neon", "armv8-a", "armv8-2a", @@ -1269,7 +1268,6 @@ type archConfig struct { func getMegaDeviceConfig() []archConfig { return []archConfig{ - {"arm", "armv7-a", "generic", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "generic", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "cortex-a7", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "cortex-a8", []string{"armeabi-v7a"}}, @@ -1321,7 +1319,7 @@ func getMegaDeviceConfig() []archConfig { func getNdkAbisConfig() []archConfig { return []archConfig{ - {"arm", "armv7-a", "", []string{"armeabi"}}, + {"arm", "armv7-a-neon", "", []string{"armeabi"}}, {"arm64", "armv8-a", "", []string{"arm64-v8a"}}, {"x86", "", "", []string{"x86"}}, {"x86_64", "", "", []string{"x86_64"}}, diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go index cd7c4107..aee16eb4 100644 --- a/cc/config/arm_device.go +++ b/cc/config/arm_device.go @@ -51,11 +51,6 @@ var ( } armClangArchVariantCflags = map[string][]string{ - "armv7-a": []string{ - "-march=armv7-a", - "-mfloat-abi=softfp", - "-mfpu=vfpv3-d16", - }, "armv7-a-neon": []string{ "-march=armv7-a", "-mfloat-abi=softfp", @@ -189,8 +184,6 @@ func init() { pctx.StaticVariable("ArmClangThumbCflags", strings.Join(ClangFilterUnknownCflags(armThumbCflags), " ")) // Clang arch variant cflags - pctx.StaticVariable("ArmClangArmv7ACflags", - strings.Join(armClangArchVariantCflags["armv7-a"], " ")) pctx.StaticVariable("ArmClangArmv7ANeonCflags", strings.Join(armClangArchVariantCflags["armv7-a-neon"], " ")) pctx.StaticVariable("ArmClangArmv8ACflags", @@ -219,7 +212,6 @@ func init() { var ( armClangArchVariantCflagsVar = map[string]string{ - "armv7-a": "${config.ArmClangArmv7ACflags}", "armv7-a-neon": "${config.ArmClangArmv7ANeonCflags}", "armv8-a": "${config.ArmClangArmv8ACflags}", "armv8-2a": "${config.ArmClangArmv82ACflags}", @@ -335,8 +327,6 @@ func armToolchainFactory(arch android.Arch) Toolchain { default: fixCortexA8 = "-Wl,--no-fix-cortex-a8" } - case "armv7-a": - fixCortexA8 = "-Wl,--fix-cortex-a8" case "armv8-a", "armv8-2a": // Nothing extra for armv8-a/armv8-2a default: |