summaryrefslogtreecommitdiff
path: root/config/coreboot/default/patches/0042-further-gcc-15-fix-for-compiling-gmp.patch
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2025-04-29 23:14:53 +0100
committerLeah Rowe <leah@libreboot.org>2025-04-29 23:21:59 +0100
commit5e96db5a2b4907d782e8bc06f0a9ad70699ff806 (patch)
treeac3726168bac6063fa738067ec06196237fdfb28 /config/coreboot/default/patches/0042-further-gcc-15-fix-for-compiling-gmp.patch
parent9a9cd26b2d54aa0f58ebe91d57cbfb645d2c545a (diff)
further gcc-15 fix for gmp on -std=23
the fix in the previous revision wasn't being applied properly, because the build system of gmp generates a conftest.c file, and the entry being made for it was actually coming from this place in the configure file. Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'config/coreboot/default/patches/0042-further-gcc-15-fix-for-compiling-gmp.patch')
-rw-r--r--config/coreboot/default/patches/0042-further-gcc-15-fix-for-compiling-gmp.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/config/coreboot/default/patches/0042-further-gcc-15-fix-for-compiling-gmp.patch b/config/coreboot/default/patches/0042-further-gcc-15-fix-for-compiling-gmp.patch
new file mode 100644
index 00000000..a2f5c982
--- /dev/null
+++ b/config/coreboot/default/patches/0042-further-gcc-15-fix-for-compiling-gmp.patch
@@ -0,0 +1,54 @@
+From 983835d1470dde4559d9ee58c60e65c0bb3873c2 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Tue, 29 Apr 2025 23:13:42 +0100
+Subject: [PATCH 1/1] further gcc-15 fix for compiling gmp
+
+same as the previous fix, but we needed to apply
+the exact same change to the configure file, in
+the appropriate place.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ ...6.3.0_acinclude-m4-fix-std-c23-extra.patch | 30 +++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+ create mode 100644 util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23-extra.patch
+
+diff --git a/util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23-extra.patch b/util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23-extra.patch
+new file mode 100644
+index 0000000000..bee0159abf
+--- /dev/null
++++ b/util/crossgcc/patches/gmp-6.3.0_acinclude-m4-fix-std-c23-extra.patch
+@@ -0,0 +1,30 @@
++From f1da82325f91ccf8f3a251c0f94388acf091c1fe Mon Sep 17 00:00:00 2001
++From: Leah Rowe <leah@libreboot.org>
++Date: Tue, 29 Apr 2025 23:11:25 +0100
++Subject: [PATCH 1/1] further gcc-15 -std=23 mitigation
++
++the same fix as in the previous revision, also needs
++to be applied here. this make the coreboot build process
++pass, when compiling gmp.
++
++Signed-off-by: Leah Rowe <leah@libreboot.org>
++---
++ configure | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/configure b/configure
++index 7910aa0..bd4342d 100755
++--- a/configure
+++++ b/configure
++@@ -6568,7 +6568,7 @@ if test "$gmp_prog_cc_works" = yes; then
++
++ #if defined (__GNUC__) && ! defined (__cplusplus)
++ typedef unsigned long long t1;typedef t1*t2;
++-void g(){}
+++void g(int,const t1 *,t1,t1 *,const t1 *,int){}
++ void h(){}
++ static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
++ {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}
++--
++2.39.5
++
+--
+2.39.5
+