diff options
| author | Jake Weinstein <xboxlover360@gmail.com> | 2017-04-06 20:38:26 -0400 |
|---|---|---|
| committer | Jake Weinstein <xboxlover360@gmail.com> | 2017-04-10 21:32:09 +0000 |
| commit | fff256f817213482c6b04ede2882aa9952d9948b (patch) | |
| tree | ac15addf9797a2b05f8c96670f83460b82d3b47f | |
| parent | 2ce95652a867ca3613e54a28b4c3b6ad6278b8aa (diff) | |
| download | build_soong-fff256f817213482c6b04ede2882aa9952d9948b.tar.gz build_soong-fff256f817213482c6b04ede2882aa9952d9948b.tar.bz2 build_soong-fff256f817213482c6b04ede2882aa9952d9948b.zip | |
soong: always use -mfpu=neon-vfpv4 for Krait targets
* GCC and Clang both support this, so we may as well simplify
the logic.
Test: make otapackage
Test: verified that the options are exactly the same, just slightly different order.
Change-Id: I8c2e9f3875cb662db708c799c9ce54f9fdd55981
| -rw-r--r-- | cc/config/arm_device.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go index ae4e6464..9058de2f 100644 --- a/cc/config/arm_device.go +++ b/cc/config/arm_device.go @@ -128,6 +128,7 @@ var ( }, "krait": []string{ "-mcpu=cortex-a15", + "-mfpu=neon-vfpv4", // 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 @@ -168,9 +169,9 @@ func init() { "kryo", "denver") + // Krait and Kryo targets are not supported by GCC, but are supported by Clang, + // so override the definitions when building modules with Clang. replaceFirst(armClangCpuVariantCflags["krait"], "-mcpu=cortex-a15", "-mcpu=krait") - armClangCpuVariantCflags["krait"] = append(armClangCpuVariantCflags["krait"], "-mfpu=neon-vfpv4") - replaceFirst(armClangCpuVariantCflags["kryo"], "-mcpu=cortex-a15", "-mcpu=krait") pctx.StaticVariable("armGccVersion", armGccVersion) |