[coreboot-gerrit] Change in coreboot[master]: crossgcc: Ensure that GMP is built for a generic CPU on x86

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45044 )

Change subject: crossgcc: Ensure that GMP is built for a generic CPU on x86
......................................................................

crossgcc: Ensure that GMP is built for a generic CPU on x86

While GMP supports fat builds on x86 that adapt to the CPU's
capabilities, by default it builds for the CPU of the builder.
Running that binary on an older CPU then can fail.

Change-Id: Iafdc2eb696189b9e2c5ead316f310d98c949ef74
Signed-off-by: Patrick Georgi 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45044
Reviewed-by: Aaron Durbin 
Tested-by: build bot (Jenkins) 
---
A util/crossgcc/patches/gmp-6.2.0_generic-build.patch
1 file changed, 20 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved

diff --git a/util/crossgcc/patches/gmp-6.2.0_generic-build.patch b/util/crossgcc/patches/gmp-6.2.0_generic-build.patch
new file mode 100644
index 0000000..a05635f
--- /dev/null
+++ b/util/crossgcc/patches/gmp-6.2.0_generic-build.patch
@@ -0,0 +1,20 @@
+Ensure that GMP is built for a generic CPU on x86
+
+While GMP supports fat builds on x86 that adapt to the CPU's
+capabilities, by default it builds for the CPU of the builder.
+Running that binary on an older CPU then can fail.
+--- gmp-6.2.0/config.guess~	2020-09-02 19:23:01.817510842 +0200
++++ gmp-6.2.0/config.guess	2020-09-02 19:24:55.742325907 +0200
+@@ -1029,6 +1029,12 @@
+        virtualisers allow guests to set a broken state.  */
+     suffix = "noavx";
+
++  if (cpuid_64bit) {
++    modelstr="x86_64";
++  } else {
++    modelstr="pentium";
++  }
++  suffix="";
+   printf ("%s%s", modelstr, suffix);
+   return 0;
+ }