Accepting request 1248878 from Base:System

- Bump minimal kernel version to 4.3 to enable use of direct socketcalls
  on x86-32 and s390x (bsc#1234713) (forwarded request 1248877 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/1248878
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=297

_multibuild

@@ -3,6 +3,8 @@
   <package>utils</package>
   <package>testsuite</package>
   <package>cross-aarch64</package>
+  <package>cross-hppa</package>
+  <package>cross-loongarch64</package>
   <package>cross-ppc64le</package>
   <package>cross-riscv64</package>
   <package>cross-s390x</package>

float128-sycl.patch

@@ -0,0 +1,48 @@
+From a900dbaf70f0a957f56b52caa69173592ad7596e Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Thu, 20 Feb 2025 07:08:26 +0800
+Subject: [PATCH] x86 (__HAVE_FLOAT128): Defined to 0 for Intel SYCL compiler
+ [BZ #32723]
+
+Intel compiler always defines __INTEL_LLVM_COMPILER.  When SYCL is
+enabled by -fsycl, it also defines SYCL_LANGUAGE_VERSION.  Since Intel
+SYCL compiler doesn't support _Float128:
+
+https://github.com/intel/llvm/issues/16903
+
+define __HAVE_FLOAT128 to 0 for Intel SYCL compiler.
+
+This fixes BZ #32723.
+
+Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
+Reviewed-by: Sam James <sam@gentoo.org>
+(cherry picked from commit 5a4573be6f96ff49111bb6cae767676b5aafa7a8)
+---
+ sysdeps/x86/bits/floatn.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/sysdeps/x86/bits/floatn.h b/sysdeps/x86/bits/floatn.h
+index d197cb10dd..adc7ed2e9e 100644
+--- a/sysdeps/x86/bits/floatn.h
++++ b/sysdeps/x86/bits/floatn.h
+@@ -25,11 +25,15 @@
+    floating-point type with the IEEE 754 binary128 format, and this
+    glibc includes corresponding *f128 interfaces for it.  The required
+    libgcc support was added some time after the basic compiler
+-   support, for x86_64 and x86.  */
++   support, for x86_64 and x86.  Intel SYCL compiler doesn't support
++   _Float128: https://github.com/intel/llvm/issues/16903
++  */
+ #if (defined __x86_64__							\
+      ? __GNUC_PREREQ (4, 3)						\
+      : (defined __GNU__ ? __GNUC_PREREQ (4, 5) : __GNUC_PREREQ (4, 4))) \
+-    || __glibc_clang_prereq (3, 4)
++    || (__glibc_clang_prereq (3, 4)					\
++	&& (!defined __INTEL_LLVM_COMPILER				\
++	    || !defined SYCL_LANGUAGE_VERSION))
+ # define __HAVE_FLOAT128 1
+ #else
+ # define __HAVE_FLOAT128 0
+-- 
+2.48.1
+

gen-tempname-randomness.patch

@@ -1,28 +0,0 @@
-From 5f62cf88c4530c11904482775b7582bd7f6d80d2 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@suse.de>
-Date: Wed, 25 Sep 2024 11:49:30 +0200
-Subject: [PATCH] Fix missing randomness in __gen_tempname (bug 32214)
-
-Make sure to update the random value also if getrandom fails.
-
-Fixes: 686d542025 ("posix: Sync tempname with gnulib")
----
- sysdeps/posix/tempname.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c
-index c00fe0c181..fc30958a0c 100644
---- a/sysdeps/posix/tempname.c
-+++ b/sysdeps/posix/tempname.c
-@@ -117,6 +117,8 @@ random_bits (random_value *r, random_value s)
-      succeed.  */
- #if !_LIBC
-   *r = mix_random_values (v, clock ());
-+#else
-+  *r = v;
- #endif
-   return false;
- }
--- 
-2.46.2
-

glibc-2.40.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19a890175e9263d748f627993de6f4b1af9cd21e03f080e4bfb3a1fac10205a2
-size 18752204

glibc-2.40.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEcnNUKzmWLfeymZMUFnkrTqJTQPgFAmaeSXIACgkQFnkrTqJT
-QPhcfw/+LG5lo6bi7F8Kggp7rsxw1QpRsT76HUNdsoVZRbKvERYihexEQST8rNM/
-BvzWv+eAxE8h1XcBdYk3qKtyvsggVogaxnsfRq1+5yonrI0FGDdQZEjDhYVBEPma
-T1m8qmZywPingm37gT5RevQJP3vg2OBW9l5/nwGk9K33e+09RXCAyvZVrn7binTV
-27VESY5/6X7uC2Ga1WnZG2omu3W5+vAsGWoFnCNjJHfqyW6agaGLbGNSBJnSABv+
-mTy4v8S6zpRovWZOA2hi7FUVbtDyvyJrGZLnTNBA/DxqKiKc2ZQUljXy7Uv+piDt
-H0bwNsrC0mcRxdqsA8FNUv/gIpHcuBaLjUz37bA6d0iwkvqf8YCJ47O6KbMuuDeu
-DudKO+QIVTgs0ahUnbomW27Un46cvkM2JM7dU9Akt5Cja9hImOOn1cbotkaMfmsL
-c3Hq+O3LYwI76p3HUwsjg3xjgoLZy24+46PaXRncrYImgTif6yGq4uVjWXnaFsLs
-WtE16EU9fvU1zCBRbdcT6cI6TiNQvQdc8aBGxKs4oFTMROWiczfwKmcIrC6OROIJ
-kW5V0nI5t3Sk8XSubUxj4dZhk6E1e58RhKm/5pcdOVzwbd3H9sb5q/BhlWB7M49M
-i5n7p77a1YCjuhl/m43Q036uDCER7/JSbnekU6zsTYUDX/ZfWiA=
-=hPC5
------END PGP SIGNATURE-----

glibc-2.41.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5a26b22f545d6b7d7b3dd828e11e428f24f4fac43c934fb071b6a7d0828e901
+size 19344868

glibc-2.41.tar.xz.sig

