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

Add definition of _dl_find_object to libc.a (RHEL-107564)

Browse Source 
Resolves: RHEL-107564
This commit is contained in:
Florian Weimer 2025-08-05 17:53:42 +02:00
parent fd0f4ef219
commit 6a840ebd26
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
glibc-RHEL-107564.patch Normal file
View File

@ -0,0 +1,35 @@
Downstream-only patch correcting the GLIBC_PRIVATE ABI preservation
change in glibc-RHEL-93320-19.patch.
This patch adds a symbol alias that supplies the expect external
name _dl_find_object within libc.a, where the forwarder in
elf/libc-dl_find_object.c no longer exists after the changes
in glibc-RHEL-93320-19.patch. It also brings back the
tst-dl_find_object-static static linking test.
diff --git a/elf/Makefile b/elf/Makefile
index ba11f3a8b81e7218..7b75afda32bcd579 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -281,6 +281,7 @@ tests-static-normal := \
# tests-static-normal
tests-static-internal := \
+ tst-dl_find_object-static \
tst-ptrguard1-static \
tst-stackguard1-static \
tst-tls1-static \
diff --git a/elf/dl-find_object.c b/elf/dl-find_object.c
index 99797580066cdce8..62a8a61f6b6032cf 100644
--- a/elf/dl-find_object.c
+++ b/elf/dl-find_object.c
@@ -464,6 +464,9 @@ __dl_find_object_internal (void *pc1, struct dl_find_object *result)
} /* Transaction retry loop. */
}
rtld_hidden_def (__dl_find_object_internal)
+#ifndef SHARED
+strong_alias (__dl_find_object_internal, _dl_find_object)
+#endif
/* _dlfo_process_initial is called twice. First to compute the array
sizes from the initial loaded mappings. Second to fill in the

6
glibc.spec
View File

@ -157,7 +157,7 @@ end \
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
Release: 224%{?dist}
Release: 225%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries.
@ -1333,6 +1333,7 @@ Patch1017: glibc-RHEL-74251.patch
Patch1018: glibc-RHEL-105957.patch
Patch1019: glibc-RHEL-50086-1.patch
Patch1020: glibc-RHEL-50086-2.patch
Patch1021: glibc-RHEL-107564.patch
##############################################################################
# Continued list of core "glibc" package information:
@ -3420,6 +3421,9 @@ update_gconv_modules_cache ()
%endif
%changelog
* Tue Aug 05 2025 Florian Weimer <fweimer@redhat.com> - 2.34-225
- Add definition of _dl_find_object to libc.a (RHEL-107564)
* Thu Jul 31 2025 Frédéric Bérat <fberat@redhat.com> - 2.34-224
- Add support for new IBM Z17 hardware in glibc (RHEL-50086)