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

Clean up and fix Krait cflags am: ed89a7aa0c am: 2410d7b74e

Browse Source 
am: f13fe60ea9

* commit 'f13fe60ea91fb3017acd7608e9fc54c17ab98753':
  Clean up and fix Krait cflags

Change-Id: I0868eb5c0b2ea24d4f36733886fd871970e2a4ff
This commit is contained in:
Dan Willemsen
2016-05-10 00:31:35 +00:00
committed by android-build-merger
parent d20e39485a f13fe60ea9
commit fd9de60573
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cc/arm_device.go
View File

@@ -126,6 +126,14 @@ var (
// better solution comes around. See Bug 27340895 // better solution comes around. See Bug 27340895
"-D__ARM_FEATURE_LPAE=1", "-D__ARM_FEATURE_LPAE=1",
}, },
"krait": []string{
"-mcpu=cortex-a15",
// Fake an ARM compiler flag as these processors support LPAE which GCC/clang
// don't advertise.
// TODO This is a hack and we need to add it for each processor that supports LPAE until some
// better solution comes around. See Bug 27340895
"-D__ARM_FEATURE_LPAE=1",
},
} }
armClangCpuVariantCflags = copyVariantFlags(armCpuVariantCflags) armClangCpuVariantCflags = copyVariantFlags(armCpuVariantCflags)
@@ -146,10 +154,8 @@ func init() {
} }
replaceFirst(armClangArchVariantCflags["armv5te"], "-march=armv5te", "-march=armv5t") replaceFirst(armClangArchVariantCflags["armv5te"], "-march=armv5te", "-march=armv5t")
armClangCpuVariantCflags["krait"] = []string{ replaceFirst(armClangCpuVariantCflags["krait"], "-mcpu=cortex-a15", "-mcpu=krait")
"-mcpu=krait", armClangCpuVariantCflags["krait"] = append(armClangCpuVariantCflags["krait"], "-mfpu=neon-vfpv4")
"-mfpu=neon-vfpv4",
}
pctx.StaticVariable("armGccVersion", armGccVersion) pctx.StaticVariable("armGccVersion", armGccVersion)
@@ -185,6 +191,7 @@ func init() {
pctx.StaticVariable("armCortexA7Cflags", strings.Join(armCpuVariantCflags["cortex-a7"], " ")) pctx.StaticVariable("armCortexA7Cflags", strings.Join(armCpuVariantCflags["cortex-a7"], " "))
pctx.StaticVariable("armCortexA8Cflags", strings.Join(armCpuVariantCflags["cortex-a8"], " ")) pctx.StaticVariable("armCortexA8Cflags", strings.Join(armCpuVariantCflags["cortex-a8"], " "))
pctx.StaticVariable("armCortexA15Cflags", strings.Join(armCpuVariantCflags["cortex-a15"], " ")) pctx.StaticVariable("armCortexA15Cflags", strings.Join(armCpuVariantCflags["cortex-a15"], " "))
pctx.StaticVariable("armKraitCflags", strings.Join(armCpuVariantCflags["krait"], " "))
// Clang cflags // Clang cflags
pctx.StaticVariable("armToolchainClangCflags", strings.Join(clangFilterUnknownCflags(armToolchainCflags), " ")) pctx.StaticVariable("armToolchainClangCflags", strings.Join(clangFilterUnknownCflags(armToolchainCflags), " "))
@@ -231,7 +238,7 @@ var (
"cortex-a15": "${armCortexA15Cflags}", "cortex-a15": "${armCortexA15Cflags}",
"cortex-a53": "${armCortexA7Cflags}", "cortex-a53": "${armCortexA7Cflags}",
"cortex-a53.a57": "${armCortexA7Cflags}", "cortex-a53.a57": "${armCortexA7Cflags}",
"krait": "${armCortexA15Cflags}", "krait": "${armKraitCflags}",
"denver": "${armCortexA15Cflags}", "denver": "${armCortexA15Cflags}",
} }