From 0afb90a73ba007b3f6dc135ec8105def00182c5f Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 10 May 2021 23:34:18 +0200 Subject: util/crossgcc: Update gmp to 6.2.1 Change-Id: I871942f66e8fc496ebe523fdab539ea20950a202 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/54047 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- util/crossgcc/buildgcc | 2 +- util/crossgcc/patches/gmp-6.2.0_generic-build.patch | 20 -------------------- util/crossgcc/patches/gmp-6.2.1_generic-build.patch | 20 ++++++++++++++++++++ util/crossgcc/sum/gmp-6.2.0.tar.xz.cksum | 1 - util/crossgcc/sum/gmp-6.2.1.tar.xz.cksum | 1 + 5 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 util/crossgcc/patches/gmp-6.2.0_generic-build.patch create mode 100644 util/crossgcc/patches/gmp-6.2.1_generic-build.patch delete mode 100644 util/crossgcc/sum/gmp-6.2.0.tar.xz.cksum create mode 100644 util/crossgcc/sum/gmp-6.2.1.tar.xz.cksum diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index c947dd45ab..d8f25dbbb8 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -32,7 +32,7 @@ BOOTSTRAP=0 THREADS=1 # GCC toolchain version numbers -GMP_VERSION=6.2.0 +GMP_VERSION=6.2.1 MPFR_VERSION=4.1.0 MPC_VERSION=1.2.0 GCC_VERSION=8.3.0 diff --git a/util/crossgcc/patches/gmp-6.2.0_generic-build.patch b/util/crossgcc/patches/gmp-6.2.0_generic-build.patch deleted file mode 100644 index a05635f1d1..0000000000 --- a/util/crossgcc/patches/gmp-6.2.0_generic-build.patch +++ /dev/null @@ -1,20 +0,0 @@ -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; - } diff --git a/util/crossgcc/patches/gmp-6.2.1_generic-build.patch b/util/crossgcc/patches/gmp-6.2.1_generic-build.patch new file mode 100644 index 0000000000..a05635f1d1 --- /dev/null +++ b/util/crossgcc/patches/gmp-6.2.1_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; + } diff --git a/util/crossgcc/sum/gmp-6.2.0.tar.xz.cksum b/util/crossgcc/sum/gmp-6.2.0.tar.xz.cksum deleted file mode 100644 index b00b669fe7..0000000000 --- a/util/crossgcc/sum/gmp-6.2.0.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -052a5411dc74054240eec58132d2cf41211d0ff6 tarballs/gmp-6.2.0.tar.xz diff --git a/util/crossgcc/sum/gmp-6.2.1.tar.xz.cksum b/util/crossgcc/sum/gmp-6.2.1.tar.xz.cksum new file mode 100644 index 0000000000..3ea4232e59 --- /dev/null +++ b/util/crossgcc/sum/gmp-6.2.1.tar.xz.cksum @@ -0,0 +1 @@ +0578d48607ec0e272177d175fd1807c30b00fdf2 tarballs/gmp-6.2.1.tar.xz -- cgit v1.2.3