@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQKTBAABCgB9FiEE/Rnm0xsZLuTcY+rT3CsWIV7VQSoFAmea1xNfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEZE
+MTlFNkQzMUIxOTJFRTREQzYzRUFEM0RDMkIxNjIxNUVENTQxMkEACgkQ3CsWIV7V
+QSq+Qg//VwaVsRXRHVHHAbbFyqjeYPQfkgIwzOfbrkVEe75L+PnVBF52cRJ8S2YK
+FopiiK+xBmS6rUyuzhOVtLSpGepPtOHJI5NzWz2radZmoRhW8ozoFL7iGmJxIYoX
+wz6zadwJeg5AFMY3VFNTAtkxRIn7zk25x6LYMj7cIF1dxoh6NbiGGq/5z5Ru+9l0
+zX1x1wPfDNqgjW0pZyZ4xt1O853EZjmY1kvsLrrHk+ruq3TGcEUjUlmw3F9LKwny
+H9GYwNIfcbnuK7ZDh2cIqxBVd/T8e1Eam+tyVlSaijIHptsF59roBvP3kFAdkDp9
+byHnmR8c/5M5KFFdOgURl17ST9yNyOEgMgzrknqk9Onfd24DBz2c/rv93IjrBNpy
+Tllw0yGgVElyKeXVSGDm6DOHJT50LB/ra2Pb82zf33rs5prw1yLL7VZ3Y58ysUJq
+fi7IGWEFK8uhxT/15jIyp19x2RpQvHJqVIpNQmx/SLbGCuh4lS+1poIng3M5ktMX
+R4KviCHrPGWCLQIveqffHiBr6kbKOmZL9NSYFI+o1aINL0pToqT9jw7gA4brYnzn
+9Uu9xN4YkSqCXWBXdJCj2rDJDVqOWarUaC7/datpFkdC/hCeN63CQ+cTj166CpdZ
+Cyqcai2WeyNJvcoLY3G5J/6BDBzVP78Ze42Ki/IsSo3YDK3NFGg=
+=KfhY
+-----END PGP SIGNATURE-----

glibc-version.diff

@@ -8,7 +8,7 @@ Index: glibc-2.27/csu/version.c
  static const char banner[] =
 -"GNU C Library "PKGVERSION RELEASE" release version "VERSION".\n\
 +"GNU C Library "PKGVERSION RELEASE" release version "VERSION" (git "GITID").\n\
- Copyright (C) 2024 Free Software Foundation, Inc.\n\
+ Copyright (C) 2025 Free Software Foundation, Inc.\n\
  This is free software; see the source for copying conditions.\n\
  There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
  PARTICULAR PURPOSE.\n\

glibc.changes

