Replace goldmont-without-xsaves build with goldmont-without-sha-xsaves
For chromebooks, we need a new build variant whose target arch is
goldmont, but without SHA and XSAVES support (b/314243939#comment21)
Bug: 314243939
Test: Build an image with TARGET_ARCH_VARIANT:=goldmont-without-sha-xsaves
Change-Id: If73660b515b443d5c138ca367fa3d1c6f18485b5
diff --git a/cc/config/x86_64_device.go b/cc/config/x86_64_device.go
index ff0a3b7..b97d511 100644
--- a/cc/config/x86_64_device.go
+++ b/cc/config/x86_64_device.go
@@ -49,8 +49,9 @@
"goldmont-plus": []string{
"-march=goldmont-plus",
},
- "goldmont-without-xsaves": []string{
+ "goldmont-without-sha-xsaves": []string{
"-march=goldmont",
+ "-mno-sha",
"-mno-xsaves",
},
"haswell": []string{
diff --git a/cc/config/x86_device.go b/cc/config/x86_device.go
index 08be869..2faa670 100644
--- a/cc/config/x86_device.go
+++ b/cc/config/x86_device.go
@@ -56,8 +56,9 @@
"goldmont-plus": []string{
"-march=goldmont-plus",
},
- "goldmont-without-xsaves": []string{
+ "goldmont-without-sha-xsaves": []string{
"-march=goldmont",
+ "-mno-sha",
"-mno-xsaves",
},
"haswell": []string{