Merge "Remove armv7-a without neon support"

This commit is contained in:
Dan Willemsen
2019-01-25 03:52:17 +00:00
committed by Gerrit Code Review
2 changed files with 1 additions and 13 deletions

View File

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