rpms/glibc
7
0
Fork 2
Code Issues Pull Requests Releases Activity

Overwrite target for x86_64_v2

Browse Source 
Update patch-git.lua to handle AlmaLinux branches correctly
This commit is contained in:
Eduard Abdullin 2025-11-06 01:42:50 +00:00 committed by root
commit 13f7527b95
5 changed files with 684 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

495
glibc-RHEL-119404-1.patch Normal file
View File

@ -0,0 +1,495 @@
commit 9b5f2eb9fc5d3cf4b984f6002e69aac43296e922
Author: Joseph Myers <josmyers@redhat.com>
Date: Thu Dec 5 09:53:47 2024 +0000
Add further test of TLS
Add an additional test of TLS variables, with different alignment,
accessed from different modules. The idea of the alignment test is
similar to tst-tlsalign and the same code is shared for setting up
test variables, but unlike the tst-tlsalign code, there are multiple
threads and variables are accessed from multiple objects to verify
that they get a consistent notion of the address of an object within a
thread. Threads are repeatedly created and shut down to verify proper
initialization in each new thread. The test is also repeated with TLS
descriptors when supported. (However, only initial-exec TLS is
covered in this test.)
Tested for x86_64.
Conflicts:
elf/Makefile
context
diff --git a/elf/Makefile b/elf/Makefile
index 8f5b39d352..214c6a9f90 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -487,6 +487,8 @@ tests += \
tst-tls19 \
tst-tls20 \
tst-tls21 \
+ tst-tls22 \
+ tst-tls22-gnu2 \
tst-tls23 \
tst-tlsalign \
tst-tlsalign-extern \
@@ -688,9 +690,15 @@ tst-tls-many-dynamic-modules-dep-bad = \
extra-test-objs += \
$(tlsmod17a-modules:=.os) \
$(tlsmod18a-modules:=.os) \
+ tst-tls22-mod1-vars.os \
+ tst-tls22-mod2-vars.os \
+ tst-tls22-vars.o \
tst-tlsalign-vars.o \
# extra-test-objs
test-extras += \
+ tst-tls22-mod1-vars \
+ tst-tls22-mod2-vars \
+ tst-tls22-vars \
tst-tlsalign-vars \
tst-tlsmod17a \
tst-tlsmod18a \
@@ -972,6 +980,10 @@ modules-names += \
tst-tls19mod3 \
tst-tls20mod-bad \
tst-tls21mod \
+ tst-tls22-mod1 \
+ tst-tls22-mod1-gnu2 \
+ tst-tls22-mod2 \
+ tst-tls22-mod2-gnu2 \
tst-tls23-mod \
tst-tlsalign-lib \
tst-tlsgap-mod0 \
@@ -3242,3 +3254,27 @@ $(objpfx)tst-hash-collision2-sysv: $(objpfx)tst-hash-collision2-mod1-sysv.so \
$(objpfx)tst-dlopen-constructor-null-mod2.so
$(objpfx)tst-dlopen-constructor-null-mod2.so: \
$(objpfx)tst-dlopen-constructor-null-mod1.so
+
+$(objpfx)tst-tls22: $(objpfx)tst-tls22-vars.o $(objpfx)tst-tls22-mod1.so \
+ $(objpfx)tst-tls22-mod2.so $(shared-thread-library)
+$(objpfx)tst-tls22-mod1.so: $(objpfx)tst-tls22-mod1.os \
+ $(objpfx)tst-tls22-mod1-vars.os $(objpfx)tst-tls22-mod2.so
+$(objpfx)tst-tls22-mod2.so: $(objpfx)tst-tls22-mod2.os \
+ $(objpfx)tst-tls22-mod2-vars.os
+$(objpfx)tst-tls22-gnu2: $(objpfx)tst-tls22-vars.o \
+ $(objpfx)tst-tls22-mod1-gnu2.so $(objpfx)tst-tls22-mod2-gnu2.so \
+ $(shared-thread-library)
+$(objpfx)tst-tls22-mod1-gnu2.so: $(objpfx)tst-tls22-mod1-gnu2.os \
+ $(objpfx)tst-tls22-mod1-vars.os $(objpfx)tst-tls22-mod2-gnu2.so
+$(objpfx)tst-tls22-mod2-gnu2.so: $(objpfx)tst-tls22-mod2-gnu2.os \
+ $(objpfx)tst-tls22-mod2-vars.os
+ifneq (no,$(have-mtls-descriptor))
+CFLAGS-tst-tls22-gnu2.c += -mtls-dialect=$(have-mtls-descriptor)
+CFLAGS-tst-tls22-mod1-gnu2.c += -mtls-dialect=$(have-mtls-descriptor)
+CFLAGS-tst-tls22-mod2-gnu2.c += -mtls-dialect=$(have-mtls-descriptor)
+endif
+# These reference symbols from the main executable.
+tst-tls22-mod1.so-no-z-defs = yes
+tst-tls22-mod1-gnu2.so-no-z-defs = yes
+tst-tls22-mod2.so-no-z-defs = yes
+tst-tls22-mod2-gnu2.so-no-z-defs = yes
diff --git a/elf/tst-tls22-gnu2.c b/elf/tst-tls22-gnu2.c
new file mode 100644
index 0000000000..d9ce6df0b2
--- /dev/null
+++ b/elf/tst-tls22-gnu2.c
@@ -0,0 +1 @@
+#include <tst-tls22.c>
diff --git a/elf/tst-tls22-mod1-gnu2.c b/elf/tst-tls22-mod1-gnu2.c
new file mode 100644
index 0000000000..0b085fe175
--- /dev/null
+++ b/elf/tst-tls22-mod1-gnu2.c
@@ -0,0 +1 @@
+#include <tst-tls22-mod1.c>
diff --git a/elf/tst-tls22-mod1-vars.c b/elf/tst-tls22-mod1-vars.c
new file mode 100644
index 0000000000..bdb7358287
--- /dev/null
+++ b/elf/tst-tls22-mod1-vars.c
@@ -0,0 +1,9 @@
+#include <tst-tls22.h>
+
+#define tdata1 mod1_tdata1
+#define tdata2 mod1_tdata2
+#define tdata3 mod1_tdata3
+#define tbss1 mod1_tbss1
+#define tbss2 mod1_tbss2
+#define tbss3 mod1_tbss3
+#include <tst-tlsalign-vars.c>
diff --git a/elf/tst-tls22-mod1.c b/elf/tst-tls22-mod1.c
new file mode 100644
index 0000000000..3a47d7bbc6
--- /dev/null
+++ b/elf/tst-tls22-mod1.c
@@ -0,0 +1,27 @@
+/* Test TLS with varied alignment and multiple modules and threads.
+ Copyright (C) 2024 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/>. */
+
+#include <tst-tls22.h>
+
+void
+test_mod1 (struct one_thread_data *data, int base_val)
+{
+ STORE_ADDRS (&data->mod1_self, mod1);
+ STORE_ADDRS (&data->exe_from_mod1, exe);
+ STORE_ADDRS (&data->mod2_from_mod1, mod2);
+}
diff --git a/elf/tst-tls22-mod2-gnu2.c b/elf/tst-tls22-mod2-gnu2.c
new file mode 100644
index 0000000000..a5260e0616
--- /dev/null
+++ b/elf/tst-tls22-mod2-gnu2.c
@@ -0,0 +1 @@
+#include <tst-tls22-mod2.c>
diff --git a/elf/tst-tls22-mod2-vars.c b/elf/tst-tls22-mod2-vars.c
new file mode 100644
index 0000000000..9ef3452bba
--- /dev/null
+++ b/elf/tst-tls22-mod2-vars.c
@@ -0,0 +1,9 @@
+#include <tst-tls22.h>
+
+#define tdata1 mod2_tdata1
+#define tdata2 mod2_tdata2
+#define tdata3 mod2_tdata3
+#define tbss1 mod2_tbss1
+#define tbss2 mod2_tbss2
+#define tbss3 mod2_tbss3
+#include <tst-tlsalign-vars.c>
diff --git a/elf/tst-tls22-mod2.c b/elf/tst-tls22-mod2.c
new file mode 100644
index 0000000000..5d26d592b0
--- /dev/null
+++ b/elf/tst-tls22-mod2.c
@@ -0,0 +1,26 @@
+/* Test TLS with varied alignment and multiple modules and threads.
+ Copyright (C) 2024 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/>. */
+
+#include <tst-tls22.h>
+
+void
+test_mod2 (struct one_thread_data *data, int base_val)
+{
+ STORE_ADDRS (&data->mod2_self, mod2);
+ STORE_ADDRS (&data->exe_from_mod2, exe);
+}
diff --git a/elf/tst-tls22-vars.c b/elf/tst-tls22-vars.c
new file mode 100644
index 0000000000..2ad3ee7a3b
--- /dev/null
+++ b/elf/tst-tls22-vars.c
@@ -0,0 +1,9 @@
+#include <tst-tls22.h>
+
+#define tdata1 exe_tdata1
+#define tdata2 exe_tdata2
+#define tdata3 exe_tdata3
+#define tbss1 exe_tbss1
+#define tbss2 exe_tbss2
+#define tbss3 exe_tbss3
+#include <tst-tlsalign-vars.c>
diff --git a/elf/tst-tls22.c b/elf/tst-tls22.c
new file mode 100644
index 0000000000..35a8cd82b2
--- /dev/null
+++ b/elf/tst-tls22.c
@@ -0,0 +1,147 @@
+/* Test TLS with varied alignment and multiple modules and threads.
+ Copyright (C) 2024 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/>. */
+
+#include <support/check.h>
+#include <support/xthread.h>
+#include <tst-tls22.h>
+
+static void
+check_addrs_align (const struct obj_addrs *addrs)
+{
+ TEST_COMPARE (addrs->addr_tdata1 & (__alignof__ (int) - 1), 0);
+ TEST_COMPARE (addrs->addr_tdata2 & 0xf, 0);
+ TEST_COMPARE (addrs->addr_tdata3 & 0xfff, 0);
+ TEST_COMPARE (addrs->addr_tbss1 & (__alignof__ (int) - 1), 0);
+ TEST_COMPARE (addrs->addr_tbss2 & 0xf, 0);
+ TEST_COMPARE (addrs->addr_tbss3 & 0xfff, 0);
+}
+
+static void
+check_addrs_same (const struct obj_addrs *addrs1,
+ const struct obj_addrs *addrs2)
+{
+ TEST_COMPARE (addrs1->addr_tdata1, addrs2->addr_tdata1);
+ TEST_COMPARE (addrs1->addr_tdata2, addrs2->addr_tdata2);
+ TEST_COMPARE (addrs1->addr_tdata3, addrs2->addr_tdata3);
+ TEST_COMPARE (addrs1->addr_tbss1, addrs2->addr_tbss1);
+ TEST_COMPARE (addrs1->addr_tbss2, addrs2->addr_tbss2);
+ TEST_COMPARE (addrs1->addr_tbss3, addrs2->addr_tbss3);
+}
+
+static void
+check_vals_before (const struct obj_values *vals)
+{
+ TEST_COMPARE (vals->val_tdata1, 1);
+ TEST_COMPARE (vals->val_tdata2, 2);
+ TEST_COMPARE (vals->val_tdata3, 4);
+ TEST_COMPARE (vals->val_tbss1, 0);
+ TEST_COMPARE (vals->val_tbss2, 0);
+ TEST_COMPARE (vals->val_tbss3, 0);
+}
+
+static void
+check_vals_after (const struct obj_values *vals, int base_val)
+{
+ TEST_COMPARE (vals->val_tdata1, base_val);
+ TEST_COMPARE (vals->val_tdata2, base_val + 1);
+ TEST_COMPARE (vals->val_tdata3, base_val + 2);
+ TEST_COMPARE (vals->val_tbss1, base_val + 3);
+ TEST_COMPARE (vals->val_tbss2, base_val + 4);
+ TEST_COMPARE (vals->val_tbss3, base_val + 5);
+}
+
+static void
+check_one_thread (const struct one_thread_data *data, int base_val)
+{
+ check_vals_before (&data->exe_before);
+ check_vals_before (&data->mod1_before);
+ check_vals_before (&data->mod2_before);
+ check_vals_after (&data->exe_after, base_val);
+ check_vals_after (&data->mod1_after, base_val);
+ check_vals_after (&data->mod2_after, base_val);
+ check_addrs_align (&data->exe_self);
+ check_addrs_same (&data->exe_self, &data->exe_from_mod1);
+ check_addrs_same (&data->exe_self, &data->exe_from_mod2);
+ check_addrs_align (&data->mod1_self);
+ check_addrs_same (&data->mod1_self, &data->mod1_from_exe);
+ check_addrs_align (&data->mod2_self);
+ check_addrs_same (&data->mod2_self, &data->mod2_from_exe);
+ check_addrs_same (&data->mod2_self, &data->mod2_from_mod1);
+}
+
+static void *
+thread_func (void *arg)
+{
+ int base_val = (int) (intptr_t) arg + 10;
+ struct one_thread_data data;
+ /* Record the addresses of variables as seen from the main
+ executable (which should be the same as seen from the other
+ modules), and their initial values. */
+ STORE_ADDRS (&data.exe_self, exe);
+ STORE_ADDRS (&data.mod1_from_exe, mod1);
+ STORE_ADDRS (&data.mod2_from_exe, mod2);
+ STORE_VALUES (&data.exe_before, exe);
+ STORE_VALUES (&data.mod1_before, mod1);
+ STORE_VALUES (&data.mod2_before, mod2);
+ /* Overwrite the value of variables. */
+ OVERWRITE_VALUES (exe, base_val);
+ OVERWRITE_VALUES (mod1, base_val);
+ OVERWRITE_VALUES (mod2, base_val);
+ /* Record the addresses of variables as seen from other modules. */
+ test_mod1 (&data, base_val);
+ test_mod2 (&data, base_val);
+ /* Record the overwritten values (thus making sure that no other
+ thread running in parallel has changed this thread's values). */
+ STORE_VALUES (&data.exe_after, exe);
+ STORE_VALUES (&data.mod1_after, mod1);
+ STORE_VALUES (&data.mod2_after, mod2);
+ /* Check all the addresses and values recorded. */
+ check_one_thread (&data, base_val);
+ return NULL;
+}
+
+#define NUM_ITERS 50
+#define NUM_THREADS 16
+
+/* For NUM_ITERS iterations, repeatedly create NUM_THREADS threads.
+ In each thread, we determine the addresses of TLS objects (both
+ from the module defining those objects and from other modules), and
+ their initial values, and store in values that are then read back;
+ we check that each object's address is the same regardless of the
+ module in which it is determined, that alignment of objects is as
+ required, and that the values of objects are as expected. */
+
+static int
+do_test (void)
+{
+ for (size_t i = 0; i < NUM_ITERS; i++)
+ {
+ pthread_t threads[NUM_THREADS];
+ for (size_t j = 0; j < NUM_THREADS; j++)
+ threads[j] = xpthread_create (NULL, thread_func, (void *) j);
+ /* Also run checks in the main thread, but only once because
+ those values don't get reinitialized. */
+ if (i == 0)
+ thread_func ((void *) NUM_THREADS);
+ for (size_t j = 0; j < NUM_THREADS; j++)
+ xpthread_join (threads[j]);
+ }
+ return 0;
+}
+
+#include <support/test-driver.c>
diff --git a/elf/tst-tls22.h b/elf/tst-tls22.h
new file mode 100644
index 0000000000..24b2e0a0b6
--- /dev/null
+++ b/elf/tst-tls22.h
@@ -0,0 +1,115 @@
+/* Test TLS with varied alignment and multiple modules and threads: header.
+ Copyright (C) 2024 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/>. */
+
+#ifndef TST_TLS22_H
+#define TST_TLS22_H
+
+#include <stdint.h>
+
+extern __thread int exe_tdata1 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int exe_tdata2 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int exe_tdata3 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int exe_tbss1 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int exe_tbss2 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int exe_tbss3 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod1_tdata1 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod1_tdata2 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod1_tdata3 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod1_tbss1 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod1_tbss2 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod1_tbss3 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod2_tdata1 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod2_tdata2 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod2_tdata3 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod2_tbss1 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod2_tbss2 __attribute__ ((tls_model ("initial-exec")));
+extern __thread int mod2_tbss3 __attribute__ ((tls_model ("initial-exec")));
+
+/* Structure to store the addresses of one set of TLS objects in one
+ thread, as seen by one module in the program. */
+struct obj_addrs
+{
+ uintptr_t addr_tdata1, addr_tdata2, addr_tdata3;
+ uintptr_t addr_tbss1, addr_tbss2, addr_tbss3;
+};
+
+/* Structure to store the values of one set of TLS objects in one
+ thread. */
+struct obj_values
+{
+ uintptr_t val_tdata1, val_tdata2, val_tdata3;
+ uintptr_t val_tbss1, val_tbss2, val_tbss3;
+};
+
+/* Structure to store all the data about TLS objects in one
+ thread. */
+struct one_thread_data
+{
+ struct obj_addrs exe_self, exe_from_mod1, exe_from_mod2;
+ struct obj_addrs mod1_self, mod1_from_exe;
+ struct obj_addrs mod2_self, mod2_from_exe, mod2_from_mod1;
+ struct obj_values exe_before, mod1_before, mod2_before;
+ struct obj_values exe_after, mod1_after, mod2_after;
+};
+
+/* Store the addresses of variables prefixed by PFX in the structure
+ pointed to by DST. */
+#define STORE_ADDRS(DST, PFX) \
+ do \
+ { \
+ (DST)->addr_tdata1 = (uintptr_t) &PFX ## _tdata1; \
+ (DST)->addr_tdata2 = (uintptr_t) &PFX ## _tdata2; \
+ (DST)->addr_tdata3 = (uintptr_t) &PFX ## _tdata3; \
+ (DST)->addr_tbss1 = (uintptr_t) &PFX ## _tbss1; \
+ (DST)->addr_tbss2 = (uintptr_t) &PFX ## _tbss2; \
+ (DST)->addr_tbss3 = (uintptr_t) &PFX ## _tbss3; \
+ } \
+ while (0)
+
+/* Store the values of variables prefixed by PFX in the structure
+ pointed to by DST. */
+#define STORE_VALUES(DST, PFX) \
+ do \
+ { \
+ (DST)->val_tdata1 = PFX ## _tdata1; \
+ (DST)->val_tdata2 = PFX ## _tdata2; \
+ (DST)->val_tdata3 = PFX ## _tdata3; \
+ (DST)->val_tbss1 = PFX ## _tbss1; \
+ (DST)->val_tbss2 = PFX ## _tbss2; \
+ (DST)->val_tbss3 = PFX ## _tbss3; \
+ } \
+ while (0)
+
+/* Overwrite the values of variables prefixed by PFX with values
+ starting with VAL. */
+#define OVERWRITE_VALUES(PFX, VAL) \
+ do \
+ { \
+ PFX ## _tdata1 = (VAL); \
+ PFX ## _tdata2 = (VAL) + 1; \
+ PFX ## _tdata3 = (VAL) + 2; \
+ PFX ## _tbss1 = (VAL) + 3; \
+ PFX ## _tbss2 = (VAL) + 4; \
+ PFX ## _tbss3 = (VAL) + 5; \
+ } \
+ while (0)
+
+void test_mod1 (struct one_thread_data *data, int base_val);
+void test_mod2 (struct one_thread_data *data, int base_val);
+
+#endif /* TST_TLS22_H */

