53f4d259fa
Upstream commit: fffc2df8a3e2c8cda2991063d23086360268b777 - i386: Provide GLIBC_ABI_GNU_TLS symbol version [BZ #33221] - i386: Update ___tls_get_addr to preserve vector registers - Extend struct r_debug to support multiple namespaces (RHEL-101985) - Fix a potential crash in the dynamic loader when processing specific symbol versions (RHEL-109683) - Signal la_objopen for ld.so with dlmopen (RHEL-109693) - Switch to main malloc after final ld.so self-relocation (RHEL-109703) - Prevent ld.so from asserting and crashing during audited library loads (RHEL-109702) - x86-64: Provide GLIBC_ABI_DT_X86_64_PLT symbol version (RHEL-109621) - x86-64, i386: Provide GLIBC_ABI_GNU2_TLS symbol version (RHEL-109625) - Ensure fallback initialization of ctype TLS data pointers to fix segfaults in programs using dlmopen or auditors (RHEL-72018) - Handle load segment gaps in _dl_find_object (RHEL-104854) - AArch64: Improve codegen in SVE log1p - AArch64: Optimize inverse trig functions - AArch64: Avoid memset ifunc in cpu-features.c [BZ #33112] Resolves: RHEL-109536 Resolves: RHEL-72018 Resolves: RHEL-101985 Resolves: RHEL-104854 Resolves: RHEL-109621 Resolves: RHEL-109625 Resolves: RHEL-109683 Resolves: RHEL-109693 Resolves: RHEL-109702 Resolves: RHEL-109703
82 lines
2.8 KiB
Diff
82 lines
2.8 KiB
Diff
commit cf0e7d512d3c5a5d46da50c0aa023a7f8dc0d560
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Mon Jul 28 14:16:52 2025 +0200
|
|
|
|
elf: Compile _dl_debug_state separately (bug 33224)
|
|
|
|
This ensures that the compiler will not inline it, so that
|
|
debuggers which do not use the Systemtap probes can reliably
|
|
set a breakpoint on it.
|
|
|
|
Reviewed-by: Andreas K. Huettel <dilfridge@gentoo.org>
|
|
Tested-by: Andreas K. Huettel <dilfridge@gentoo.org>
|
|
(cherry picked from commit 620f0730f311635cd0e175a3ae4d0fc700c76366)
|
|
|
|
diff --git a/elf/Makefile b/elf/Makefile
|
|
index 34933bb15f2d8228..57726b1034046433 100644
|
|
--- a/elf/Makefile
|
|
+++ b/elf/Makefile
|
|
@@ -57,6 +57,7 @@ dl-routines = \
|
|
dl-close \
|
|
dl-debug \
|
|
dl-debug-symbols \
|
|
+ dl-debug_state \
|
|
dl-deps \
|
|
dl-exception \
|
|
dl-execstack \
|
|
diff --git a/elf/dl-debug.c b/elf/dl-debug.c
|
|
index 8b513323091402db..df36d61dcb66dd0f 100644
|
|
--- a/elf/dl-debug.c
|
|
+++ b/elf/dl-debug.c
|
|
@@ -167,14 +167,3 @@ _dl_debug_initialize (ElfW(Addr) ldbase, Lmid_t ns)
|
|
|
|
return &r->base;
|
|
}
|
|
-
|
|
-
|
|
-/* This function exists solely to have a breakpoint set on it by the
|
|
- debugger. The debugger is supposed to find this function's address by
|
|
- examining the r_brk member of struct r_debug, but GDB 4.15 in fact looks
|
|
- for this particular symbol name in the PT_INTERP file. */
|
|
-void
|
|
-_dl_debug_state (void)
|
|
-{
|
|
-}
|
|
-rtld_hidden_def (_dl_debug_state)
|
|
diff --git a/elf/dl-debug_state.c b/elf/dl-debug_state.c
|
|
new file mode 100644
|
|
index 0000000000000000..40c134a49e2455f3
|
|
--- /dev/null
|
|
+++ b/elf/dl-debug_state.c
|
|
@@ -0,0 +1,30 @@
|
|
+/* Debugger hook called after dynamic linker updates.
|
|
+ Copyright (C) 1996-2025 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 <ldsodefs.h>
|
|
+
|
|
+/* This function exists solely to have a breakpoint set on it by the
|
|
+ debugger. The debugger is supposed to find this function's address by
|
|
+ examining the r_brk member of struct r_debug, but GDB 4.15 in fact looks
|
|
+ for this particular symbol name in the PT_INTERP file. Therefore,
|
|
+ this function must not be inlined. */
|
|
+void
|
|
+_dl_debug_state (void)
|
|
+{
|
|
+}
|
|
+rtld_hidden_def (_dl_debug_state)
|