Add Glibc patches for building with GCC 14

Author: staticfloat

bootstrap/Glibc/build_tarballs.jl

@@ -49,6 +49,11 @@ fi
 # Always use `/lib`, no more `/lib64`
 GLIBC_CONFIGURE_OVERRIDES+=( libc_cv_slibdir=/lib libdir="/lib" )
 
+# Our newer compilers balk at some of this old glibc code.
+# `-Wno-implicit-int` is to fix `__start()` not having `int` before it breaking configure tests.
+# `-fcommon` is to enable the old default behavior of GCC <= 10 merging `__cache_line_size`
+GLIBC_CONFIGURE_OVERRIDES+=( CFLAGS="-g -O2 -fcommon -Wno-implicit-int -Wno-implicit-function-declaration -Wno-builtin-declaration-mismatch -Wno-array-parameter -Wno-int-conversion" )
+
 rm -rf ${WORKSPACE}/srcdir/glibc_build
 mkdir -p ${WORKSPACE}/srcdir/glibc_build
 cd ${WORKSPACE}/srcdir/glibc_build
@@ -58,7 +63,7 @@ ${WORKSPACE}/srcdir/glibc-*/configure \
     --host=${target} \
     --disable-multilib \
     --disable-werror \
-    ${GLIBC_CONFIGURE_OVERRIDES[@]}
+    "${GLIBC_CONFIGURE_OVERRIDES[@]}"
 
 make -j${nproc}
 make install install_root="${prefix}"

bootstrap/Glibc/patches-v2.12.2/glibc-007-remove-no-whole-archive-test.patch

@@ -0,0 +1,90 @@
+commit d6af8dfa32b42c9956ddbe557d3bfecbd92c0462
+Author: Elliot Saba <[email protected]>
+Date:   Sun May 18 18:43:48 2025 +0000
+
+    Backport removal of no-whole-archive
+    
+    This configure check was removed in cf09d0b052cbbfbcabc3c3d78d485876b9b81f9c
+    and fails for newer GCC versions (Such as GCC 14) with the following error:
+    ```
+    conftest.c:1:1: error: return type defaults to 'int' [-Wimplicit-int]
+        1 | _start () {}
+          | ^~~~~~
+    conftest.c:3:1: error: return type defaults to 'int' [-Wimplicit-int]
+        3 | __throw () {}
+          | ^~~~~~~
+    ```
+    We backport its removal here.
+
+diff --git a/configure b/configure
+index 8c9413b14c..b14ebb63a1 100755
+--- a/configure
++++ b/configure
+@@ -7219,36 +7219,6 @@ _ACEOF
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ld --no-whole-archive" >&5
+-$as_echo_n "checking for ld --no-whole-archive... " >&6; }
+-if test "${libc_cv_ld_no_whole_archive+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat > conftest.c <<\EOF
+-_start () {}
+-int __eh_pc;
+-__throw () {}
+-EOF
+-if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+-			    -nostdlib -nostartfiles -Wl,--no-whole-archive
+-			    -o conftest conftest.c 1>&5'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  libc_cv_ld_no_whole_archive=yes
+-else
+-  libc_cv_ld_no_whole_archive=no
+-fi
+-rm -f conftest*
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $libc_cv_ld_no_whole_archive" >&5
+-$as_echo "$libc_cv_ld_no_whole_archive" >&6; }
+-if test $libc_cv_ld_no_whole_archive = yes; then
+-  no_whole_archive=-Wl,--no-whole-archive
+-fi
+-
+ { $as_echo "$as_me:$LINENO: checking for gcc -fexceptions" >&5
+ $as_echo_n "checking for gcc -fexceptions... " >&6; }
+ if test "${libc_cv_gcc_exceptions+set}" = set; then
+diff --git a/configure.in b/configure.in
+index 098adf4d35..f2c8491590 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1945,26 +1945,6 @@ if test $libc_cv_asm_cfi_directives = yes; then
+   AC_DEFINE(HAVE_ASM_CFI_DIRECTIVES)
+ fi
+ 
+-AC_CACHE_CHECK(for ld --no-whole-archive, libc_cv_ld_no_whole_archive, [dnl
+-cat > conftest.c <<\EOF
+-_start () {}
+-int __eh_pc;
+-__throw () {}
+-EOF
+-dnl No \ in command here because it ends up inside ''.
+-if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+-			    -nostdlib -nostartfiles -Wl,--no-whole-archive
+-			    -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD]); then
+-  libc_cv_ld_no_whole_archive=yes
+-else
+-  libc_cv_ld_no_whole_archive=no
+-fi
+-rm -f conftest*])
+-if test $libc_cv_ld_no_whole_archive = yes; then
+-  no_whole_archive=-Wl,--no-whole-archive
+-fi
+-AC_SUBST(no_whole_archive)dnl
+-
+ AC_CACHE_CHECK(for gcc -fexceptions, libc_cv_gcc_exceptions, [dnl
+ cat > conftest.c <<\EOF
+ _start () {}

bootstrap/Glibc/patches-v2.17.0/glibc-000-gcc_version_217.patch

@@ -5,7 +5,7 @@
  AC_CHECK_TOOL_PREFIX
  AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
 -  [version \([egcygnustpi-]*[0-9.]*\)], [4.[3-9].* | 4.[1-9][0-9].* | [5-9].* ],
-+  [version \([egcygnustpi-]*[0-9.]*\)], [4.[3-9].* | 4.[1-9][0-9].* | [5-9].* | 1[0-1].* ],
++  [version \([egcygnustpi-]*[0-9.]*\)], [4.[3-9].* | 4.[1-9][0-9].* | [5-9].* | 1[0-4].* ],
    critic_missing="$critic_missing gcc")
  AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
    [GNU Make[^0-9]*\([0-9][0-9.]*\)],
@@ -16,7 +16,7 @@
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
 -    4.[3-9].* | 4.[1-9][0-9].* | [5-9].* )
