diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2019-01-24 19:57:47 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-24 19:57:47 -0800 |
| commit | cf71b8ca866088338ce9a7e45f7cd1a72377b094 (patch) | |
| tree | 197a51168e678d5cbea16a33eccf7373d5c57ded /cc/config | |
| parent | 03d5baabfe88474d0ea926d51bdf453ff81d7955 (diff) | |
| parent | e4f12785dbff682eb546846c4cc449c68f01db3f (diff) | |
| download | build_soong-cf71b8ca866088338ce9a7e45f7cd1a72377b094.tar.gz build_soong-cf71b8ca866088338ce9a7e45f7cd1a72377b094.tar.bz2 build_soong-cf71b8ca866088338ce9a7e45f7cd1a72377b094.zip | |
Merge "Remove armv7-a without neon support"
am: e4f12785db
Change-Id: I2529ec9417cf4f49e70a424dd7a37441fb884624
Diffstat (limited to 'cc/config')
| -rw-r--r-- | cc/config/arm_device.go | 10 |
1 files changed, 0 insertions, 10 deletions
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: |