import glibc-2.34-40.el9

SOURCES/glibc-rh2054789.patch

+commit ea89d5bbd9e5e514b606045d909e6ab87d851c88
+Author: Arjun Shankar <arjun@redhat.com>
+Date:   Thu Feb 24 21:43:09 2022 +0100
+
+    localedef: Handle symbolic links when generating locale-archive
+    
+    Whenever locale data for any locale included symbolic links, localedef
+    would throw the error "incomplete set of locale files" and exclude it
+    from the generated locale archive.  This commit fixes that.
+    
+    Co-authored-by: Florian Weimer <fweimer@redhat.com>
+    
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+
+diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
+index f38e835c52e4a967..d79278b6ed7340bf 100644
+--- a/locale/programs/locarchive.c
++++ b/locale/programs/locarchive.c
+@@ -1391,7 +1391,7 @@ add_locales_to_archive (size_t nlist, char *list[], bool replace)
+ 		    {
+ 		      char fullname[fnamelen + 2 * strlen (d->d_name) + 7];
+ 
+-		      if (d_type == DT_UNKNOWN)
++		      if (d_type == DT_UNKNOWN || d_type == DT_LNK)
+ 			{
+ 			  strcpy (stpcpy (stpcpy (fullname, fname), "/"),
+ 				  d->d_name);

SOURCES/glibc-rh2085529-2.patch

+commit 6c33b018438ee799c29486f21d43d8100bdbd597
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Wed Feb 2 22:37:20 2022 +0100
+
+    Linux: Use ptrdiff_t for __rseq_offset
+    
+    This matches the data size initial-exec relocations use on most
+    targets.
+    
+    Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+
+diff --git a/manual/threads.texi b/manual/threads.texi
+index 4869f69d2ceed255..48fd562923800b34 100644
+--- a/manual/threads.texi
++++ b/manual/threads.texi
+@@ -1004,7 +1004,7 @@ The manual for the @code{rseq} system call can be found
+ at @uref{https://git.kernel.org/pub/scm/libs/librseq/librseq.git/tree/doc/man/rseq.2}.
+ @end deftp
+ 
+-@deftypevar {int} __rseq_offset
++@deftypevar {ptrdiff_t} __rseq_offset
+ @standards{Linux, sys/rseq.h}
+ This variable contains the offset between the thread pointer (as defined
+ by @code{__builtin_thread_pointer} or the thread pointer register for
+diff --git a/sysdeps/nptl/dl-tls_init_tp.c b/sysdeps/nptl/dl-tls_init_tp.c
+index 0f5280a75d546d2f..d5f2587f1348441c 100644
+--- a/sysdeps/nptl/dl-tls_init_tp.c
++++ b/sysdeps/nptl/dl-tls_init_tp.c
+@@ -46,7 +46,7 @@ rtld_mutex_dummy (pthread_mutex_t *lock)
+ 
+ const unsigned int __rseq_flags;
+ const unsigned int __rseq_size attribute_relro;
+-const int __rseq_offset attribute_relro;
++const ptrdiff_t __rseq_offset attribute_relro;
+ 
+ void
+ __tls_pre_init_tp (void)
+@@ -119,7 +119,7 @@ __tls_init_tp (void)
+        all targets support __thread_pointer, so set __rseq_offset only
+        if thre rseq registration may have happened because RSEQ_SIG is
+        defined.  */
+-    extern int offset __asm__ ("__rseq_offset");
++    extern ptrdiff_t offset __asm__ ("__rseq_offset");
+     offset = (char *) &pd->rseq_area - (char *) __thread_pointer ();
+ #endif
+   }
+diff --git a/sysdeps/unix/sysv/linux/aarch64/ld.abilist b/sysdeps/unix/sysv/linux/aarch64/ld.abilist
+index bf4d4f9b6f2ddf97..5151c0781de01bf1 100644
+--- a/sysdeps/unix/sysv/linux/aarch64/ld.abilist
++++ b/sysdeps/unix/sysv/linux/aarch64/ld.abilist
+@@ -5,5 +5,5 @@ GLIBC_2.17 _dl_mcount F
+ GLIBC_2.17 _r_debug D 0x28
+ GLIBC_2.34 __rtld_version_placeholder F
+ GLIBC_2.35 __rseq_flags D 0x4
+-GLIBC_2.35 __rseq_offset D 0x4
++GLIBC_2.35 __rseq_offset D 0x8
+ GLIBC_2.35 __rseq_size D 0x4
+diff --git a/sysdeps/unix/sysv/linux/alpha/ld.abilist b/sysdeps/unix/sysv/linux/alpha/ld.abilist
+index a23325a566419b41..3e296c547314f6c2 100644
+--- a/sysdeps/unix/sysv/linux/alpha/ld.abilist
++++ b/sysdeps/unix/sysv/linux/alpha/ld.abilist
+@@ -4,6 +4,6 @@ GLIBC_2.1 _dl_mcount F
+ GLIBC_2.3 __tls_get_addr F
+ GLIBC_2.34 __rtld_version_placeholder F
+ GLIBC_2.35 __rseq_flags D 0x4
+-GLIBC_2.35 __rseq_offset D 0x4
++GLIBC_2.35 __rseq_offset D 0x8
+ GLIBC_2.35 __rseq_size D 0x4
+ GLIBC_2.4 __stack_chk_guard D 0x8
+diff --git a/sysdeps/unix/sysv/linux/ia64/ld.abilist b/sysdeps/unix/sysv/linux/ia64/ld.abilist
+index 8ccb5be911e0e9a2..5471b24d59a7527a 100644
+--- a/sysdeps/unix/sysv/linux/ia64/ld.abilist
++++ b/sysdeps/unix/sysv/linux/ia64/ld.abilist
+@@ -4,5 +4,5 @@ GLIBC_2.2 _r_debug D 0x28
+ GLIBC_2.3 __tls_get_addr F
+ GLIBC_2.34 __rtld_version_placeholder F
+ GLIBC_2.35 __rseq_flags D 0x4
+-GLIBC_2.35 __rseq_offset D 0x4
++GLIBC_2.35 __rseq_offset D 0x8
+ GLIBC_2.35 __rseq_size D 0x4
+diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist
+index 37a47ebc0a0d16c8..f26e594a139f0058 100644
+--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist
++++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist
+@@ -4,6 +4,6 @@ GLIBC_2.2 _dl_mcount F
+ GLIBC_2.3 __tls_get_addr F
+ GLIBC_2.34 __rtld_version_placeholder F
+ GLIBC_2.35 __rseq_flags D 0x4
+-GLIBC_2.35 __rseq_offset D 0x4
++GLIBC_2.35 __rseq_offset D 0x8
+ GLIBC_2.35 __rseq_size D 0x4
+ GLIBC_2.4 __stack_chk_guard D 0x8
+diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/ld.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/ld.abilist
+index da24dc7fb52ad2d4..21f472e674299ab7 100644
+--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/ld.abilist
++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/ld.abilist
+@@ -6,5 +6,5 @@ GLIBC_2.3 _dl_mcount F
+ GLIBC_2.3 _r_debug D 0x28
+ GLIBC_2.34 __rtld_version_placeholder F
+ GLIBC_2.35 __rseq_flags D 0x4
+-GLIBC_2.35 __rseq_offset D 0x4
++GLIBC_2.35 __rseq_offset D 0x8
+ GLIBC_2.35 __rseq_size D 0x4
+diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/ld.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/ld.abilist
+index b9ae89ae8d90ed9e..9c9c40450d651880 100644
+--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/ld.abilist
++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/ld.abilist
+@@ -6,5 +6,5 @@ GLIBC_2.22 __tls_get_addr_opt F
+ GLIBC_2.23 __parse_hwcap_and_convert_at_platform F
+ GLIBC_2.34 __rtld_version_placeholder F
+ GLIBC_2.35 __rseq_flags D 0x4
+-GLIBC_2.35 __rseq_offset D 0x4
++GLIBC_2.35 __rseq_offset D 0x8
+ GLIBC_2.35 __rseq_size D 0x4
+diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/ld.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/ld.abilist
+index 48431c91a9fd16b0..a7758a0e52fc8cc8 100644
+--- a/sysdeps/unix/sysv/linux/riscv/rv64/ld.abilist
++++ b/sysdeps/unix/sysv/linux/riscv/rv64/ld.abilist
+@@ -5,5 +5,5 @@ GLIBC_2.27 _dl_mcount F
+ GLIBC_2.27 _r_debug D 0x28
+ GLIBC_2.34 __rtld_version_placeholder F
+ GLIBC_2.35 __rseq_flags D 0x4
+-GLIBC_2.35 __rseq_offset D 0x4
++GLIBC_2.35 __rseq_offset D 0x8
+ GLIBC_2.35 __rseq_size D 0x4
+diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist
+index 117d1430a4c6272e..78d071600b1f3431 100644
+--- a/sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist
++++ b/sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist
+@@ -4,5 +4,5 @@ GLIBC_2.2 _r_debug D 0x28
+ GLIBC_2.3 __tls_get_offset F
+ GLIBC_2.34 __rtld_version_placeholder F
+ GLIBC_2.35 __rseq_flags D 0x4
+-GLIBC_2.35 __rseq_offset D 0x4
++GLIBC_2.35 __rseq_offset D 0x8
+ GLIBC_2.35 __rseq_size D 0x4
+diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/ld.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/ld.abilist
+index 8ccb5be911e0e9a2..5471b24d59a7527a 100644
+--- a/sysdeps/unix/sysv/linux/sparc/sparc64/ld.abilist
++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/ld.abilist
+@@ -4,5 +4,5 @@ GLIBC_2.2 _r_debug D 0x28
+ GLIBC_2.3 __tls_get_addr F
+ GLIBC_2.34 __rtld_version_placeholder F
+ GLIBC_2.35 __rseq_flags D 0x4
+-GLIBC_2.35 __rseq_offset D 0x4
++GLIBC_2.35 __rseq_offset D 0x8
+ GLIBC_2.35 __rseq_size D 0x4
+diff --git a/sysdeps/unix/sysv/linux/sys/rseq.h b/sysdeps/unix/sysv/linux/sys/rseq.h
+index 1215b5d086b8852b..791ed83176b61fe4 100644
+--- a/sysdeps/unix/sysv/linux/sys/rseq.h
++++ b/sysdeps/unix/sysv/linux/sys/rseq.h
+@@ -21,6 +21,7 @@
+ /* Architecture-specific rseq signature.  */
+ #include <bits/rseq.h>
+ 
++#include <stddef.h>
+ #include <stdint.h>
+ #include <sys/cdefs.h>
+ #include <bits/endian.h>
+@@ -172,7 +173,7 @@ struct rseq
+ #endif /* __GLIBC_HAVE_KERNEL_RSEQ */
+ 
+ /* Offset from the thread pointer to the rseq area.  */
+-extern const int __rseq_offset;
++extern const ptrdiff_t __rseq_offset;
+ 
+ /* Size of the registered rseq area.  0 if the registration was
+    unsuccessful.  */
+diff --git a/sysdeps/unix/sysv/linux/x86_64/64/ld.abilist b/sysdeps/unix/sysv/linux/x86_64/64/ld.abilist
+index ae622bdf9710bdbd..5a8bd322cdc95d5b 100644
+--- a/sysdeps/unix/sysv/linux/x86_64/64/ld.abilist
++++ b/sysdeps/unix/sysv/linux/x86_64/64/ld.abilist
+@@ -4,5 +4,5 @@ GLIBC_2.2.5 _r_debug D 0x28
+ GLIBC_2.3 __tls_get_addr F
+ GLIBC_2.34 __rtld_version_placeholder F
+ GLIBC_2.35 __rseq_flags D 0x4
+-GLIBC_2.35 __rseq_offset D 0x4
++GLIBC_2.35 __rseq_offset D 0x8
+ GLIBC_2.35 __rseq_size D 0x4

SOURCES/glibc-rh2085529-3.patch

+commit 4b527650e0d559a5f693275c598667e06cd6455c
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Thu Jun 2 16:29:55 2022 +0200
+
+    Linux: Adjust struct rseq definition to current kernel version
+    
+    This definition is only used as a fallback with old kernel headers.
+    The change follows kernel commit bfdf4e6208051ed7165b2e92035b4bf11
+    ("rseq: Remove broken uapi field layout on 32-bit little endian").
+    
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+
+diff --git a/sysdeps/unix/sysv/linux/sys/rseq.h b/sysdeps/unix/sysv/linux/sys/rseq.h
+index 791ed83176b61fe4..56550329db962cc8 100644
+--- a/sysdeps/unix/sysv/linux/sys/rseq.h
++++ b/sysdeps/unix/sysv/linux/sys/rseq.h
+@@ -24,7 +24,6 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <sys/cdefs.h>
+-#include <bits/endian.h>
+ 
+ #ifdef __has_include
+ # if __has_include ("linux/rseq.h")
+@@ -129,28 +128,13 @@ struct rseq
+        targeted by the rseq_cs.  Also needs to be set to NULL by user-space
+        before reclaiming memory that contains the targeted struct rseq_cs.
+ 
+-       Read and set by the kernel.  Set by user-space with single-copy
+-       atomicity semantics.  This field should only be updated by the
+-       thread which registered this data structure.  Aligned on 64-bit.  */
+-    union
+-      {
+-        uint64_t ptr64;
+-# ifdef __LP64__
+-        uint64_t ptr;
+-# else /* __LP64__ */
+-        struct
+-          {
+-#if __BYTE_ORDER == __BIG_ENDIAN
+-            uint32_t padding; /* Initialized to zero.  */
+-            uint32_t ptr32;
+-#  else /* LITTLE */
+-            uint32_t ptr32;
+-            uint32_t padding; /* Initialized to zero.  */
+-#  endif /* ENDIAN */
+-          } ptr;
+-# endif /* __LP64__ */
+-      } rseq_cs;
++       Read and set by the kernel. Set by user-space with single-copy
++       atomicity semantics. This field should only be updated by the
++       thread which registered this data structure. Aligned on 64-bit.
+ 
++       32-bit architectures should update the low order bits of the
++       rseq_cs field, leaving the high order bits initialized to 0.  */
++    uint64_t rseq_cs;
+     /* Restartable sequences flags field.
+ 
+        This field should only be updated by the thread which

SOURCES/glibc-rh2085529-4.patch

+Revert glibc-rh2024347-13.patch.  Enable rseq by default.
+
+diff --git a/manual/tunables.texi b/manual/tunables.texi
+index f559c44dcec4624b..28ff502990c2a10f 100644
+--- a/manual/tunables.texi
++++ b/manual/tunables.texi
+@@ -425,13 +425,11 @@ The value is measured in bytes.  The default is @samp{41943040}
+ @end deftp
+ 
+ @deftp Tunable glibc.pthread.rseq
+-The @code{glibc.pthread.rseq} tunable can be set to @samp{1}, to enable
+-restartable sequences support.  @Theglibc{} uses this to optimize the
+-@code{sched_getcpu} function.
+-
+-The default is @samp{0}, which means that applications can perform
+-restartable sequences registration, but @code{sched_getcpu} is not
+-accelerated.
++The @code{glibc.pthread.rseq} tunable can be set to @samp{0}, to disable
++restartable sequences support in @theglibc{}.  This enables applications
++to perform direct restartable sequence registration with the kernel.
++The default is @samp{1}, which means that @theglibc{} performs
++registration on behalf of the application.
+ 
+ Restartable sequences are a Linux-specific extension.
+ @end deftp
+diff --git a/sysdeps/nptl/dl-tunables.list b/sysdeps/nptl/dl-tunables.list
+index df2a39ce01858d3b..d24f4be0d08ba407 100644
+--- a/sysdeps/nptl/dl-tunables.list
++++ b/sysdeps/nptl/dl-tunables.list
+@@ -31,7 +31,7 @@ glibc {
+       type: INT_32
+       minval: 0
+       maxval: 1
+-      default: 0
++      default: 1
+     }
+   }
+ }

SOURCES/glibc-rh2096191-1.patch

+commit 62a321b12d0e397af88fa422db65079332f971dc
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Fri Jun 24 18:16:41 2022 +0200
+
+    support: Change non-address output format of support_format_dns_packet
+    
+    It makes sense to include the owner name (LHS) and record type in the
+    output, so that they can be checked for correctness.
+    
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+
+diff --git a/support/support_format_dns_packet.c b/support/support_format_dns_packet.c
+index 1f8e9ca172a06f4f..c3dff0e019801904 100644
+--- a/support/support_format_dns_packet.c
++++ b/support/support_format_dns_packet.c
+@@ -101,6 +101,17 @@ extract_name (struct in_buffer full, struct in_buffer *in, struct dname *value)
+   return true;
+ }
+ 
++static void
++extract_name_data (struct in_buffer full, struct in_buffer *rdata,
++                   const struct dname *owner, const char *typename, FILE *out)
++{
++  struct dname name;
++  if (extract_name (full, rdata, &name))
++    fprintf (out, "data: %s %s %s\n", owner->name, typename, name.name);
++  else
++    fprintf (out, "error: malformed CNAME/PTR record\n");
++}
++
+ char *
+ support_format_dns_packet (const unsigned char *buffer, size_t length)
+ {
+@@ -206,14 +217,11 @@ support_format_dns_packet (const unsigned char *buffer, size_t length)
+           }
+           break;
+         case T_CNAME:
++          extract_name_data (full, &rdata, &rname, "CNAME", mem.out);
++          break;
+         case T_PTR:
+-          {
+-            struct dname name;
+-            if (extract_name (full, &rdata, &name))
+-              fprintf (mem.out, "name: %s\n", name.name);
+-            else
+-              fprintf (mem.out, "error: malformed CNAME/PTR record\n");
+-          }
++          extract_name_data (full, &rdata, &rname, "PTR", mem.out);
++          break;
+         }
+     }
+ 
+diff --git a/support/tst-support_format_dns_packet.c b/support/tst-support_format_dns_packet.c
+index 03ff59457e3bdde8..5596db1785009557 100644
+--- a/support/tst-support_format_dns_packet.c
++++ b/support/tst-support_format_dns_packet.c
+@@ -85,8 +85,8 @@ test_multiple_cnames (void)
+     "\xc0\x00\x02\x01";
+   check_packet (packet, sizeof (packet) - 1, __func__,
+                 "name: www.example\n"
+-                "name: www1.example\n"
+-                "name: www2.example\n"
++                "data: www.example CNAME www1.example\n"
++                "data: www1.example CNAME www2.example\n"
+                 "address: 192.0.2.1\n");
+ }
+ 

SOURCES/glibc-upstream-2.34-108.patch

+commit 0351c75c5f94134fcec0e778e8cf86d149f8bbfb
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date:   Thu Feb 3 16:52:52 2022 -0300
+
+    linux: Fix missing __convert_scm_timestamps (BZ #28860)
+    
+    Commit 948ce73b31 made recvmsg/recvmmsg to always call
+    __convert_scm_timestamps for 64 bit time_t symbol, so adjust it to
+    always build it for __TIMESIZE != 64.
+    
+    It fixes build for architecture with 32 bit time_t support when
+    configured with minimum kernel of 5.1.
+    
+    (cherry-picked from 798d716df71fb23dc89d1d5dba1fc26a1b5c0024)
+
+diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
+index 5d3c4199e0b32944..953ce97bd2e03849 100644
+--- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
++++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
+@@ -16,9 +16,10 @@
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+ 
+-#include <kernel-features.h>
++#include <bits/wordsize.h>
++#include <bits/timesize.h>
+ 
+-#ifndef __ASSUME_TIME64_SYSCALLS
++#if __TIMESIZE != 64
+ # include <stdint.h>
+ # include <string.h>
+ # include <sys/socket.h>

SOURCES/glibc-upstream-2.34-110.patch

+commit 007e054d786be340699c634e3a3b30ab1fde1a7a
+Author: Dmitry V. Levin <ldv@altlinux.org>
+Date:   Sat Feb 5 08:00:00 2022 +0000
+
+    linux: fix accuracy of get_nprocs and get_nprocs_conf [BZ #28865]
+    
+    get_nprocs() and get_nprocs_conf() use various methods to obtain an
+    accurate number of processors.  Re-introduce __get_nprocs_sched() as
+    a source of information, and fix the order in which these methods are
+    used to return the most accurate information.  The primary source of
+    information used in both functions remains unchanged.
+    
+    This also changes __get_nprocs_sched() error return value from 2 to 0,
+    but all its users are already prepared to handle that.
+    
+    Old fallback order:
+      get_nprocs:
+        /sys/devices/system/cpu/online -> /proc/stat -> 2
+      get_nprocs_conf:
+        /sys/devices/system/cpu/ -> /proc/stat -> 2
+    
+    New fallback order:
+      get_nprocs:
+        /sys/devices/system/cpu/online -> /proc/stat -> sched_getaffinity -> 2
+      get_nprocs_conf:
+        /sys/devices/system/cpu/ -> /proc/stat -> sched_getaffinity -> 2
+    
+    Fixes: 342298278e ("linux: Revert the use of sched_getaffinity on get_nproc")
+    Closes: BZ #28865
+    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+    
+    (cherry picked from commit e1d32b836410767270a3adf1f82b1a47e6e4cd51)
+
+diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
+index 7babd947aa902e77..327802b14c7326a3 100644
+--- a/sysdeps/unix/sysv/linux/getsysstats.c
++++ b/sysdeps/unix/sysv/linux/getsysstats.c
+@@ -51,9 +51,8 @@ __get_nprocs_sched (void)
+        is an arbitrary values assuming such systems should be rare and there
+        is no offline cpus.  */
+     return max_num_cpus;
+-  /* Some other error.  2 is conservative (not a uniprocessor system, so
+-     atomics are needed). */
+-  return 2;
++  /* Some other error.  */
++  return 0;
+ }
+ 
+ static char *
+@@ -109,22 +108,19 @@ next_line (int fd, char *const buffer, char **cp, char **re,
+ }
+ 
+ static int
+-get_nproc_stat (char *buffer, size_t buffer_size)
++get_nproc_stat (void)
+ {
++  enum { buffer_size = 1024 };
++  char buffer[buffer_size];
+   char *buffer_end = buffer + buffer_size;
+   char *cp = buffer_end;
+   char *re = buffer_end;
+-
+-  /* Default to an SMP system in case we cannot obtain an accurate
+-     number.  */
+-  int result = 2;
++  int result = 0;
+ 
+   const int flags = O_RDONLY | O_CLOEXEC;
+   int fd = __open_nocancel ("/proc/stat", flags);
+   if (fd != -1)
+     {
+-      result = 0;
+-
+       char *l;
+       while ((l = next_line (fd, buffer, &cp, &re, buffer_end)) != NULL)
+ 	/* The current format of /proc/stat has all the cpu* entries
+@@ -140,8 +136,8 @@ get_nproc_stat (char *buffer, size_t buffer_size)
+   return result;
+ }
+ 
+-int
+-__get_nprocs (void)
++static int
++get_nprocs_cpu_online (void)
+ {
+   enum { buffer_size = 1024 };
+   char buffer[buffer_size];
+@@ -180,7 +176,8 @@ __get_nprocs (void)
+ 		  }
+ 	      }
+ 
+-	    result += m - n + 1;
++	    if (m >= n)
++	      result += m - n + 1;
+ 
+ 	    l = endp;
+ 	    if (l < re && *l == ',')
+@@ -189,28 +186,18 @@ __get_nprocs (void)
+ 	while (l < re && *l != '\n');
+ 
+       __close_nocancel_nostatus (fd);
+-
+-      if (result > 0)
+-	return result;
+     }
+ 
+-  return get_nproc_stat (buffer, buffer_size);
++  return result;
+ }
+-libc_hidden_def (__get_nprocs)
+-weak_alias (__get_nprocs, get_nprocs)
+-
+ 
+-/* On some architectures it is possible to distinguish between configured
+-   and active cpus.  */
+-int
+-__get_nprocs_conf (void)
++static int
++get_nprocs_cpu (void)
+ {
+-  /* Try to use the sysfs filesystem.  It has actual information about
+-     online processors.  */
++  int count = 0;
+   DIR *dir = __opendir ("/sys/devices/system/cpu");
+   if (dir != NULL)
+     {
+-      int count = 0;
+       struct dirent64 *d;
+ 
+       while ((d = __readdir64 (dir)) != NULL)
+@@ -225,12 +212,57 @@ __get_nprocs_conf (void)
+ 
+       __closedir (dir);
+ 
+-      return count;
+     }
++  return count;
++}
+ 
+-  enum { buffer_size = 1024 };
+-  char buffer[buffer_size];
+-  return get_nproc_stat (buffer, buffer_size);
++static int
++get_nprocs_fallback (void)
++{
++  int result;
++
++  /* Try /proc/stat first.  */
++  result = get_nproc_stat ();
++  if (result != 0)
++    return result;
++
++  /* Try sched_getaffinity.  */
++  result = __get_nprocs_sched ();
++  if (result != 0)
++    return result;
++
++  /* We failed to obtain an accurate number.  Be conservative: return
++     the smallest number meaning that this is not a uniprocessor system,
++     so atomics are needed.  */
++  return 2;
++}
++
++int
++__get_nprocs (void)
++{
++  /* Try /sys/devices/system/cpu/online first.  */
++  int result = get_nprocs_cpu_online ();
++  if (result != 0)
++    return result;
++
++  /* Fall back to /proc/stat and sched_getaffinity.  */
++  return get_nprocs_fallback ();
++}
++libc_hidden_def (__get_nprocs)
++weak_alias (__get_nprocs, get_nprocs)
++
++/* On some architectures it is possible to distinguish between configured
++   and active cpus.  */
++int
++__get_nprocs_conf (void)
++{
++  /* Try /sys/devices/system/cpu/ first.  */
++  int result = get_nprocs_cpu ();
++  if (result != 0)
++    return result;
++
++  /* Fall back to /proc/stat and sched_getaffinity.  */
++  return get_nprocs_fallback ();
+ }
+ libc_hidden_def (__get_nprocs_conf)
+ weak_alias (__get_nprocs_conf, get_nprocs_conf)

SOURCES/glibc-upstream-2.34-111.patch

+commit 04d60ce0f21ffe2a4add148cb37a1942dbad64e2
+Author: H.J. Lu <hjl.tools@gmail.com>
+Date:   Thu Feb 17 08:10:35 2022 -0800
+
+    string: Add a testcase for wcsncmp with SIZE_MAX [BZ #28755]
+    
+    Verify that wcsncmp (L("abc"), L("abd"), SIZE_MAX) == 0.  The new test
+    fails without
+    
+    commit ddf0992cf57a93200e0c782e2a94d0733a5a0b87
+    Author: Noah Goldstein <goldstein.w.n@gmail.com>
+    Date:   Sun Jan 9 16:02:21 2022 -0600
+    
+        x86: Fix __wcsncmp_avx2 in strcmp-avx2.S [BZ# 28755]
+    
+    and
+    
+    commit 7e08db3359c86c94918feb33a1182cd0ff3bb10b
+    Author: Noah Goldstein <goldstein.w.n@gmail.com>
+    Date:   Sun Jan 9 16:02:28 2022 -0600
+    
+        x86: Fix __wcsncmp_evex in strcmp-evex.S [BZ# 28755]
+    
+    This is for BZ #28755.
+    
+    Reviewed-by: Sunil K Pandey <skpgkp2@gmail.com>
+    
+    (cherry picked from commit aa5a720056d37cf24924c138a3dbe6dace98e97c)
+
+diff --git a/string/test-strncmp.c b/string/test-strncmp.c
+index 10b34de8d2acb2a1..97e831d88fd24316 100644
+--- a/string/test-strncmp.c
++++ b/string/test-strncmp.c
+@@ -435,6 +435,18 @@ check3 (void)
+ 	}
+ }
+ 
++static void
++check4 (void)
++{
++  const CHAR *s1 = L ("abc");
++  CHAR *s2 = STRDUP (s1);
++
++  FOR_EACH_IMPL (impl, 0)
++    check_result (impl, s1, s2, SIZE_MAX, 0);
++
++  free (s2);
++}
++
+ int
+ test_main (void)
+ {
+@@ -445,6 +457,7 @@ test_main (void)
+   check1 ();
+   check2 ();
+   check3 ();
++  check4 ();
+ 
+   printf ("%23s", "");
+   FOR_EACH_IMPL (impl, 0)

SOURCES/glibc-upstream-2.34-112.patch

+commit 38e0d2479413ccdbc02b4c9e9e246eca31e956c9
+Author: Noah Goldstein <goldstein.w.n@gmail.com>
+Date:   Tue Feb 15 08:18:15 2022 -0600
+
+    x86: Fallback {str|wcs}cmp RTM in the ncmp overflow case [BZ #28896]
+    
+    In the overflow fallback strncmp-avx2-rtm and wcsncmp-avx2-rtm would
+    call strcmp-avx2 and wcscmp-avx2 respectively. This would have
+    not checks around vzeroupper and would trigger spurious
+    aborts. This commit fixes that.
+    
+    test-strcmp, test-strncmp, test-wcscmp, and test-wcsncmp all pass on
+    AVX2 machines with and without RTM.
+    
+    Co-authored-by: H.J. Lu <hjl.tools@gmail.com>
+    
+    (cherry picked from commit c6272098323153db373f2986c67786ea8c85f1cf)
+
+diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
+index 36ca1a7126047b86..af934d6ccf1fa337 100644
+--- a/sysdeps/x86/Makefile
++++ b/sysdeps/x86/Makefile
+@@ -105,7 +105,7 @@ CFLAGS-tst-memset-rtm.c += -mrtm
+ CFLAGS-tst-strchr-rtm.c += -mrtm
+ CFLAGS-tst-strcpy-rtm.c += -mrtm
+ CFLAGS-tst-strlen-rtm.c += -mrtm
+-CFLAGS-tst-strncmp-rtm.c += -mrtm
++CFLAGS-tst-strncmp-rtm.c += -mrtm -Wno-error
+ CFLAGS-tst-strrchr-rtm.c += -mrtm
+ endif
+ 
+diff --git a/sysdeps/x86/tst-strncmp-rtm.c b/sysdeps/x86/tst-strncmp-rtm.c
+index 236ad951b5b59cd1..4d0004b58aae428d 100644
+--- a/sysdeps/x86/tst-strncmp-rtm.c
++++ b/sysdeps/x86/tst-strncmp-rtm.c
+@@ -16,6 +16,7 @@
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+ 
++#include <stdint.h>
+ #include <tst-string-rtm.h>
+ 
+ #define LOOP 3000
+@@ -45,8 +46,22 @@ function (void)
+     return 1;
+ }
+ 
++__attribute__ ((noinline, noclone))
++static int
++function_overflow (void)
++{
++  if (strncmp (string1, string2, SIZE_MAX) == 0)
++    return 0;
++  else
++    return 1;
++}
++
+ static int
+ do_test (void)
+ {
+-  return do_test_1 ("strncmp", LOOP, prepare, function);
++  int status = do_test_1 ("strncmp", LOOP, prepare, function);
++  if (status != EXIT_SUCCESS)
++    return status;
++  status = do_test_1 ("strncmp", LOOP, prepare, function_overflow);
++  return status;
+ }
+diff --git a/sysdeps/x86_64/multiarch/strcmp-avx2.S b/sysdeps/x86_64/multiarch/strcmp-avx2.S
+index 3dfcb1bf803cf9ec..fa70c994fc25dfd8 100644
+--- a/sysdeps/x86_64/multiarch/strcmp-avx2.S
++++ b/sysdeps/x86_64/multiarch/strcmp-avx2.S
+@@ -95,7 +95,7 @@ ENTRY (STRCMP)
+ 	   length to bound a valid memory region. In these cases just use
+ 	   'wcscmp'.  */
+ 	shrq	$56, %rcx
+-	jnz	__wcscmp_avx2
++	jnz	OVERFLOW_STRCMP
+ #  endif
+ 	/* Convert units: from wide to byte char.  */
+ 	shl	$2, %RDX_LP
+diff --git a/sysdeps/x86_64/multiarch/strncmp-avx2-rtm.S b/sysdeps/x86_64/multiarch/strncmp-avx2-rtm.S
+index 37d1224bb9b7056b..68bad365ba728eec 100644
+--- a/sysdeps/x86_64/multiarch/strncmp-avx2-rtm.S
++++ b/sysdeps/x86_64/multiarch/strncmp-avx2-rtm.S
+@@ -1,3 +1,4 @@
+ #define STRCMP	__strncmp_avx2_rtm
+ #define USE_AS_STRNCMP 1
++#define OVERFLOW_STRCMP	__strcmp_avx2_rtm
+ #include "strcmp-avx2-rtm.S"
+diff --git a/sysdeps/x86_64/multiarch/strncmp-avx2.S b/sysdeps/x86_64/multiarch/strncmp-avx2.S
+index 1678bcc235a4bc6a..f138e9f1fdcf277c 100644
+--- a/sysdeps/x86_64/multiarch/strncmp-avx2.S
++++ b/sysdeps/x86_64/multiarch/strncmp-avx2.S
+@@ -1,3 +1,4 @@
+ #define STRCMP	__strncmp_avx2
+ #define USE_AS_STRNCMP 1
++#define OVERFLOW_STRCMP __strcmp_avx2
+ #include "strcmp-avx2.S"
+diff --git a/sysdeps/x86_64/multiarch/wcsncmp-avx2-rtm.S b/sysdeps/x86_64/multiarch/wcsncmp-avx2-rtm.S
+index 4e88c70cc696b82d..f467582cbedd4535 100644
+--- a/sysdeps/x86_64/multiarch/wcsncmp-avx2-rtm.S
++++ b/sysdeps/x86_64/multiarch/wcsncmp-avx2-rtm.S
+@@ -1,5 +1,5 @@
+ #define STRCMP __wcsncmp_avx2_rtm
+ #define USE_AS_STRNCMP 1
+ #define USE_AS_WCSCMP 1
+-
++#define OVERFLOW_STRCMP	__wcscmp_avx2_rtm
+ #include "strcmp-avx2-rtm.S"
+diff --git a/sysdeps/x86_64/multiarch/wcsncmp-avx2.S b/sysdeps/x86_64/multiarch/wcsncmp-avx2.S
+index 4fa1de4d3f1f97ff..e9ede522b8bde27d 100644
+--- a/sysdeps/x86_64/multiarch/wcsncmp-avx2.S
++++ b/sysdeps/x86_64/multiarch/wcsncmp-avx2.S
+@@ -1,5 +1,5 @@
+ #define STRCMP __wcsncmp_avx2
+ #define USE_AS_STRNCMP 1
+ #define USE_AS_WCSCMP 1
+-
++#define OVERFLOW_STRCMP	__wcscmp_avx2
+ #include "strcmp-avx2.S"

SOURCES/glibc-upstream-2.34-113.patch

+commit d093b677c36ef4b360bf30483b68b95d9f0ad1d2
+Author: Noah Goldstein <goldstein.w.n@gmail.com>
+Date:   Fri Feb 18 14:19:15 2022 -0600
+
+    x86: Test wcscmp RTM in the wcsncmp overflow case [BZ #28896]
+    
+    In the overflow fallback strncmp-avx2-rtm and wcsncmp-avx2-rtm would
+    call strcmp-avx2 and wcscmp-avx2 respectively. This would have
+    not checks around vzeroupper and would trigger spurious
+    aborts. This commit fixes that.
+    
+    test-strcmp, test-strncmp, test-wcscmp, and test-wcsncmp all pass on
+    AVX2 machines with and without RTM.
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    
+    (cherry picked from commit 7835d611af0854e69a0c71e3806f8fe379282d6f)
+
+diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
+index af934d6ccf1fa337..cd94e683afd5b4a4 100644
+--- a/sysdeps/x86/Makefile
++++ b/sysdeps/x86/Makefile
+@@ -95,7 +95,9 @@ tests += \
+   tst-strcpy-rtm \
+   tst-strlen-rtm \
+   tst-strncmp-rtm \
+-  tst-strrchr-rtm
++  tst-strrchr-rtm \
++  tst-wcsncmp-rtm \
++# tests
+ 
+ CFLAGS-tst-memchr-rtm.c += -mrtm
+ CFLAGS-tst-memcmp-rtm.c += -mrtm
+@@ -107,6 +109,7 @@ CFLAGS-tst-strcpy-rtm.c += -mrtm
+ CFLAGS-tst-strlen-rtm.c += -mrtm
+ CFLAGS-tst-strncmp-rtm.c += -mrtm -Wno-error
+ CFLAGS-tst-strrchr-rtm.c += -mrtm
++CFLAGS-tst-wcsncmp-rtm.c += -mrtm -Wno-error
+ endif
+ 
+ ifneq ($(enable-cet),no)
+diff --git a/sysdeps/x86/tst-strncmp-rtm.c b/sysdeps/x86/tst-strncmp-rtm.c
+index 4d0004b58aae428d..4e9f094f39c72f67 100644
+--- a/sysdeps/x86/tst-strncmp-rtm.c
++++ b/sysdeps/x86/tst-strncmp-rtm.c
+@@ -19,18 +19,32 @@
+ #include <stdint.h>
+ #include <tst-string-rtm.h>
+ 
++#ifdef WIDE
++# define CHAR wchar_t
++# define MEMSET wmemset
++# define STRNCMP wcsncmp
++# define TEST_NAME wcsncmp
++#else /* !WIDE */
++# define CHAR char
++# define MEMSET memset
++# define STRNCMP strncmp
++# define TEST_NAME strncmp
++#endif /* !WIDE */
++
++
++
+ #define LOOP 3000
+ #define STRING_SIZE 1024
+-char string1[STRING_SIZE];
+-char string2[STRING_SIZE];
++CHAR string1[STRING_SIZE];
++CHAR string2[STRING_SIZE];
+ 
+ __attribute__ ((noinline, noclone))
+ static int
+ prepare (void)
+ {
+-  memset (string1, 'a', STRING_SIZE - 1);
+-  memset (string2, 'a', STRING_SIZE - 1);
+-  if (strncmp (string1, string2, STRING_SIZE) == 0)
++  MEMSET (string1, 'a', STRING_SIZE - 1);
++  MEMSET (string2, 'a', STRING_SIZE - 1);
++  if (STRNCMP (string1, string2, STRING_SIZE) == 0)
+     return EXIT_SUCCESS;
+   else
+     return EXIT_FAILURE;
+@@ -40,7 +54,7 @@ __attribute__ ((noinline, noclone))
+ static int
+ function (void)
+ {
+-  if (strncmp (string1, string2, STRING_SIZE) == 0)
++  if (STRNCMP (string1, string2, STRING_SIZE) == 0)
+     return 0;
+   else
+     return 1;
+@@ -50,7 +64,7 @@ __attribute__ ((noinline, noclone))
+ static int
+ function_overflow (void)
+ {
+-  if (strncmp (string1, string2, SIZE_MAX) == 0)
++  if (STRNCMP (string1, string2, SIZE_MAX) == 0)
+     return 0;
+   else
+     return 1;
+@@ -59,9 +73,9 @@ function_overflow (void)
+ static int
+ do_test (void)
+ {
+-  int status = do_test_1 ("strncmp", LOOP, prepare, function);
++  int status = do_test_1 (TEST_NAME, LOOP, prepare, function);
+   if (status != EXIT_SUCCESS)
+     return status;
+-  status = do_test_1 ("strncmp", LOOP, prepare, function_overflow);
++  status = do_test_1 (TEST_NAME, LOOP, prepare, function_overflow);
+   return status;
+ }
+diff --git a/sysdeps/x86/tst-wcsncmp-rtm.c b/sysdeps/x86/tst-wcsncmp-rtm.c
+new file mode 100644
+index 0000000000000000..bad3b863782c5e56
+--- /dev/null
++++ b/sysdeps/x86/tst-wcsncmp-rtm.c
+@@ -0,0 +1,21 @@
++/* Test case for wcsncmp inside a transactionally executing RTM region.
++   Copyright (C) 2022 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#define WIDE 1
++#include <wchar.h>
++#include "tst-strncmp-rtm.c"

SOURCES/glibc-upstream-2.34-114.patch

+commit 15b00d2af0e56dcc8c244a36d6872d301b0c7185
+Author: Noah Goldstein <goldstein.w.n@gmail.com>
+Date:   Fri Feb 18 17:00:25 2022 -0600
+
+    x86: Fix TEST_NAME to make it a string in tst-strncmp-rtm.c
+    
+    Previously TEST_NAME was passing a function pointer. This didn't fail
+    because of the -Wno-error flag (to allow for overflow sizes passed
+    to strncmp/wcsncmp)
+    
+    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
+    (cherry picked from commit b98d0bbf747f39770e0caba7e984ce9f8f900330)
+
+diff --git a/sysdeps/x86/tst-strncmp-rtm.c b/sysdeps/x86/tst-strncmp-rtm.c
+index 4e9f094f39c72f67..aef9866cf2fbe774 100644
+--- a/sysdeps/x86/tst-strncmp-rtm.c
++++ b/sysdeps/x86/tst-strncmp-rtm.c
+@@ -23,12 +23,12 @@
+ # define CHAR wchar_t
+ # define MEMSET wmemset
+ # define STRNCMP wcsncmp
+-# define TEST_NAME wcsncmp
++# define TEST_NAME "wcsncmp"
+ #else /* !WIDE */
+ # define CHAR char
+ # define MEMSET memset
+ # define STRNCMP strncmp
+-# define TEST_NAME strncmp
++# define TEST_NAME "strncmp"
+ #endif /* !WIDE */
+ 
+ 

SOURCES/glibc-upstream-2.34-117.patch

+commit 3be79b72d556e3ac37075ad6b99eb5eac18e1402
+Author: John David Anglin <danglin@gcc.gnu.org>
+Date:   Sun Mar 6 15:56:57 2022 +0000
+
+    Fix elf/tst-audit2 on hppa
+    
+    The test elf/tst-audit2 fails on hppa with a segmentation fault in the
+    long branch stub used to call malloc from calloc.  This occurs because
+    the test is not a PIC executable and calloc is called from the dynamic
+    linker before the dp register is initialized in _dl_start_user.
+    
+    The fix is to move the dp register initialization into
+    elf_machine_runtime_setup.  Since the address of $global$ can't be
+    loaded directly, we continue to use the DT_PLTGOT value from the
+    the main_map to initialize dp.  Since l_main_map is not available
+    in v2.34 and earlier, we use a new function, elf_machine_main_map,
+    to find the main map.
+
+diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h
+index f048fd20728ccde6..24f0f47d8f1e25cd 100644
+--- a/sysdeps/hppa/dl-machine.h
++++ b/sysdeps/hppa/dl-machine.h
+@@ -27,6 +27,7 @@
+ #include <string.h>
+ #include <link.h>
+ #include <errno.h>
++#include <ldsodefs.h>
+ #include <dl-fptr.h>
+ #include <abort-instr.h>
+ #include <tls.h>
+@@ -159,6 +160,24 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rela *reloc,
+   return (struct fdesc) { value.ip + reloc->r_addend, value.gp };
+ }
+ 
++static inline struct link_map *
++elf_machine_main_map (void)
++{
++  struct link_map *main_map;
++
++#if defined SHARED && IS_IN (rtld)
++  asm (
++"	bl	1f,%0\n"
++"	addil	L'_rtld_local - ($PIC_pcrel$0 - 1),%0\n"
++"1:	ldw	R'_rtld_local - ($PIC_pcrel$0 - 5)(%%r1),%0\n"
++   : "=r" (main_map) : : "r1");
++#else
++  main_map = NULL;
++#endif
++
++  return main_map;
++}
++
+ /* Set up the loaded object described by L so its unrelocated PLT
+    entries will jump to the on-demand fixup code in dl-runtime.c.  */
+ 
+@@ -174,6 +193,15 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
+     Elf32_Addr i[2];
+   } sig = {{0x00,0xc0,0xff,0xee, 0xde,0xad,0xbe,0xef}};
+ 
++  /* Initialize dp register for main executable.  */
++  if (l == elf_machine_main_map ())
++    {
++      register Elf32_Addr dp asm ("%r27");
++
++      dp = D_PTR (l, l_info[DT_PLTGOT]);
++      asm volatile ("" : : "r" (dp));
++    }
++
+   /* If we don't have a PLT we can just skip all this... */
+   if (__builtin_expect (l->l_info[DT_JMPREL] == NULL,0))
+     return lazy;
+@@ -336,16 +364,6 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
+    its return value is the user program's entry point.  */
+ 
+ #define RTLD_START \
+-/* Set up dp for any non-PIC lib constructors that may be called.  */	\
+-static struct link_map * __attribute__((used))				\
+-set_dp (struct link_map *map)						\
+-{									\
+-  register Elf32_Addr dp asm ("%r27");					\
+-  dp = D_PTR (map, l_info[DT_PLTGOT]);					\
+-  asm volatile ("" : : "r" (dp));					\
+-  return map;								\
+-}									\
+-									\
+ asm (									\
+ "	.text\n"							\
+ "	.globl _start\n"						\
+@@ -445,14 +463,11 @@ asm (									\
+ "	stw	%r24,-44(%sp)\n"					\
+ 									\
+ ".Lnofix:\n"								\
++	/* Call _dl_init(main_map, argc, argv, envp). */		\
+ "	addil	LT'_rtld_local,%r19\n"					\
+ "	ldw	RT'_rtld_local(%r1),%r26\n"				\
+-"	bl	set_dp, %r2\n"						\
+ "	ldw	0(%r26),%r26\n"						\
+ 									\
+-	/* Call _dl_init(_dl_loaded, argc, argv, envp). */		\
+-"	copy	%r28,%r26\n"						\
+-									\
+ 	/* envp = argv + argc + 1 */					\
+ "	sh2add	%r25,%r24,%r23\n"					\
+ "	bl	_dl_init,%r2\n"						\

SOURCES/glibc-upstream-2.34-118.patch

+commit c6f9085ee4e913a0b8260340ac7b75c426b780ce
+Author: John David Anglin <danglin@gcc.gnu.org>
+Date:   Fri Feb 18 20:38:25 2022 +0000
+
+    hppa: Fix swapcontext
+    
+    This change fixes the failure of stdlib/tst-setcontext2 and
+    stdlib/tst-setcontext7 on hppa.  The implementation of swapcontext
+    in C is broken.  C saves the return pointer (rp) and any non
+    call-clobbered registers (in this case r3, r4 and r5) on the
+    stack.  However, the setcontext call in swapcontext pops the
+    stack and subsequent calls clobber the saved registers.  When
+    the context in oucp is restored, both tests fault.
+    
+    Here we rewrite swapcontext in assembly code to avoid using
+    the stack for register values that need to be used after
+    restoration.  The getcontext and setcontext routines are
+    revised to save and restore register ret1 for normal returns.
+    We copy the oucp pointer to ret1.  This allows access to
+    the old context after calling getcontext and setcontext.
+    
+    (cherry picked from commit 71b108d7eb33b2bf3e61d5e92d2a47f74c1f7d96)
+
+diff --git a/sysdeps/unix/sysv/linux/hppa/getcontext.S b/sysdeps/unix/sysv/linux/hppa/getcontext.S
+index 1405b42819c38993..c8b690aab8ecc47c 100644
+--- a/sysdeps/unix/sysv/linux/hppa/getcontext.S
++++ b/sysdeps/unix/sysv/linux/hppa/getcontext.S
+@@ -138,6 +138,8 @@ ENTRY(__getcontext)
+ 	stw	%r19, -32(%sp)
+ 	.cfi_offset 19, 32
+ #endif
++	stw	%ret1, -60(%sp)
++	.cfi_offset 29, 4
+ 
+ 	/* Set up the trampoline registers.
+ 	   r20, r23, r24, r25, r26 and r2 are clobbered
+@@ -168,6 +170,7 @@ ENTRY(__getcontext)
+ #ifdef PIC
+ 	ldw	-32(%sp), %r19
+ #endif
++	ldw	-60(%sp), %ret1
+ 	bv	%r0(%r2)
+ 	ldwm	-64(%sp), %r4
+ END(__getcontext)
+diff --git a/sysdeps/unix/sysv/linux/hppa/setcontext.S b/sysdeps/unix/sysv/linux/hppa/setcontext.S
+index 8fc5f5e56cb31f51..e1ae3aefcaac198d 100644
+--- a/sysdeps/unix/sysv/linux/hppa/setcontext.S
++++ b/sysdeps/unix/sysv/linux/hppa/setcontext.S
+@@ -34,6 +34,8 @@ ENTRY(__setcontext)
+ 	stw	%r19, -32(%sp)
+ 	.cfi_offset 19, 32
+ #endif
++	stw	%ret1, -60(%sp)
++	.cfi_offset 29, 4
+ 
+ 	/* Save ucp.  */
+ 	copy	%r26, %r3
+@@ -155,6 +157,7 @@ ENTRY(__setcontext)
+ #ifdef PIC
+ 	ldw	-32(%r30), %r19
+ #endif
++	ldw	-60(%r30), %ret1
+ 	bv	%r0(%r2)
+ 	ldwm	-64(%r30), %r3
+ L(pseudo_end):
+diff --git a/sysdeps/unix/sysv/linux/hppa/swapcontext.c b/sysdeps/unix/sysv/linux/hppa/swapcontext.c
+index f9a8207543c164cb..562f00ff0546177d 100644
+--- a/sysdeps/unix/sysv/linux/hppa/swapcontext.c
++++ b/sysdeps/unix/sysv/linux/hppa/swapcontext.c
+@@ -18,6 +18,7 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include <ucontext.h>
++#include "ucontext_i.h"
+ 
+ extern int __getcontext (ucontext_t *ucp);
+ extern int __setcontext (const ucontext_t *ucp);
+@@ -25,17 +26,61 @@ extern int __setcontext (const ucontext_t *ucp);
+ int
+ __swapcontext (ucontext_t *oucp, const ucontext_t *ucp)
+ {
++  /* Save ucp in stack argument slot.  */
++  asm ("stw %r25,-40(%sp)");
++  asm (".cfi_offset 25, -40");
++
++  /* Save rp for debugger.  */
++  asm ("stw %rp,-20(%sp)");
++  asm (".cfi_offset 2, -20");
++
++  /* Copy rp to ret0 (r28).  */
++  asm ("copy %rp,%ret0");
++
++  /* Create a frame.  */
++  asm ("ldo 64(%sp),%sp");
++  asm (".cfi_def_cfa_offset -64");
++
+   /* Save the current machine context to oucp.  */
+-  __getcontext (oucp);
++  asm ("bl __getcontext,%rp");
++
++  /* Copy oucp to register ret1 (r29).  __getcontext saves and restores it
++     on a normal return.  It is restored from oR29 on reactivation.  */
++  asm ("copy %r26,%ret1");
++
++  /* Pop frame.  */
++  asm ("ldo -64(%sp),%sp");
++  asm (".cfi_def_cfa_offset 0");
++
++  /* Load return pointer from oR28.  */
++  asm ("ldw %0(%%ret1),%%rp" : : "i" (oR28));
++
++  /* Return if error.  */
++  asm ("or,= %r0,%ret0,%r0");
++  asm ("bv,n %r0(%rp)");
++
++  /* Load sc_sar flag.  */
++  asm ("ldw %0(%%ret1),%%r20" : : "i" (oSAR));
++
++  /* Return if oucp context has been reactivated.  */
++  asm ("or,= %r0,%r20,%r0");
++  asm ("bv,n %r0(%rp)");
++
++  /* Mark sc_sar flag.  */
++  asm ("1: ldi 1,%r20");
++  asm ("stw %%r20,%0(%%ret1)" : : "i" (oSAR));
++
++  /* Activate the machine context in ucp.  */
++  asm ("bl __setcontext,%rp");
++  asm ("ldw -40(%sp),%r26");
+ 
+-  /* mark sc_sar flag to skip the setcontext call on reactivation.  */
+-  if (oucp->uc_mcontext.sc_sar == 0) {
+-	oucp->uc_mcontext.sc_sar++;
++  /* Load return pointer.  */
++  asm ("ldw %0(%%ret1),%%rp" : : "i" (oR28));
+ 
+-	/* Restore the machine context in ucp.  */
+-	__setcontext (ucp);
+-  }
++  /* A successful call to setcontext does not return.  */
++  asm ("bv,n %r0(%rp)");
+ 
++  /* Make gcc happy.  */
+   return 0;
+ }
+ 

SOURCES/glibc-upstream-2.34-119.patch

+commit f610d2935f041c5f41ddcb96924ea42ca2fb5ea5
+Author: John David Anglin <danglin@gcc.gnu.org>
+Date:   Tue Feb 22 17:28:46 2022 +0000
+
+    hppa: Revise gettext trampoline design
+    
+    The current getcontext return trampoline is overly complex and it
+    unnecessarily clobbers several registers.  By saving the context
+    pointer (r26) in the context, __getcontext_ret can restore any
+    registers not restored by setcontext.  This allows getcontext to
+    save and restore the entire register context present when getcontext
+    is entered.  We use the unused oR0 context slot for the return
+    from __getcontext_ret.
+    
+    While this is not directly useful in C, it can be exploited in
+    assembly code.  Registers r20, r23, r24 and r25 are not clobbered
+    in the call path to getcontext.  This allows a small simplification
+    of swapcontext.
+    
+    It also allows saving and restoring the 6-bit SAR register in the
+    LSB of the oSAR context slot.  The getcontext flag value can be
+    stored in the MSB of the oSAR slot.
+    
+    (cherry picked from commit 9e7e5fda38471e00d1190479ea91d7b08ae3e304)
+
+diff --git a/sysdeps/unix/sysv/linux/hppa/getcontext.S b/sysdeps/unix/sysv/linux/hppa/getcontext.S
+index c8b690aab8ecc47c..4f2e2587d60effc8 100644
+--- a/sysdeps/unix/sysv/linux/hppa/getcontext.S
++++ b/sysdeps/unix/sysv/linux/hppa/getcontext.S
+@@ -22,22 +22,28 @@
+ #include "ucontext_i.h"
+ 
+ 
+-	/* Trampoline function. Non-standard calling ABI.  */
++	/* Trampoline function.  Non-standard calling ABI.  */
+ 	/* Can not use ENTRY(__getcontext_ret) here.  */
+ 	.type	__getcontext_ret, @function
+ 	.hidden	__getcontext_ret
+ __getcontext_ret:
+ 	.proc
+ 	.callinfo FRAME=0,NO_CALLS
+-	/* r26-r23 contain original r3-r6, but because setcontext
+-	   does not reload r3-r6 (it's using them as temporaries)
+-	   we must save them elsewhere and swap them back in.  */
+-	copy	%r23, %r3
+-	copy	%r24, %r4
+-	copy	%r25, %r5
+-	copy	%r26, %r6
+-	/* r20 contains original return pointer.  */
+-	bv	0(%r20)
++	/* Because setcontext does not reload r3-r6 (it's using them
++	   as temporaries), we must load them ourself.  */
++	ldw	oR3(%r26), %r3
++	ldw	oR4(%r26), %r4
++	ldw	oR5(%r26), %r5
++	ldw	oR6(%r26), %r6
++
++	/* Also reload registers clobbered by $$dyncall.  */
++	ldw	oR21(%r26), %r21
++	ldw	oR22(%r26), %r22
++	ldw	oR31(%r26), %r31
++
++	/* oR0 contains original return pointer.  */
++	ldw	oR0(%r26), %rp
++	bv	0(%rp)
+ 	copy	%r0, %ret0
+ 	.procend
+ 	.size	__getcontext_ret, .-__getcontext_ret
+@@ -65,13 +71,13 @@ ENTRY(__getcontext)
+ 	stw	%r17, oR17(%r26)
+ 	stw	%r18, oR18(%r26)
+ 	stw	%r19, oR19(%r26)
+-	/* stw	%r20, oR20(%r26) - used for trampoline.  */
++	stw	%r20, oR20(%r26)
+ 	stw	%r21, oR21(%r26)
+ 	stw	%r22, oR22(%r26)
+-	/* stw	%r23, oR23(%r26) - used for trampoline.  */
+-	/* stw	%r24, oR24(%r26) - used for trampoline.  */
+-	/* stw	%r25, oR25(%r26) - used for trampoline.  */
+-	/* stw	%r26, oR26(%r26) - used for trampoline.  */
++	stw	%r23, oR23(%r26)
++	stw	%r24, oR24(%r26)
++	stw	%r25, oR25(%r26)
++	stw	%r26, oR26(%r26)
+ 	stw	%r27, oR27(%r26)
+ 	stw	%r28, oR28(%r26)
+ 	stw	%r29, oR29(%r26)
+@@ -90,7 +96,10 @@ ENTRY(__getcontext)
+ 	stw	%r0, oIASQ1(%r26)
+ 	stw	%r0, oIAOQ0(%r26)
+ 	stw	%r0, oIAOQ1(%r26)
+-	stw	%r0, oSAR(%r26) /* used as flag in swapcontext().  */
++
++	/* Save SAR register.  */
++	mfctl	%sar, %r1
++	stw	%r1, oSAR(%r26) /* MSB used as flag in swapcontext().  */
+ 
+ 
+ 	/* Store floating-point regs.  */
+@@ -142,13 +151,8 @@ ENTRY(__getcontext)
+ 	.cfi_offset 29, 4
+ 
+ 	/* Set up the trampoline registers.
+-	   r20, r23, r24, r25, r26 and r2 are clobbered
+-	   by call to getcontext() anyway. Reuse them.  */
+-	stw	%r2, oR20(%r26)
+-	stw	%r3, oR23(%r26)
+-	stw	%r4, oR24(%r26)
+-	stw	%r5, oR25(%r26)
+-	stw	%r6, oR26(%r26)
++	   Use oR0 context slot to save return value.  */
++	stw	%r2, oR0(%r26)
+ #ifdef PIC
+ 	addil	LT%__getcontext_ret, %r19
+ 	ldw     RT%__getcontext_ret(%r1), %r1
+diff --git a/sysdeps/unix/sysv/linux/hppa/setcontext.S b/sysdeps/unix/sysv/linux/hppa/setcontext.S
+index e1ae3aefcaac198d..616405b80c61d531 100644
+--- a/sysdeps/unix/sysv/linux/hppa/setcontext.S
++++ b/sysdeps/unix/sysv/linux/hppa/setcontext.S
+@@ -76,7 +76,7 @@ ENTRY(__setcontext)
+ 	ldw	oR18(%r3), %r18
+ 	ldw	oR19(%r3), %r19
+ 	ldw	oR20(%r3), %r20
+-	ldw	oR21(%r3), %r21
++	ldw	oR21(%r3), %r21 /* maybe clobbered by dyncall */
+ 	/* ldw	oR22(%r3), %r22 - dyncall arg.  */
+ 	ldw	oR23(%r3), %r23
+ 	ldw	oR24(%r3), %r24
+@@ -88,6 +88,10 @@ ENTRY(__setcontext)
+ 	ldw	oR30(%r3), %sp
+ 	/* ldw	oR31(%r3), %r31 - dyncall scratch register */
+ 
++	/* Restore SAR register.  */
++	ldw	oSAR(%r3), %r22
++	mtsar	%r22
++
+ 	/* Restore floating-point registers.  */
+ 	ldo	 oFPREGS31(%r3), %r22
+ 	fldds	  0(%r22), %fr31
+diff --git a/sysdeps/unix/sysv/linux/hppa/swapcontext.c b/sysdeps/unix/sysv/linux/hppa/swapcontext.c
+index 562f00ff0546177d..1664f68c7b9982e8 100644
+--- a/sysdeps/unix/sysv/linux/hppa/swapcontext.c
++++ b/sysdeps/unix/sysv/linux/hppa/swapcontext.c
+@@ -26,10 +26,6 @@ extern int __setcontext (const ucontext_t *ucp);
+ int
+ __swapcontext (ucontext_t *oucp, const ucontext_t *ucp)
+ {
+-  /* Save ucp in stack argument slot.  */
+-  asm ("stw %r25,-40(%sp)");
+-  asm (".cfi_offset 25, -40");
+-
+   /* Save rp for debugger.  */
+   asm ("stw %rp,-20(%sp)");
+   asm (".cfi_offset 2, -20");
+@@ -60,7 +56,7 @@ __swapcontext (ucontext_t *oucp, const ucontext_t *ucp)
+   asm ("bv,n %r0(%rp)");
+ 
+   /* Load sc_sar flag.  */
+-  asm ("ldw %0(%%ret1),%%r20" : : "i" (oSAR));
++  asm ("ldb %0(%%ret1),%%r20" : : "i" (oSAR));
+ 
+   /* Return if oucp context has been reactivated.  */
+   asm ("or,= %r0,%r20,%r0");
+@@ -68,11 +64,11 @@ __swapcontext (ucontext_t *oucp, const ucontext_t *ucp)
+ 
+   /* Mark sc_sar flag.  */
+   asm ("1: ldi 1,%r20");
+-  asm ("stw %%r20,%0(%%ret1)" : : "i" (oSAR));
++  asm ("stb %%r20,%0(%%ret1)" : : "i" (oSAR));
+ 
+   /* Activate the machine context in ucp.  */
+   asm ("bl __setcontext,%rp");
+-  asm ("ldw -40(%sp),%r26");
++  asm ("ldw %0(%%ret1),%%r26" : : "i" (oR25));
+ 
+   /* Load return pointer.  */
+   asm ("ldw %0(%%ret1),%%rp" : : "i" (oR28));

SOURCES/glibc-upstream-2.34-120.patch

+commit 40fc6a74ee3dd600c84d311d91cbb16962f11a71
+Author: John David Anglin <danglin@gcc.gnu.org>
+Date:   Mon Feb 28 15:47:38 2022 +0000
+
+    nptl: Fix cleanups for stack grows up [BZ# 28899]
+    
+    _STACK_GROWS_DOWN is defined to 0 when the stack grows up.  The
+    code in unwind.c used `#ifdef _STACK_GROWS_DOWN' to selct the
+    stack grows down define for FRAME_LEFT.  As a result, the
+    _STACK_GROWS_DOWN define was always selected and cleanups were
+    incorrectly sequenced when the stack grows up.
+    
+    (cherry picked from commit 2bbc694df279020a6620096d31c1e05c93966f9b)
+
+diff --git a/nptl/unwind.c b/nptl/unwind.c
+index f50997f728ccde0d..404fab46d00e9f10 100644
+--- a/nptl/unwind.c
++++ b/nptl/unwind.c
+@@ -27,7 +27,7 @@
+ #include <jmpbuf-unwind.h>
+ #include <shlib-compat.h>
+ 
+-#ifdef _STACK_GROWS_DOWN
++#if _STACK_GROWS_DOWN
+ # define FRAME_LEFT(frame, other, adj) \
+   ((uintptr_t) frame - adj >= (uintptr_t) other - adj)
+ #elif _STACK_GROWS_UP

SOURCES/glibc-upstream-2.34-121.patch

+commit 6c9c2307657529e52c5fa7037618835f2a50b916
+Author: John David Anglin <danglin@gcc.gnu.org>
+Date:   Sun Mar 6 16:04:32 2022 +0000
+
+    hppa: Fix warnings from _dl_lookup_address
+    
+    This change fixes two warnings from _dl_lookup_address.
+    
+    The first warning comes from dropping the volatile keyword from
+    desc in the call to _dl_read_access_allowed.  We now have a full
+    atomic barrier between loading desc[0] and the access check, so
+    desc no longer needs to be declared as volatile.
+    
+    The second warning comes from the implicit declaration of
+    _dl_fix_reloc_arg.  This is fixed by including dl-runtime.h and
+    declaring _dl_fix_reloc_arg in dl-runtime.h.
+
+diff --git a/sysdeps/hppa/dl-fptr.c b/sysdeps/hppa/dl-fptr.c
+index 62ef68b62bd601f4..cd4f77c0ecfd376f 100644
+--- a/sysdeps/hppa/dl-fptr.c
++++ b/sysdeps/hppa/dl-fptr.c
+@@ -26,6 +26,7 @@
+ #include <ldsodefs.h>
+ #include <elf/dynamic-link.h>
+ #include <dl-fptr.h>
++#include <dl-runtime.h>
+ #include <dl-unmap-segments.h>
+ #include <atomic.h>
+ #include <libc-pointer-arith.h>
+@@ -351,21 +352,20 @@ _dl_lookup_address (const void *address)
+ {
+   ElfW(Addr) addr = (ElfW(Addr)) address;
+   ElfW(Word) reloc_arg;
+-  volatile unsigned int *desc;
+-  unsigned int *gptr;
++  unsigned int *desc, *gptr;
+ 
+   /* Return ADDR if the least-significant two bits of ADDR are not consistent
+      with ADDR being a linker defined function pointer.  The normal value for
+      a code address in a backtrace is 3.  */
+-  if (((unsigned int) addr & 3) != 2)
++  if (((uintptr_t) addr & 3) != 2)
+     return addr;
+ 
+   /* Handle special case where ADDR points to page 0.  */
+-  if ((unsigned int) addr < 4096)
++  if ((uintptr_t) addr < 4096)
+     return addr;
+ 
+   /* Clear least-significant two bits from descriptor address.  */
+-  desc = (unsigned int *) ((unsigned int) addr & ~3);
++  desc = (unsigned int *) ((uintptr_t) addr & ~3);
+   if (!_dl_read_access_allowed (desc))
+     return addr;
+ 
+@@ -376,7 +376,7 @@ _dl_lookup_address (const void *address)
+   /* Then load first word of candidate descriptor.  It should be a pointer
+      with word alignment and point to memory that can be read.  */
+   gptr = (unsigned int *) desc[0];
+-  if (((unsigned int) gptr & 3) != 0
++  if (((uintptr_t) gptr & 3) != 0
+       || !_dl_read_access_allowed (gptr))
+     return addr;
+ 
+@@ -400,10 +400,11 @@ _dl_lookup_address (const void *address)
+ 
+       /* If gp has been resolved, we need to hunt for relocation offset.  */
+       if (!(reloc_arg & PA_GP_RELOC))
+-	reloc_arg = _dl_fix_reloc_arg (addr, l);
++	reloc_arg = _dl_fix_reloc_arg ((struct fdesc *) addr, l);
+ 
+       _dl_fixup (l, reloc_arg);
+     }
+ 
+   return (ElfW(Addr)) desc[0];
+ }
++rtld_hidden_def (_dl_lookup_address)
+diff --git a/sysdeps/hppa/dl-lookupcfg.h b/sysdeps/hppa/dl-lookupcfg.h
+index a9a927f26c6fec09..2f6991aa16e87a00 100644
+--- a/sysdeps/hppa/dl-lookupcfg.h
++++ b/sysdeps/hppa/dl-lookupcfg.h
+@@ -30,6 +30,7 @@ rtld_hidden_proto (_dl_symbol_address)
+ #define DL_SYMBOL_ADDRESS(map, ref) _dl_symbol_address(map, ref)
+ 
+ Elf32_Addr _dl_lookup_address (const void *address);
++rtld_hidden_proto (_dl_lookup_address)
+ 
+ #define DL_LOOKUP_ADDRESS(addr) _dl_lookup_address ((const void *) addr)
+ 
+diff --git a/sysdeps/hppa/dl-runtime.c b/sysdeps/hppa/dl-runtime.c
+index e7fbb7417d866bb0..a71b5b2013abf723 100644
+--- a/sysdeps/hppa/dl-runtime.c
++++ b/sysdeps/hppa/dl-runtime.c
+@@ -25,8 +25,7 @@
+    return that to the caller.  The caller will continue on to call
+    _dl_fixup with the relocation offset.  */
+ 
+-ElfW(Word)
+-attribute_hidden __attribute ((noinline)) ARCH_FIXUP_ATTRIBUTE
++ElfW(Word) __attribute ((noinline)) ARCH_FIXUP_ATTRIBUTE
+ _dl_fix_reloc_arg (struct fdesc *fptr, struct link_map *l)
+ {
+   Elf32_Addr l_addr, iplt, jmprel, end_jmprel, r_type;
+@@ -52,3 +51,4 @@ _dl_fix_reloc_arg (struct fdesc *fptr, struct link_map *l)
+   ABORT_INSTRUCTION;
+   return 0;
+ }
++rtld_hidden_def (_dl_fix_reloc_arg)
+diff --git a/sysdeps/hppa/dl-runtime.h b/sysdeps/hppa/dl-runtime.h
+index 5d6ee53b076d5e0e..9913539b5f0e7435 100644
+--- a/sysdeps/hppa/dl-runtime.h
++++ b/sysdeps/hppa/dl-runtime.h
+@@ -17,6 +17,9 @@
+    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+    02111-1307 USA.  */
+ 
++ElfW(Word) _dl_fix_reloc_arg (struct fdesc *, struct link_map *);
++rtld_hidden_proto (_dl_fix_reloc_arg)
++
+ /* Clear PA_GP_RELOC bit in relocation offset.  */
+ static inline uintptr_t
+ reloc_offset (uintptr_t plt0, uintptr_t pltn)

SOURCES/glibc-upstream-2.34-122.patch

+commit b5032c3d37aa614644c7afbad33bb8226a52e6da
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Mon Feb 28 11:50:41 2022 +0100
+
+    io: Add fsync call in tst-stat
+    
+    io/tst-stat and io/tst-stat-lfs fail sporadically on the Fedora
+    builders, and this change hopefully helps to avoid the issue.
+    
+    (cherry picked from commit ae132284092edc5885315b44cd17d5ea91177e49)
+
+diff --git a/io/tst-stat.c b/io/tst-stat.c
+index 82e965de6ad87f61..be20cf16d70d05cc 100644
+--- a/io/tst-stat.c
++++ b/io/tst-stat.c
+@@ -69,6 +69,10 @@ do_test (void)
+   TEST_VERIFY_EXIT (fd >= 0);
+   support_write_file_string (path, "abc");
+ 
++  /* This should help to prevent delayed allocation, which may result
++     in a spurious stx_blocks/st_blocks difference.  */
++  fsync (fd);
++
+   bool check_ns = support_stat_nanoseconds (path);
+   if (!check_ns)
+     printf ("warning: timestamp with nanoseconds not supported\n");

SOURCES/glibc-upstream-2.34-123.patch

+commit b53f0c11de409b04560a70570178d1a9d03d5860
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Fri Mar 11 08:23:56 2022 +0100
+
+    nss: Do not mention NSS test modules in <gnu/lib-names.h>
+    
+    They are not actually installed.  Use the nss_files version instead
+    in nss/Makefile, similar to how __nss_shlib_revision is derived
+    from LIBNSS_FILES_SO.
+    
+    Reviewed-by: Carlos O'Donell <carlos@redhat.com>
+    (cherry picked from commit aefc79ab5ad4bb9feea2876720cec70dca7cd8ed)
+
+diff --git a/nss/Makefile b/nss/Makefile
+index bccf9f2806c15651..e223243d9d62041c 100644
+--- a/nss/Makefile
++++ b/nss/Makefile
+@@ -171,17 +171,14 @@ $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
+ $(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps)
+ 	$(build-module)
+ $(objpfx)nss_test2.os : nss_test1.c
+-ifdef libnss_test1.so-version
+-$(objpfx)/libnss_test1.so$(libnss_test1.so-version): $(objpfx)/libnss_test1.so
++# Use the nss_files suffix for these objects as well.
++$(objpfx)/libnss_test1.so$(libnss_files.so-version): $(objpfx)/libnss_test1.so
+ 	$(make-link)
+-endif
+-ifdef libnss_test2.so-version
+-$(objpfx)/libnss_test2.so$(libnss_test2.so-version): $(objpfx)/libnss_test2.so
++$(objpfx)/libnss_test2.so$(libnss_files.so-version): $(objpfx)/libnss_test2.so
+ 	$(make-link)
+-endif
+ $(patsubst %,$(objpfx)%.out,$(tests) $(tests-container)) : \
+-	$(objpfx)/libnss_test1.so$(libnss_test1.so-version) \
+-	$(objpfx)/libnss_test2.so$(libnss_test2.so-version)
++	$(objpfx)/libnss_test1.so$(libnss_files.so-version) \
++	$(objpfx)/libnss_test2.so$(libnss_files.so-version)
+ 
+ ifeq (yes,$(have-thread-library))
+ $(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library)
+diff --git a/shlib-versions b/shlib-versions
+index df6603e6992b8382..b87ab50c59af1bfd 100644
+--- a/shlib-versions
++++ b/shlib-versions
+@@ -47,11 +47,6 @@ libnss_ldap=2
+ libnss_hesiod=2
+ libnss_db=2
+ 
+-# Tests for NSS.  They must have the same NSS_SHLIB_REVISION number as
+-# the rest.
+-libnss_test1=2
+-libnss_test2=2
+-
+ # Version for libnsl with YP and NIS+ functions.
+ libnsl=1
+