@@ -1,3 +1,94 @@
+-------------------------------------------------------------------
+Wed Feb 26 15:29:17 UTC 2025 - Andreas Schwab <schwab@suse.de>
+
+- Bump minimal kernel version to 4.3 to enable use of direct socketcalls
+  on x86-32 and s390x (bsc#1234713)
+
+-------------------------------------------------------------------
+Thu Feb 20 09:53:20 UTC 2025 - Andreas Schwab <schwab@suse.de>
+
+- Build cross-hppa and cross-loongarch64 only with gcc >= 14
+- round-log10p1f.patch: math: Fix log10p1f internal table value (BZ
+  #32626)
+- round-sinhf.patch: math: Fix sinhf for some inputs (BZ #32627)
+- nptl-stack-size-up.patch: nptl: Correct stack size attribute when stack
+  grows up (BZ #32574)
+- round-tanf.patch: math: Fix tanf for some inputs (BZ 32630)
+- tst-aarch64-pkey.patch: Fix tst-aarch64-pkey to handle ENOSPC as not
+  supported
+- float128-sycl.patch: x86 (__HAVE_FLOAT128): Defined to 0 for Intel SYCL
+  compiler (BZ #32723)
+
+-------------------------------------------------------------------
+Mon Feb 17 10:37:02 UTC 2025 - Andreas Schwab <schwab@suse.de>
+
+- Remove nis from nsswitch.conf (bsc#1237210)
+
+-------------------------------------------------------------------
+Mon Feb 10 12:19:00 UTC 2025 - Andreas Schwab <schwab@suse.de>
+
+- Use rpm.execute when available (bsc#1236869)
+
+-------------------------------------------------------------------
+Wed Jan 29 09:19:29 UTC 2025 - Andreas Schwab <schwab@suse.de>
+
+- Update to glibc 2.41
+  * In /etc/resolv.conf and the RES_OPTIONS environment variable, option
+    flags can now be prefixed with “-” to clear previously set flags
+  * The DNS stub resolver now supports the strict-error option
+  * On Linux, the sched_setattr and sched_getattr functions have been
+    added
+  * The iconv program now supports converting files in place
+  * Character encoding, character type info, and transliteration tables
+    have been updated to Unicode 16.0.0
+  * The following ISO C23 function families (introduced in TS
+    18661-4:2015) are now supported in <math.h>:
+    - Trigonometric functions: acospi, asinpi, atan2pi, atanpi, cospi,
+      sinpi, tanpi.
+  * The GNU C Library now supports a feature test macro _ISOC2Y_SOURCE to
+    enable features from the draft ISO C2Y standard
+  * Optimized and correctly rounded exp10m1f, exp2m1f, expm1f, log10f,
+    log2p1f, log1pf, log10p1f, cbrtf, erff, erfcf, lgammaf, tgammaf,
+    tanf, acosf, acoshf, asinf, asinhf, atanf, atan2f, atanhf, coshf,
+    sinhf, and tanhf functions have been added from the CORE-MATH
+    project <https://core-math.gitlabpages.inria.fr/>
+  * A new tunable, glibc.rtld.execstack, can be used to control whether an
+    executable stack is allowed from the main program, either implicitly
+    due to a mising GNU_STACK ELF header or explicit explicitly because
+    of the executable bit in GNU_STACK
+  * Support for the extensible rseq ABI introduced in the Linux kernel
+    version 6.3 has been added
+  * The GNU C Library now supports the Guarded Control Stack extension
+    that allows to use shadow stacks on AArch64 systems that support this
+    extension
+  * Significant effort has been put into improving the code generation
+    and speed of mathematical functions in the vector mathematics library
+    on AArch64, with regard to the Scalable Vector Extension (SVE) and
+    Advanced SIMD (Neon) intrinsics
+  * Support for memory protection keys on AArch64 systems with enabled
+    Stage 1 permission overlays feature as introduced in Armv8.9 / 9.4
+    has been added
+  * On PowerPC64, support for the return-oriented programming protection
+    instructions added in ISA 3.1 (Power10) has been added, as well as
+    function optimizations for Power10
+  * A new architecture type has been introduced internally to better
+    support Hygon x86-64 processors
+  * abort is now async-signal-safe and its implementation makes longjmp
+    from the SIGABRT handler always abort if set up with setjmp
+  * dlopen and dlmopen no longer make the stack executable if a shared
+    library requires it, either implicitly because of a missing GNU_STACK
+    ELF header (and default ABI permission having the executable bit set)
+    or explicitly because of the executable bit in GNU_STACK, and the
+    stack is not already executable
+  * On recent Linux kernels with vDSO getrandom support, getrandom does
+    not act as a "shall occur" cancellation point, in which case it might
+    not issue a syscall or trigger a deferred cancellation event
+  * GLIBC-SA-2025-0001: assert: Buffer overflow when printing assertion
+    failure message (CVE-2025-0395)
+- Add cross-hppa and cross-loongarch64 packages
+- gen-tempname-randomness.patch: Removed
+- ulp-prologue-into-asm-functions.patch: Rebase
+
 -------------------------------------------------------------------
 Mon Jan 20 13:33:58 UTC 2025 - Andreas Schwab <schwab@suse.de>
 
@@ -18,6 +109,11 @@ Mon Dec  2 14:02:08 UTC 2024 - Andreas Schwab <schwab@suse.de>
 
 - Add support for loongarch64
 
+-------------------------------------------------------------------
+Wed Oct  9 07:42:01 UTC 2024 - Andreas Schwab <schwab@suse.de>
+
+- Apply libc_nonshared.a workaround also on s390x and ppc64le (bsc#1231051)
+
 -------------------------------------------------------------------
 Mon Sep 30 20:56:18 UTC 2024 - Stanislav Brabec <sbrabec@suse.com>
 
@@ -83,6 +179,12 @@ Tue May 28 07:27:01 UTC 2024 - Andreas Schwab <schwab@suse.de>
 
 - Obsolete glibc-locale-base-<targettype> from glibc-<targettype>
 
+-------------------------------------------------------------------
+Thu May 23 11:31:34 UTC 2024 - Andreas Schwab <schwab@suse.de>
+
+- Add workaround for invalid use of libc_nonshared.a with non-SUSE libc
+  (bsc#1221482)
+
 -------------------------------------------------------------------
 Tue May 21 09:44:46 UTC 2024 - Andreas Schwab <schwab@suse.de>
 

glibc.spec

@@ -34,6 +34,12 @@
 %if "%flavor" == "cross-aarch64"
 %define cross_cpu aarch64
 %endif
+%if "%flavor" == "cross-hppa"
+%define cross_cpu hppa
+%endif
+%if "%flavor" == "cross-loongarch64"
+%define cross_cpu loongarch64
+%endif
 %if "%flavor" == "cross-riscv64"
 %define cross_cpu riscv64
 %endif
@@ -51,13 +57,13 @@
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
 
-%if 0%{?suse_version} >= 1550
+%if %{suse_version} >= 1550
 %bcond_without usrmerged
 %else
 %bcond_with usrmerged
 %endif
 
-%if 0%{?suse_version} >= 1600
+%if %{suse_version} >= 1600
 %bcond_with nscd
 %else
 %bcond_without nscd
@@ -96,7 +102,7 @@ ExclusiveArch:  do_not_build
 %undefine _build_create_debug
 %define _enable_debug_packages 0
 ExcludeArch:    %{cross_arch}
-%if 0%{?suse_version} < 1600
+%if %{suse_version} < 1600
 ExclusiveArch:  do_not_build
 %endif
 %endif
@@ -151,17 +157,9 @@ ExclusiveArch:  do_not_build
 %define disable_assert 0
 %define enable_stackguard_randomization 1
 # glibc requires at least kernel 3.2
-%define enablekernel 3.2
+# Bump to 4.3 to enable use of direct socketcalls on x86-32 and s390x
+%define enablekernel 4.3
 # some architectures need a newer kernel
-%ifarch ppc64le
-%define enablekernel 3.10
-%endif
-%ifarch aarch64
-%define enablekernel 3.7
-%endif
-%ifarch ia64
-%define enablekernel 3.2.18
-%endif
 %ifarch riscv64
 %define enablekernel 4.15
 %endif
@@ -180,10 +178,10 @@ Name:           glibc%{name_suffix}
 Summary:        Standard Shared Libraries (from the GNU C Library)
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0
 Group:          System/Libraries
-Version:        2.40
+Version:        2.41
 Release:        0
 %if %{without snapshot}
-%define git_id ef321e23c2
+%define git_id 74f59e9271
 %define libversion %version
 %else
 %define git_id %(echo %version | sed 's/.*\.g//')
@@ -195,7 +193,7 @@ Source:         https://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz
 %if %{without snapshot}
 Source1:        https://ftp.gnu.org/pub/gnu/glibc/glibc-%{version}.tar.xz.sig
 %endif
-Source2:        http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=libc&download=1#/glibc.keyring
+Source2:        https://savannah.gnu.org/project/release-gpgkeys.php?group=libc&download=1&file=./glibc.keyring
 Source4:        manpages.tar.bz2
 Source5:        nsswitch.conf
 Source7:        bindresvport.blacklist
@@ -278,6 +276,11 @@ BuildArch:      i686
 # Sync only this build counter with the main build
 #!BcntSyncTag:  glibc
 %endif
+%if 0%{?gcc_version} < 14
+%if "%flavor" == "cross-loongarch64" || "%flavor" == "cross-hppa"
+ExclusiveArch:  do_not_build
+%endif
+%endif
 
 ###
 # Patches are ordered in the following groups:
@@ -330,8 +333,18 @@ Patch306:       glibc-fix-double-loopback.diff
 %if %{without snapshot}
 ###
 # Patches from upstream
-# PATCH-FIX-UPSTREAM Fix missing randomness in __gen_tempname (BZ #32214)
+# PATCH-FIX-UPSTREAM math: Fix log10p1f internal table value (BZ #32626)
-Patch1000:      gen-tempname-randomness.patch
+Patch1000:      round-log10p1f.patch
+# PATCH-FIX-UPSTREAM math: Fix sinhf for some inputs (BZ #32627)
+Patch1001:      round-sinhf.patch
+# PATCH-FIX-UPSTREAM nptl: Correct stack size attribute when stack grows up (BZ #32574)
+Patch1002:      nptl-stack-size-up.patch
+# PATCH-FIX-UPSTREAM math: Fix tanf for some inputs (BZ 32630)
+Patch1003:      round-tanf.patch
+# PATCH-FIX-UPSTREAM Fix tst-aarch64-pkey to handle ENOSPC as not supported
+Patch1004:      tst-aarch64-pkey.patch
+# PATCH-FIX-UPSTREAM x86 (__HAVE_FLOAT128): Defined to 0 for Intel SYCL compiler (BZ #32723)
+Patch1005:      float128-sycl.patch
 ###
 %endif
 
@@ -550,7 +563,7 @@ Group:          System/Libraries
 Network Support Library for legacy architectures.  This library does not
 have support for IPv6.
 
-%if 0%{suse_version} >= 1500
+%if %{suse_version} >= 1500
 %define make_output_sync -Oline
 %endif
 
@@ -608,6 +621,11 @@ for opt in $tmp; do
 %endif
 %if %{build_cross}
     -m*) ;;  # remove all machine specific options for crosses
+%endif
+%if "%{cross_arch}" == "hppa"
+     # -fstack-clash-protection is not supported on targets where the
+     # stack grows from lower to higher addresses
+    -fstack-clash-protection) ;;
 %endif
     *) BuildFlags+=" $opt" ;;
   esac
@@ -697,7 +715,7 @@ profile="--disable-profile"
 %if %{build_cross}
 	--with-headers=%{sysroot}/usr/include \
 %else
-%ifarch armv7hl ppc ppc64 ppc64le i686 x86_64 sparc sparc64 s390 s390x
+%ifarch armv7hl ppc ppc64 ppc64le i686 x86_64 sparc sparc64 s390 s390x riscv64
 	--enable-multi-arch \
 %endif
 %ifarch aarch64
@@ -713,7 +731,7 @@ profile="--disable-profile"
 	--with-cpu=power7 \
 %endif
 %ifarch x86_64
-%if %suse_version > 1500
+%if %{suse_version} > 1500
 	--enable-cet \
 %endif
 %endif
@@ -755,6 +773,45 @@ echo 'CFLAGS-.os += -fdump-ipa-clones' \
 %endif
 
 make %{?_smp_mflags} %{?make_output_sync}
+
+%if %{build_main} && !0%{?is_opensuse}
+%ifarch x86_64 i686 s390x ppc64le
+# Horrible workaround for bsc#1221482
+%ifarch x86_64 i686
+archsub=x86
+%endif
+%ifarch s390x
+archsub=s390
+%endif
+%ifarch ppc64le
+archsub=powerpc
+%endif
+xstatbuild ()
+{
+  gcc -O2 -I ../sysdeps/unix/sysv/linux/$archsub -xc - -c -o $1stat$2.oS <<EOF
+#include <bits/wordsize.h>
+#include <xstatver.h>
+int __$1xstat$2 (int, $3, void *);
+
+int
+$1stat$2 ($3 file, void *buf)
+{
+  return __$1xstat$2 (_STAT_VER, file, buf);
+}
+EOF
+  ar r libc_nonshared.a $1stat$2.oS
+}
+xstatbuild "" "" "const char *"
+xstatbuild f "" int
+xstatbuild l "" "const char *"
+%ifarch i686
+xstatbuild "" 64 "const char *"
+xstatbuild f 64 int
+xstatbuild l 64 "const char *"
+%endif
+%endif
+%endif
+
 cd ..
 
 #
@@ -956,7 +1013,7 @@ rm -rf %{buildroot}%{_datadir}/locale/*/
 # Miscelanna:
 
 install -m 644 %{SOURCE7} %{buildroot}/etc
-%if %suse_version > 1500
+%if %{suse_version} > 1500
 install -D -m 644 %{SOURCE5} %{buildroot}%{_prefix}/etc/nsswitch.conf
 %else
 install -m 644 %{SOURCE5} %{buildroot}/etc/nsswitch.conf
@@ -1144,6 +1201,9 @@ rm %{buildroot}/sbin
 %if %{build_main}
 
 %post -p <lua>
+%if %{suse_version} >= 1600
+exec = rpm.execute
+%else
 function exec(path, ...)
   local pid = posix.fork()
   if pid == 0 then
@@ -1156,6 +1216,7 @@ function exec(path, ...)
   end
   posix.wait(pid)
 end
+%endif
 
 -- First, get rid of platform-optimized libraries. We remove any we have
 -- ever built, since otherwise we might end up using some old leftover
@@ -1235,7 +1296,7 @@ exit 0
 %config /etc/ld.so.conf
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/ld.so.cache
 %config(noreplace) /etc/rpc
-%if %suse_version > 1500
+%if %{suse_version} > 1500
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/nsswitch.conf
 %{_prefix}/etc/nsswitch.conf
 %else

nptl-stack-size-up.patch

@@ -0,0 +1,40 @@
+From cb7f20653724029be89224ed3a35d627cc5b4163 Mon Sep 17 00:00:00 2001
+From: John David Anglin <danglin@gcc.gnu.org>
+Date: Wed, 29 Jan 2025 16:51:16 -0500
+Subject: [PATCH] nptl: Correct stack size attribute when stack grows up [BZ
+ #32574]
+
+Set stack size attribute to the size of the mmap'd region only
+when the size of the remaining stack space is less than the size
+of the mmap'd region.
+
+This was reversed.  As a result, the initial stack size was only
+135168 bytes.  On architectures where the stack grows down, the
+initial stack size is approximately 8384512 bytes with the default
+rlimit settings.  The small main stack size on hppa broke
+applications like ruby that check for stack overflows.
+
+Signed-off-by: John David Anglin <dave.anglin@bell.net>
+---
+ nptl/pthread_getattr_np.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nptl/pthread_getattr_np.c b/nptl/pthread_getattr_np.c
+index e98e2df152..43dd16d59c 100644
+--- a/nptl/pthread_getattr_np.c
++++ b/nptl/pthread_getattr_np.c
+@@ -145,9 +145,9 @@ __pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr)
+ 			  > (size_t) iattr->stackaddr - last_to)
+ 			iattr->stacksize = (size_t) iattr->stackaddr - last_to;
+ #else
+-		      /* The limit might be too high.  */
++		      /* The limit might be too low.  */
+ 		      if ((size_t) iattr->stacksize
+-			  > to - (size_t) iattr->stackaddr)
++			  < to - (size_t) iattr->stackaddr)
+ 			iattr->stacksize = to - (size_t) iattr->stackaddr;
+ #endif
+ 		      /* We succeed and no need to look further.  */
+-- 
+2.48.1
+

nsswitch.conf

@@ -64,12 +64,12 @@ networks:	files dns
 aliases:	files usrfiles
 ethers:		files usrfiles
 gshadow:	files usrfiles
-netgroup:	files nis
+netgroup:	files
 protocols:	files usrfiles
 publickey:	files
 rpc:		files usrfiles
 services:	files usrfiles
 
-automount:	files nis
+automount:	files
 bootparams:	files
 netmasks:	files

round-log10p1f.patch

@@ -0,0 +1,80 @@
+From bdccbfbc52d3f6957768a0b9d5bd7bc4c90f2744 Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Fri, 31 Jan 2025 10:27:39 -0300
+Subject: [PATCH] math: Fix log10p1f internal table value (BZ 32626)
+
+It was copied wrong from CORE-MATH.
+
+(cherry picked from commit c79277a16785c8ae96d821414f4d31d654a0177c)
+---
+ NEWS                                |  3 ++-
+ math/auto-libm-test-in              |  2 ++
+ math/auto-libm-test-out-log10p1     | 25 +++++++++++++++++++++++++
+ sysdeps/ieee754/flt-32/s_log10p1f.c |  2 +-
+ 4 files changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/math/auto-libm-test-in b/math/auto-libm-test-in
+index 01ba689aa8..c0627dc7eb 100644
+--- a/math/auto-libm-test-in
++++ b/math/auto-libm-test-in
+@@ -7291,6 +7291,8 @@ log10p1 -0x1p-125
+ log10p1 -0x1p-1021
+ log10p1 -0x1p-16381
+ 
++log10p1 0x1.27f7dap-17
++
+ log10p1 0x7.2a4368p-4
+ log10p1 0x6.d3a118p-4
+ log10p1 0x5.03f228p+0
+diff --git a/math/auto-libm-test-out-log10p1 b/math/auto-libm-test-out-log10p1
+index 87bdb0bcde..f5ce965720 100644
+--- a/math/auto-libm-test-out-log10p1
++++ b/math/auto-libm-test-out-log10p1
+@@ -1789,6 +1789,31 @@ log10p1 -0x1p-16381
+ = log10p1 tonearest binary128 -0x8p-16384 : -0x3.796f62a4dca1c654d56eaabeb4dp-16384 : inexact-ok underflow errno-erange-ok
+ = log10p1 towardzero binary128 -0x8p-16384 : -0x3.796f62a4dca1c654d56eaabeb4ccp-16384 : inexact-ok underflow errno-erange-ok
+ = log10p1 upward binary128 -0x8p-16384 : -0x3.796f62a4dca1c654d56eaabeb4ccp-16384 : inexact-ok underflow errno-erange-ok
++log10p1 0x1.27f7dap-17
++= log10p1 downward binary32 0x9.3fbedp-20 : 0x4.044b5p-20 : inexact-ok
++= log10p1 tonearest binary32 0x9.3fbedp-20 : 0x4.044b5p-20 : inexact-ok
++= log10p1 towardzero binary32 0x9.3fbedp-20 : 0x4.044b5p-20 : inexact-ok
++= log10p1 upward binary32 0x9.3fbedp-20 : 0x4.044b58p-20 : inexact-ok
++= log10p1 downward binary64 0x9.3fbedp-20 : 0x4.044b5157872ep-20 : inexact-ok
++= log10p1 tonearest binary64 0x9.3fbedp-20 : 0x4.044b5157872e4p-20 : inexact-ok
++= log10p1 towardzero binary64 0x9.3fbedp-20 : 0x4.044b5157872ep-20 : inexact-ok
++= log10p1 upward binary64 0x9.3fbedp-20 : 0x4.044b5157872e4p-20 : inexact-ok
++= log10p1 downward intel96 0x9.3fbedp-20 : 0x4.044b5157872e2868p-20 : inexact-ok
++= log10p1 tonearest intel96 0x9.3fbedp-20 : 0x4.044b5157872e2868p-20 : inexact-ok
++= log10p1 towardzero intel96 0x9.3fbedp-20 : 0x4.044b5157872e2868p-20 : inexact-ok
++= log10p1 upward intel96 0x9.3fbedp-20 : 0x4.044b5157872e287p-20 : inexact-ok
++= log10p1 downward m68k96 0x9.3fbedp-20 : 0x4.044b5157872e2868p-20 : inexact-ok
++= log10p1 tonearest m68k96 0x9.3fbedp-20 : 0x4.044b5157872e2868p-20 : inexact-ok
++= log10p1 towardzero m68k96 0x9.3fbedp-20 : 0x4.044b5157872e2868p-20 : inexact-ok
++= log10p1 upward m68k96 0x9.3fbedp-20 : 0x4.044b5157872e287p-20 : inexact-ok
++= log10p1 downward binary128 0x9.3fbedp-20 : 0x4.044b5157872e2868f5c04287d808p-20 : inexact-ok
++= log10p1 tonearest binary128 0x9.3fbedp-20 : 0x4.044b5157872e2868f5c04287d80cp-20 : inexact-ok
++= log10p1 towardzero binary128 0x9.3fbedp-20 : 0x4.044b5157872e2868f5c04287d808p-20 : inexact-ok
++= log10p1 upward binary128 0x9.3fbedp-20 : 0x4.044b5157872e2868f5c04287d80cp-20 : inexact-ok
++= log10p1 downward ibm128 0x9.3fbedp-20 : 0x4.044b5157872e2868f5c04287d8p-20 : inexact-ok
++= log10p1 tonearest ibm128 0x9.3fbedp-20 : 0x4.044b5157872e2868f5c04287d8p-20 : inexact-ok
++= log10p1 towardzero ibm128 0x9.3fbedp-20 : 0x4.044b5157872e2868f5c04287d8p-20 : inexact-ok
++= log10p1 upward ibm128 0x9.3fbedp-20 : 0x4.044b5157872e2868f5c04287dap-20 : inexact-ok
+ log10p1 0x7.2a4368p-4
+ = log10p1 downward binary32 0x7.2a4368p-4 : 0x2.9248dcp-4 : inexact-ok
+ = log10p1 tonearest binary32 0x7.2a4368p-4 : 0x2.9248ep-4 : inexact-ok
+diff --git a/sysdeps/ieee754/flt-32/s_log10p1f.c b/sysdeps/ieee754/flt-32/s_log10p1f.c
+index 64deb1eeda..4e11d55d49 100644
+--- a/sysdeps/ieee754/flt-32/s_log10p1f.c
++++ b/sysdeps/ieee754/flt-32/s_log10p1f.c
+@@ -70,7 +70,7 @@ __log10p1f (float x)
+     };
+   static const double tl[] =
+     {
+-      0x1.562ec497ef351p-43, 0x1.b9476892ea99cp-8, 0x1.b5e909c959eecp-7,
++     -0x1.562ec497ef351p-43, 0x1.b9476892ea99cp-8, 0x1.b5e909c959eecp-7,
+       0x1.45f4f59ec84fp-6,   0x1.af5f92cbcf2aap-6, 0x1.0ba01a6069052p-5,
+       0x1.3ed119b99dd41p-5,  0x1.714834298a088p-5, 0x1.a30a9d98309c1p-5,
+       0x1.d41d51266b9d9p-5,  0x1.02428c0f62dfcp-4, 0x1.1a23444eea521p-4,
+-- 
+2.48.1
+

round-sinhf.patch

@@ -0,0 +1,76 @@
+From d85a7719536f4892f2b53d4594e18f6d096c2882 Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Fri, 31 Jan 2025 10:34:32 -0300
+Subject: [PATCH] math: Fix sinhf for some inputs (BZ 32627)
+
+The logic was copied wrong from CORE-MATH.
+---
+ math/auto-libm-test-in           |  1 +
+ math/auto-libm-test-out-sinh     | 25 +++++++++++++++++++++++++
+ sysdeps/ieee754/flt-32/e_sinhf.c |  2 +-
+ 3 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/math/auto-libm-test-in b/math/auto-libm-test-in
+index c0627dc7eb..5f465b31f1 100644
+--- a/math/auto-libm-test-in
++++ b/math/auto-libm-test-in
+@@ -8300,6 +8300,7 @@ sinh -0x1.3dda8ap+0
+ sinh -0x5.ee9218p-4
+ sinh -0x1.bcfc98p+0
+ sinh -0x6.9bbb6df7c5d08p-4
++sinh 0x1.250bfep-11
+ # the next value generates larger error bounds on x86_64 (ldbl-96)
+ sinh 0x2.c5d376167f4052f4p+12
+ sinh max
+diff --git a/math/auto-libm-test-out-sinh b/math/auto-libm-test-out-sinh
+index 0b77a77eeb..3924e19d86 100644
+--- a/math/auto-libm-test-out-sinh
++++ b/math/auto-libm-test-out-sinh
+@@ -2115,6 +2115,31 @@ sinh -0x6.9bbb6df7c5d08p-4
+ = sinh tonearest ibm128 -0x6.9bbb6df7c5d08p-4 : -0x6.cc3ddf003dcda77f8f9e892e36p-4 : inexact-ok
+ = sinh towardzero ibm128 -0x6.9bbb6df7c5d08p-4 : -0x6.cc3ddf003dcda77f8f9e892e36p-4 : inexact-ok
+ = sinh upward ibm128 -0x6.9bbb6df7c5d08p-4 : -0x6.cc3ddf003dcda77f8f9e892e36p-4 : inexact-ok
++sinh 0x1.250bfep-11
++= sinh downward binary32 0x2.4a17fcp-12 : 0x2.4a17fcp-12 : inexact-ok
++= sinh tonearest binary32 0x2.4a17fcp-12 : 0x2.4a17fcp-12 : inexact-ok
++= sinh towardzero binary32 0x2.4a17fcp-12 : 0x2.4a17fcp-12 : inexact-ok
++= sinh upward binary32 0x2.4a17fcp-12 : 0x2.4a18p-12 : inexact-ok
++= sinh downward binary64 0x2.4a17fcp-12 : 0x2.4a17fdffffffep-12 : inexact-ok
++= sinh tonearest binary64 0x2.4a17fcp-12 : 0x2.4a17fep-12 : inexact-ok
++= sinh towardzero binary64 0x2.4a17fcp-12 : 0x2.4a17fdffffffep-12 : inexact-ok
++= sinh upward binary64 0x2.4a17fcp-12 : 0x2.4a17fep-12 : inexact-ok
++= sinh downward intel96 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87cp-12 : inexact-ok
++= sinh tonearest intel96 0x2.4a17fcp-12 : 0x2.4a17fdfffffff88p-12 : inexact-ok
++= sinh towardzero intel96 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87cp-12 : inexact-ok
++= sinh upward intel96 0x2.4a17fcp-12 : 0x2.4a17fdfffffff88p-12 : inexact-ok
++= sinh downward m68k96 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87cp-12 : inexact-ok
++= sinh tonearest m68k96 0x2.4a17fcp-12 : 0x2.4a17fdfffffff88p-12 : inexact-ok
++= sinh towardzero m68k96 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87cp-12 : inexact-ok
++= sinh upward m68k96 0x2.4a17fcp-12 : 0x2.4a17fdfffffff88p-12 : inexact-ok
++= sinh downward binary128 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87e8d322786ec88p-12 : inexact-ok
++= sinh tonearest binary128 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87e8d322786ec8ap-12 : inexact-ok
++= sinh towardzero binary128 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87e8d322786ec88p-12 : inexact-ok
++= sinh upward binary128 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87e8d322786ec8ap-12 : inexact-ok
++= sinh downward ibm128 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87e8d322786ecp-12 : inexact-ok
++= sinh tonearest ibm128 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87e8d322786edp-12 : inexact-ok
++= sinh towardzero ibm128 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87e8d322786ecp-12 : inexact-ok
++= sinh upward ibm128 0x2.4a17fcp-12 : 0x2.4a17fdfffffff87e8d322786edp-12 : inexact-ok
+ sinh 0x2.c5d376167f4052f4p+12
+ = sinh downward binary32 0x2.c5d378p+12 : 0xf.fffffp+124 : inexact-ok overflow errno-erange-ok
+ = sinh tonearest binary32 0x2.c5d378p+12 : plus_infty : inexact-ok overflow errno-erange
+diff --git a/sysdeps/ieee754/flt-32/e_sinhf.c b/sysdeps/ieee754/flt-32/e_sinhf.c
+index c007c7d174..dee96fc7cb 100644
+--- a/sysdeps/ieee754/flt-32/e_sinhf.c
++++ b/sysdeps/ieee754/flt-32/e_sinhf.c
+@@ -83,7 +83,7 @@ __ieee754_sinhf (float x)
+ 	{					   /* |x| <= 0x1.250bfep-11 */
+ 	  if (__glibc_unlikely (ux < 0x66000000u)) /* |x| < 0x1p-24 */
+ 	    return fmaf (x, fabsf (x), x);
+-	  if (__glibc_unlikely (st.uarg == asuint (ux)))
++	  if (__glibc_unlikely (st.uarg == ux))
+ 	    {
+ 	      float sgn = copysignf (1.0f, x);
+ 	      return sgn * st.rh + sgn * st.rl;
+-- 
+2.48.1
+

round-tanf.patch

@@ -0,0 +1,79 @@
+From cf88351b685da86667e17d344414a70696ac82f1 Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Sun, 2 Feb 2025 16:57:49 -0300
+Subject: [PATCH] math: Fix tanf for some inputs (BZ 32630)
+
+The logic was copied wrong from CORE-MATH.
+
+(cherry picked from commit 09e7f4d594b4308fbea18e3044148d67b59757c9)
+---
+ NEWS                            |  2 ++
+ math/auto-libm-test-in          |  1 +
+ math/auto-libm-test-out-tan     | 25 +++++++++++++++++++++++++
+ sysdeps/ieee754/flt-32/s_tanf.c |  2 +-
+ 4 files changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/math/auto-libm-test-in b/math/auto-libm-test-in
+index 5f465b31f1..4f194da19d 100644
+--- a/math/auto-libm-test-in
++++ b/math/auto-libm-test-in
+@@ -8664,6 +8664,7 @@ tan 0x1.1ad374p+0
+ tan -0x1.0d55b8p+0
+ tan 1.57079697
+ tan -1.57079697
++tan 0x1.ada6aap+27
+ tan 0x1p-5
+ tan 0x1p-10
+ tan 0x1p-15
+diff --git a/math/auto-libm-test-out-tan b/math/auto-libm-test-out-tan
+index 7d00d03e1d..1d5999ab90 100644
+--- a/math/auto-libm-test-out-tan
++++ b/math/auto-libm-test-out-tan
+@@ -2532,6 +2532,31 @@ tan -1.57079697
+ = tan tonearest ibm128 -0x1.921fc00ece4f02f278ade6ad9fp+0 : 0x1.7b91a0851bbbafa14cf21c2b5c8p+20 : inexact-ok
+ = tan towardzero ibm128 -0x1.921fc00ece4f02f278ade6ad9fp+0 : 0x1.7b91a0851bbbafa14cf21c2b5cp+20 : inexact-ok
+ = tan upward ibm128 -0x1.921fc00ece4f02f278ade6ad9fp+0 : 0x1.7b91a0851bbbafa14cf21c2b5c8p+20 : inexact-ok
++tan 0x1.ada6aap+27
++= tan downward binary32 0xd.6d355p+24 : 0x3.d00608p-4 : inexact-ok
++= tan tonearest binary32 0xd.6d355p+24 : 0x3.d00608p-4 : inexact-ok
++= tan towardzero binary32 0xd.6d355p+24 : 0x3.d00608p-4 : inexact-ok
++= tan upward binary32 0xd.6d355p+24 : 0x3.d0060cp-4 : inexact-ok
++= tan downward binary64 0xd.6d355p+24 : 0x3.d00608p-4 : inexact-ok
++= tan tonearest binary64 0xd.6d355p+24 : 0x3.d00608p-4 : inexact-ok
++= tan towardzero binary64 0xd.6d355p+24 : 0x3.d00608p-4 : inexact-ok
++= tan upward binary64 0xd.6d355p+24 : 0x3.d006080000002p-4 : inexact-ok
++= tan downward intel96 0xd.6d355p+24 : 0x3.d006080000000504p-4 : inexact-ok
++= tan tonearest intel96 0xd.6d355p+24 : 0x3.d006080000000508p-4 : inexact-ok
++= tan towardzero intel96 0xd.6d355p+24 : 0x3.d006080000000504p-4 : inexact-ok
++= tan upward intel96 0xd.6d355p+24 : 0x3.d006080000000508p-4 : inexact-ok
++= tan downward m68k96 0xd.6d355p+24 : 0x3.d006080000000504p-4 : inexact-ok
++= tan tonearest m68k96 0xd.6d355p+24 : 0x3.d006080000000508p-4 : inexact-ok
++= tan towardzero m68k96 0xd.6d355p+24 : 0x3.d006080000000504p-4 : inexact-ok
++= tan upward m68k96 0xd.6d355p+24 : 0x3.d006080000000508p-4 : inexact-ok
++= tan downward binary128 0xd.6d355p+24 : 0x3.d0060800000005067d16c1c9c15ap-4 : inexact-ok
++= tan tonearest binary128 0xd.6d355p+24 : 0x3.d0060800000005067d16c1c9c15ap-4 : inexact-ok
++= tan towardzero binary128 0xd.6d355p+24 : 0x3.d0060800000005067d16c1c9c15ap-4 : inexact-ok
++= tan upward binary128 0xd.6d355p+24 : 0x3.d0060800000005067d16c1c9c15cp-4 : inexact-ok
++= tan downward ibm128 0xd.6d355p+24 : 0x3.d0060800000005067d16c1c9c1p-4 : inexact-ok
++= tan tonearest ibm128 0xd.6d355p+24 : 0x3.d0060800000005067d16c1c9c1p-4 : inexact-ok
++= tan towardzero ibm128 0xd.6d355p+24 : 0x3.d0060800000005067d16c1c9c1p-4 : inexact-ok
++= tan upward ibm128 0xd.6d355p+24 : 0x3.d0060800000005067d16c1c9c2p-4 : inexact-ok
+ tan 0x1p-5
+ = tan downward binary32 0x8p-8 : 0x8.00aabp-8 : inexact-ok
+ = tan tonearest binary32 0x8p-8 : 0x8.00aacp-8 : inexact-ok
+diff --git a/sysdeps/ieee754/flt-32/s_tanf.c b/sysdeps/ieee754/flt-32/s_tanf.c
+index dfe56fc2a0..5ee1d6f35e 100644
+--- a/sysdeps/ieee754/flt-32/s_tanf.c
++++ b/sysdeps/ieee754/flt-32/s_tanf.c
+@@ -166,7 +166,7 @@ __tanf (float x)
+       uint32_t sgn = t >> 31;
+       for (int j = 0; j < array_length (st); j++)
+ 	{
+-	  if (__glibc_unlikely (asfloat (st[j].arg) == ax))
++	  if (__glibc_unlikely (asuint (st[j].arg) == ax))
+ 	    {
+ 	      if (sgn)
+ 		return -st[j].rh - st[j].rl;
+-- 
+2.48.1
+

tst-aarch64-pkey.patch

@@ -0,0 +1,37 @@
+From 1e0e33e1b19a7634b364ac7b97c3c9612d5b776f Mon Sep 17 00:00:00 2001
+From: Aurelien Jarno <aurelien@aurel32.net>
+Date: Sat, 15 Feb 2025 11:08:33 +0100
+Subject: [PATCH] Fix tst-aarch64-pkey to handle ENOSPC as not supported
+
+The syscall pkey_alloc can return ENOSPC to indicate either that all
+keys are in use or that the system runs in a mode in which memory
+protection keys are disabled. In such case the test should not fail and
+just return unsupported.
+
+This matches the behaviour of the generic tst-pkey.
+
+Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+Reviewed-by: Florian Weimer <fweimer@redhat.com>
+(cherry picked from commit 60f2d6be657aa8c663ee14bd266d343ae0f35afb)
+---
+ sysdeps/unix/sysv/linux/aarch64/tst-aarch64-pkey.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/sysdeps/unix/sysv/linux/aarch64/tst-aarch64-pkey.c b/sysdeps/unix/sysv/linux/aarch64/tst-aarch64-pkey.c
+index 3ff33ef72a..c884efc3b4 100644
+--- a/sysdeps/unix/sysv/linux/aarch64/tst-aarch64-pkey.c
++++ b/sysdeps/unix/sysv/linux/aarch64/tst-aarch64-pkey.c
+@@ -55,6 +55,10 @@ do_test (void)
+       if (errno == ENOSYS || errno == EINVAL)
+         FAIL_UNSUPPORTED
+           ("kernel or CPU does not support memory protection keys");
++      if (errno == ENOSPC)
++        FAIL_UNSUPPORTED
++          ("no keys available or kernel does not support memory"
++           " protection keys");
+       FAIL_EXIT1 ("pkey_alloc: %m");
+     }
+ 
+-- 
+2.48.1
+

ulp-prologue-into-asm-functions.patch

@@ -1,4 +1,4 @@
-From ec4f0a28ed48c51165e3e72c7427efb0ae14a124 Mon Sep 17 00:00:00 2001
+From 322a7b6a9bad6ab6a985ea67f7bc65a434806061 Mon Sep 17 00:00:00 2001
 From: Giuliano Belinassi <gbelinassi@suse.de>
 Date: Mon, 6 May 2024 20:09:55 -0300
 Subject: [PATCH] Add Userspace Livepatch prologue into ASM functions
@@ -24,12 +24,12 @@ Signed-off-by: Giuliano Belinassi <gbelinassi@suse.de>
  9 files changed, 96 insertions(+), 16 deletions(-)
 
 diff --git a/Makeconfig b/Makeconfig
-index e583765712..b136e10224 100644
+index a0abc2239b..1eb730a2f7 100644
 --- a/Makeconfig
 +++ b/Makeconfig
-@@ -981,6 +981,11 @@ else
+@@ -1017,6 +1017,11 @@ endif
- +cflags += $(no-fortify-source)
+ # Filter out 64 bit time_t flags if compiler defines it by default.
- endif
+ +cflags += $(no-time-bits-source)
  
 +# Add flags for Userspace Livepatching support.
 +ifeq (yes,$(enable-userspace-livepatch))
@@ -40,10 +40,10 @@ index e583765712..b136e10224 100644
  # used to compile and will be installed.  Each can also contain an
  # include/ subdirectory, whose header files will be used to compile
 diff --git a/config.h.in b/config.h.in
-index c4cc7d3b9a..dc70ed03d0 100644
+index 6c25c923fa..98e267d71c 100644
 --- a/config.h.in
 +++ b/config.h.in
-@@ -205,6 +205,9 @@
+@@ -211,6 +211,9 @@
  /* Define to 1 if libpthread actually resides in libc.  */
  #define PTHREAD_IN_LIBC 0
  
@@ -54,7 +54,7 @@ index c4cc7d3b9a..dc70ed03d0 100644
  #define TIMEOUTFACTOR 1
  
 diff --git a/config.make.in b/config.make.in
-index 55e8b7563b..0f14c05d62 100644
+index 36096881b7..04cf873fad 100644
 --- a/config.make.in
 +++ b/config.make.in
 @@ -81,6 +81,7 @@ mach-interface-list = @mach_interface_list@
@@ -66,10 +66,10 @@ index 55e8b7563b..0f14c05d62 100644
  build-profile = @profile@
  build-static-nss = @static_nss@
 diff --git a/configure b/configure
-index 432e40a592..eb6b203925 100755
+index 9c0c0dce03..4b18c93595 100755
 --- a/configure
 +++ b/configure
-@@ -622,6 +622,7 @@ LIBOBJS
+@@ -615,6 +615,7 @@ LIBOBJS
  pthread_in_libc
  RELEASE
  VERSION
@@ -77,7 +77,7 @@ index 432e40a592..eb6b203925 100755
  mach_interface_list
  DEFINES
  static_nss
-@@ -812,6 +813,7 @@ enable_cet
+@@ -811,6 +812,7 @@ enable_cet
  enable_scv
  enable_fortify_source
  with_cpu
@@ -85,7 +85,7 @@ index 432e40a592..eb6b203925 100755
  '
        ac_precious_vars='build_alias
  host_alias
-@@ -1490,6 +1492,8 @@ Optional Features:
+@@ -1493,6 +1495,8 @@ Optional Features:
                            Use -D_FORTIFY_SOURCE=[1|2|3] to control code
                            hardening, defaults to highest possible value
                            supported by the build compiler.
@@ -94,7 +94,7 @@ index 432e40a592..eb6b203925 100755
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -7867,6 +7871,23 @@ libc_cv_multidir=`${CC-cc} $CFLAGS $CPPFLAGS -print-multi-directory`
+@@ -8184,6 +8188,23 @@ libc_cv_multidir=`${CC-cc} $CFLAGS $CPPFLAGS -print-multi-directory`
  
  
  
@@ -119,10 +119,10 @@ index 432e40a592..eb6b203925 100755
  RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h`
  
 diff --git a/configure.ac b/configure.ac
-index bdc385d03c..cb4d28b3d8 100644
+index d5a00461ff..80f183a7b5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1756,6 +1756,19 @@ AC_SUBST(DEFINES)
+@@ -1813,6 +1813,19 @@ AC_SUBST(DEFINES)
  dnl See sysdeps/mach/configure.ac for this variable.
  AC_SUBST(mach_interface_list)
  
@@ -159,10 +159,10 @@ index 5bc1d90078..3ea96c0aa3 100644
  # if defined USE_AS_STRCASECMP_L
  	/* We have to fall back on the C implementation for locales with
 diff --git a/sysdeps/x86_64/multiarch/strcmp-evex.S b/sysdeps/x86_64/multiarch/strcmp-evex.S
-index 06730ab2a1..d96b1c4824 100644
+index cea034f394..3ed55b7d66 100644
 --- a/sysdeps/x86_64/multiarch/strcmp-evex.S
 +++ b/sysdeps/x86_64/multiarch/strcmp-evex.S
-@@ -224,10 +224,7 @@ END (STRCASECMP)
+@@ -226,10 +226,7 @@ END (STRCASECMP)
  # endif
  
  	.p2align 4
@@ -268,5 +268,5 @@ index db6e36b2dd..86a5d1b2be 100644
  /* This macro is for setting proper CFI with DW_CFA_expression describing
     the register as saved relative to %rsp instead of relative to the CFA.
 -- 
-2.44.0
+2.46.2