Merge "Implement vendor as a synonym of proprietary"
diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go
index d144c03..ae4e646 100644
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -136,6 +136,7 @@
},
"kryo": []string{
"-mcpu=cortex-a15",
+ "-mfpu=neon-fp-armv8",
// 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
@@ -171,7 +172,6 @@
armClangCpuVariantCflags["krait"] = append(armClangCpuVariantCflags["krait"], "-mfpu=neon-vfpv4")
replaceFirst(armClangCpuVariantCflags["kryo"], "-mcpu=cortex-a15", "-mcpu=krait")
- armClangCpuVariantCflags["kryo"] = append(armClangCpuVariantCflags["kryo"], "-mfpu=neon-vfpv4")
pctx.StaticVariable("armGccVersion", armGccVersion)