-+    4.[3-9].* | 4.[1-9][0-9].* | [5-9].* | 1[0-1].* )
++    4.[3-9].* | 4.[1-9][0-9].* | [5-9].* | 1[0-4].* )
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
 

bootstrap/Glibc/patches-v2.17.0/glibc-150-movq-register.patch

@@ -0,0 +1,60 @@
+From e812eaa1ce27f2a7d07f75b2306c263b53d35816 Mon Sep 17 00:00:00 2001
+From: Artem Panfilov <[email protected]>
+Date: Wed, 31 Jan 2024 16:02:06 +0200
+Subject: [PATCH] x86_64: Correct THREAD_SETMEM/THREAD_SETMEM_NC for movq [BZ
+ #27591]
+
+config/i386/constraints.md in GCC has
+
+(define_constraint "e"
+  "32-bit signed integer constant, or a symbolic reference known
+   to fit that range (for immediate operands in sign-extending x86-64
+   instructions)."
+  (match_operand 0 "x86_64_immediate_operand"))
+
+Since movq takes a signed 32-bit immediate or a register source operand,
+use "er", instead of "nr"/"ir", constraint for 32-bit signed integer
+constant or register on movq.
+
+Note: this patch is backported from:
+https://github.com/bminor/glibc/commit/b1ec623ed50bb8c7b9b6333fa350c3866dbde87f
+
+Reviewed-by: Carlos O'Donell <[email protected]>
+Signed-off-by: Artem Panfilov <[email protected]>
+---
+ nptl/sysdeps/x86_64/tls.h | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h
+index f3b76495b3..ec14b70b6f 100644
+--- a/nptl/sysdeps/x86_64/tls.h
++++ b/nptl/sysdeps/x86_64/tls.h
+@@ -263,8 +263,11 @@ typedef struct
+ 	      4 or 8.  */						      \
+ 	   abort ();							      \
+ 									      \
++	 /* Since movq takes a signed 32-bit immediate or a register source   \
++	    operand, use "er" constraint for 32-bit signed integer constant   \
++	    or register.  */						      \
+ 	 asm volatile ("movq %q0,%%fs:%P1" :				      \
+-		       : IMM_MODE ((uint64_t) cast_to_integer (value)),	      \
++		       : "er" ((uint64_t) cast_to_integer (value)),	      \
+ 			 "i" (offsetof (struct pthread, member)));	      \
+        }})
+ 
+@@ -288,8 +291,11 @@ typedef struct
+ 	      4 or 8.  */						      \
+ 	   abort ();							      \
+ 									      \
++	 /* Since movq takes a signed 32-bit immediate or a register source   \
++	    operand, use "er" constraint for 32-bit signed integer constant   \
++	    or register.  */						      \
+ 	 asm volatile ("movq %q0,%%fs:%P1(,%q2,8)" :			      \
+-		       : IMM_MODE ((uint64_t) cast_to_integer (value)),	      \
++		       : "er" ((uint64_t) cast_to_integer (value)),	      \
+ 			 "i" (offsetof (struct pthread, member[0])),	      \
+ 			 "r" (idx));					      \
+        }})
+-- 
+2.39.2
+

