mirror of
git://git.yoctoproject.org/poky
synced 2026-09-26 17:51:05 +00:00
0ba87580d0
The merge of libdl into libc in glibc 2.34 causes problems for pseudo. Add a fix that works around this issue. (From OE-Core rev: c9203671d638edb6a063d7522b29b8a8e776c2f3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit dd3e46a043c81cd4d81731a0f691868d3c059742) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
If we link against a newer glibc 2.34 and then try and our LD_PRELOAD is run against a
|
|
binary on a host with an older libc, we see symbol errors since in glibc 2.34, pthread
|
|
and dl are merged into libc itself.
|
|
|
|
We need to use the older form of linking so use glibc binaries from an older release
|
|
to force this. We only use minimal symbols from these anyway.
|
|
|
|
pthread_atfork is problematic, particularly on arm so use the internal glibc routine
|
|
it maps too. This was always present in the main libc from 2.3.2 onwards.
|
|
|
|
Yes this is horrible. Better solutions welcome.
|
|
|
|
There is more info in the bug: [YOCTO #14521]
|
|
|
|
Upstream-Status: Inappropriate [this patch is native only]
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
Index: git/Makefile.in
|
|
===================================================================
|
|
--- git.orig/Makefile.in
|
|
+++ git/Makefile.in
|
|
@@ -122,7 +122,7 @@ libpseudo: $(LIBPSEUDO)
|
|
$(LIBPSEUDO): $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS) | $(LIB)
|
|
$(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
|
|
pseudo_client.o pseudo_ipc.o \
|
|
- $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS)
|
|
+ $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) -Lprebuilt/$(shell uname -m)-linux/lib/ $(CLIENT_LDFLAGS)
|
|
|
|
# *everything* now relies on stuff that's generated in the
|
|
# wrapper process.
|
|
Index: git/pseudo_wrappers.c
|
|
===================================================================
|
|
--- git.orig/pseudo_wrappers.c
|
|
+++ git/pseudo_wrappers.c
|
|
@@ -100,10 +100,13 @@ static void libpseudo_atfork_child(void)
|
|
pseudo_mutex_holder = 0;
|
|
}
|
|
|
|
+extern void *__dso_handle;
|
|
+extern int __register_atfork (void (*) (void), void (*) (void), void (*) (void), void *);
|
|
+
|
|
static void
|
|
_libpseudo_init(void) {
|
|
if (!_libpseudo_initted)
|
|
- pthread_atfork(NULL, NULL, libpseudo_atfork_child);
|
|
+ __register_atfork (NULL, NULL, libpseudo_atfork_child, &__dso_handle == NULL ? NULL : __dso_handle);
|
|
|
|
pseudo_getlock();
|
|
pseudo_antimagic();
|