diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-12 05:41:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-12 05:41:11 +0000 |
| commit | 7d3e0709a5bc21e0febcf91f228091f981710b2a (patch) | |
| tree | abe49dffa9cc1fd8523d9c747d1a4b3781c29bd7 | |
| parent | eb21c04f9c7e0ed6d19cdf93dee8f2f43d59ceda (diff) | |
| parent | e401a8315e0d3aa1978b38eb2b0df087ebb35bf7 (diff) | |
| download | build_soong-7d3e0709a5bc21e0febcf91f228091f981710b2a.tar.gz build_soong-7d3e0709a5bc21e0febcf91f228091f981710b2a.tar.bz2 build_soong-7d3e0709a5bc21e0febcf91f228091f981710b2a.zip | |
Merge "Remove armv5te"
| -rw-r--r-- | android/arch.go | 2 | ||||
| -rw-r--r-- | cc/config/arm_device.go | 16 | ||||
| -rw-r--r-- | ui/build/config.go | 2 |
3 files changed, 0 insertions, 20 deletions
diff --git a/android/arch.go b/android/arch.go index e696a0da..6ab184f3 100644 --- a/android/arch.go +++ b/android/arch.go @@ -923,8 +923,6 @@ type archConfig struct { func getMegaDeviceConfig() []archConfig { return []archConfig{ - // armv5 is only used for unbundled apps - //{"arm", "armv5te", "", []string{"armeabi"}}, {"arm", "armv7-a", "generic", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "generic", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "cortex-a7", []string{"armeabi-v7a"}}, diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go index fda4f9d5..0d3750e3 100644 --- a/cc/config/arm_device.go +++ b/cc/config/arm_device.go @@ -49,14 +49,6 @@ var ( } armArchVariantCflags = map[string][]string{ - "armv5te": []string{ - "-march=armv5te", - "-mtune=xscale", - "-D__ARM_ARCH_5__", - "-D__ARM_ARCH_5T__", - "-D__ARM_ARCH_5E__", - "-D__ARM_ARCH_5TE__", - }, "armv7-a": []string{ "-march=armv7-a", "-mfloat-abi=softfp", @@ -140,7 +132,6 @@ func init() { "neon") android.RegisterArchVariants(android.Arm, - "armv5te", "armv7-a", "armv7-a-neon", "armv8-a", @@ -188,7 +179,6 @@ func init() { pctx.StaticVariable("ArmThumbCflags", strings.Join(armThumbCflags, " ")) // Architecture variant cflags - pctx.StaticVariable("ArmArmv5TECflags", strings.Join(armArchVariantCflags["armv5te"], " ")) pctx.StaticVariable("ArmArmv7ACflags", strings.Join(armArchVariantCflags["armv7-a"], " ")) pctx.StaticVariable("ArmArmv7ANeonCflags", strings.Join(armArchVariantCflags["armv7-a-neon"], " ")) pctx.StaticVariable("ArmArmv8ACflags", strings.Join(armArchVariantCflags["armv8-a"], " ")) @@ -213,8 +203,6 @@ func init() { pctx.StaticVariable("ArmClangThumbCflags", strings.Join(ClangFilterUnknownCflags(armThumbCflags), " ")) // Clang arch variant cflags - pctx.StaticVariable("ArmClangArmv5TECflags", - strings.Join(armClangArchVariantCflags["armv5te"], " ")) pctx.StaticVariable("ArmClangArmv7ACflags", strings.Join(armClangArchVariantCflags["armv7-a"], " ")) pctx.StaticVariable("ArmClangArmv7ANeonCflags", @@ -241,7 +229,6 @@ func init() { var ( armArchVariantCflagsVar = map[string]string{ - "armv5te": "${config.ArmArmv5TECflags}", "armv7-a": "${config.ArmArmv7ACflags}", "armv7-a-neon": "${config.ArmArmv7ANeonCflags}", "armv8-a": "${config.ArmArmv8ACflags}", @@ -263,7 +250,6 @@ var ( } armClangArchVariantCflagsVar = map[string]string{ - "armv5te": "${config.ArmClangArmv5TECflags}", "armv7-a": "${config.ArmClangArmv7ACflags}", "armv7-a-neon": "${config.ArmClangArmv7ANeonCflags}", "armv8-a": "${config.ArmClangArmv8ACflags}", @@ -399,8 +385,6 @@ func armToolchainFactory(arch android.Arch) Toolchain { } case "armv7-a": fixCortexA8 = "-Wl,--fix-cortex-a8" - case "armv5te": - // Nothing extra for armv5te case "armv8-a": // Nothing extra for armv8-a default: diff --git a/ui/build/config.go b/ui/build/config.go index f2511e76..0c37724b 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -257,8 +257,6 @@ func (c *configImpl) Tapas(ctx Context, apps []string, arch, variant string) { var product string switch arch { - case "armv5": - product = "generic_armv5" case "arm", "": product = "aosp_arm" case "arm64": |