bootstrap/Glibc/patches-v2.17.0/glibc-151-old-gcc-cflags.patch

@@ -0,0 +1,33 @@
+glibc-151-old-gcc-cflags.patchcommit c961c54984c90b0e2f58247c1eafc826ac86ccc9
+Author: Elliot Saba <[email protected]>
+Date:   Wed May 21 04:06:16 2025 +0000
+
+    Force old GCC behavior
+    
+    These CFLAGS force newer GCCs to behave like older GCCs, which allows
+    the build to actually go through.
+
+diff --git a/configure b/configure
+index 8799b7de78..305acfada3 100755
+--- a/configure
++++ b/configure
+@@ -2915,15 +2915,15 @@ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+   if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
++    CFLAGS="-g -O2 -Wno-implicit-int -fcommon"
+   else
+-    CFLAGS="-g"
++    CFLAGS="-g -Wno-implicit-int -fcommon"
+   fi
+ else
+   if test "$GCC" = yes; then
+-    CFLAGS="-O2"
++    CFLAGS="-O2 -Wno-implicit-int -fcommon"
+   else
+-    CFLAGS=
++    CFLAGS="-Wno-implicit-int -fcommon"
+   fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5

bootstrap/Glibc/patches-v2.19.0/glibc-000-gcc_version_219.patch

@@ -5,7 +5,7 @@
  AC_CHECK_TOOL_PREFIX
  AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
 -  [version \([egcygnustpi-]*[0-9.]*\)], [4.[4-9].* | 4.[1-9][0-9].* | [5-9].* ],
-+  [version \([egcygnustpi-]*[0-9.]*\)], [4.[4-9].* | 4.[1-9][0-9].* | [5-9].* | 1[0-1].* ],
++  [version \([egcygnustpi-]*[0-9.]*\)], [4.[4-9].* | 4.[1-9][0-9].* | [5-9].* | 1[0-4].* ],
    critic_missing="$critic_missing gcc")
  AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
    [GNU Make[^0-9]*\([0-9][0-9.]*\)],
@@ -16,7 +16,7 @@
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
 -    4.[4-9].* | 4.[1-9][0-9].* | [5-9].* )
-+    4.[4-9].* | 4.[1-9][0-9].* | [5-9].* | 1[0-1].* )
++    4.[4-9].* | 4.[1-9][0-9].* | [5-9].* | 1[0-4].* )
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
 

bootstrap/Glibc/patches-v2.19.0/glibc-150-movq-register.patch

@@ -0,0 +1 @@
+../patches-v2.17.0/glibc-150-movq-register.patch

bootstrap/Glibc/patches-v2.19.0/glibc-151-old-gcc-cflags.patch

@@ -0,0 +1 @@
+../patches-v2.17.0/glibc-151-old-gcc-cflags.patch