116
glibc-RHEL-126046.patch Normal file
View File

@ -0,0 +1,116 @@
commit 6f0ea84f17581d13ad668adbc181c37141d389b8
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Dec 30 16:36:18 2024 -0300
assert: Remove the use of %n from __assert_fail_base (BZ #32456)
The require size for mmap can be inferred from __vasprintf return
value. It also fixes tst-assert-2 when building with --enable-fortify,
where even if the format is not translated, __readonly_area fails
because malloc can not be used.
Checked on aarch64-linux-gnu.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Conflicts:
po/libc.pot
(fix context and adjust line numbers)
diff --git a/assert/assert-perr.c b/assert/assert-perr.c
index 0010cbc2785185e7..8a03620b4c843ebd 100644
--- a/assert/assert-perr.c
+++ b/assert/assert-perr.c
@@ -32,7 +32,7 @@ __assert_perror_fail (int errnum,
char errbuf[1024];
char *e = __strerror_r (errnum, errbuf, sizeof errbuf);
- __assert_fail_base (_("%s%s%s:%u: %s%sUnexpected error: %s.\n%n"),
+ __assert_fail_base (_("%s%s%s:%u: %s%sUnexpected error: %s.\n"),
e, file, line, function);
}
libc_hidden_def (__assert_perror_fail)
diff --git a/assert/assert.c b/assert/assert.c
index c063b700aa5c46ff..8bd49fde5004e7bb 100644
--- a/assert/assert.c
+++ b/assert/assert.c
@@ -15,25 +15,18 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <assert.h>
-#include <atomic.h>
+#include <intprops.h>
#include <ldsodefs.h>
#include <libc-pointer-arith.h>
#include <libintl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sysdep.h>
-#include <unistd.h>
-#include <sys/mman.h>
+#include <libio/iolibio.h>
#include <setvmaname.h>
#include <sys/uio.h>
-#include <intprops.h>
+#include <unistd.h>
extern const char *__progname;
-#include <wchar.h>
-#include <libio/iolibio.h>
#define fflush(s) _IO_fflush (s)
/* This function, when passed a string containing an asserted
@@ -57,12 +50,12 @@ __assert_fail_base (const char *fmt, const char *assertion, const char *file,
FATAL_PREPARE;
#endif
- int total;
- if (__asprintf (&str, fmt,
- __progname, __progname[0] ? ": " : "",
- file, line,
- function ? function : "", function ? ": " : "",
- assertion, &total) >= 0)
+ int total = __asprintf (&str, fmt,
+ __progname, __progname[0] ? ": " : "",
+ file, line,
+ function ? function : "", function ? ": " : "",
+ assertion);
+ if (total >= 0)
{
/* Print the message. */
(void) __fxprintf (NULL, "%s", str);
@@ -131,6 +124,6 @@ void
__assert_fail (const char *assertion, const char *file, unsigned int line,
const char *function)
{
- __assert_fail_base (_("%s%s%s:%u: %s%sAssertion `%s' failed.\n%n"),
+ __assert_fail_base (_("%s%s%s:%u: %s%sAssertion `%s' failed.\n"),
assertion, file, line, function);
}
diff --git a/po/libc.pot b/po/libc.pot
index 42fdf35a752ae8bf..9c1a3aa982e5aaac 100644
--- a/po/libc.pot
+++ b/po/libc.pot
@@ -102,16 +102,12 @@ msgstr ""
#: assert/assert-perr.c:35
#, c-format
-msgid ""
-"%s%s%s:%u: %s%sUnexpected error: %s.\n"
-"%n"
+msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
msgstr ""
-#: assert/assert.c:103
+#: assert/assert.c:125
#, c-format
-msgid ""
-"%s%s%s:%u: %s%sAssertion `%s' failed.\n"
-"%n"
+msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
msgstr ""
#: catgets/gencat.c:111

43
glibc-RHEL-126049-1.patch Normal file
View File

@ -0,0 +1,43 @@
commit ced745bcd3e0d58cfc38ebbbc36540b9dcdd29eb
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Oct 8 08:46:45 2024 +0800
stdio-common/Makefile: Fix FAIL: lint-makefiles
Fix stdio-common/Makefile:
@@ -224,12 +224,12 @@
tst-freopen4 \
tst-freopen5 \
tst-freopen6 \
+ tst-freopen7 \
tst-freopen64-2 \
tst-freopen64-3 \
tst-freopen64-4 \
tst-freopen64-6 \
tst-freopen64-7 \
- tst-freopen7 \
tst-fseek \
tst-fwrite \
tst-fwrite-memstrm \
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 4c39b9d9fb3d029f..d89c2aa31f47a363 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -229,12 +229,12 @@ tests := \
tst-freopen4 \
tst-freopen5 \
tst-freopen6 \
- tst-freopen7 \
tst-freopen64-2 \
tst-freopen64-3 \
tst-freopen64-4 \
tst-freopen64-6 \
tst-freopen64-7 \
+ tst-freopen7 \
tst-fseek \
tst-fseek-mmap \
tst-fwrite \

29
glibc-RHEL-126049-2.patch Normal file
View File

@ -0,0 +1,29 @@
commit 265e13d33c470446043a3d2033984a1197151e09
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Dec 22 05:55:39 2024 +0800
assert: Sort tests in Makefile
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Conflicts:
assert/Makefile
(fixup context)
diff --git a/assert/Makefile b/assert/Makefile
index d2c6943e6e28dda0..ffd9024a4c7058cc 100644
--- a/assert/Makefile
+++ b/assert/Makefile
@@ -35,11 +35,11 @@ routines := \
tests := \
test-assert \
+ test-assert-2 \
test-assert-perr \
tst-assert-c++ \
tst-assert-g++ \
tst-assert-sa-2025-0001 \
- test-assert-2 \
# tests
ifeq ($(have-cxx-thread_local),yes)

2
glibc.spec
View File

@ -2349,7 +2349,7 @@ update_gconv_modules_cache ()
%endif
%changelog
* Wed Nov 05 2025 Eduard Abdullin <eabdullin@almalinux.org> - 2.39-84.alma.1
* Thu Nov 06 2025 Eduard Abdullin <eabdullin@almalinux.org> - 2.39-87.alma.1
- Overwrite target for x86_64_v2
- Update patch-git.lua to handle AlmaLinux branches correctly