StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Remove armv7-a without neon support"" am: 48db2b15fb am: ecbadc5b6c

Browse Source 
am: 856c8234f2

Change-Id: Ica4d9b0b474c6be9dd273dab71f33f013abaf6dc
This commit is contained in:
Dan Albert
2019-02-20 05:39:39 -08:00
committed by android-build-merger
parent 30b30b9bd0 856c8234f2
commit 6b3956d122
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/config/arm_device.go
View File

@@ -51,6 +51,11 @@ 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",
@@ -184,6 +189,8 @@ 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",
@@ -212,6 +219,7 @@ func init() {
var (
armClangArchVariantCflagsVar = map[string]string{
"armv7-a": "${config.ArmClangArmv7ACflags}",
"armv7-a-neon": "${config.ArmClangArmv7ANeonCflags}",
"armv8-a": "${config.ArmClangArmv8ACflags}",
"armv8-2a": "${config.ArmClangArmv82ACflags}",
@@ -327,6 +335,8 @@ 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: