From 87162f462e8189943ee723b9bcff71269df2310d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 24 Dec 2010 18:30:26 +0100 Subject: Fix testsuite link failure --- ChangeLog | 5 +++++ dlfcn/Makefile | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0161040..4c9fea3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-08-22 Andreas Schwab + + * dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Readd + $(elfobjdir)/ld.so. + 2011-08-21 Ulrich Drepper * sysdeps/unix/sysv/linux/x86_64/gettimeofday.S: Removed. diff --git a/dlfcn/Makefile b/dlfcn/Makefile index 578bc3f..dd4fb83 100644 --- a/dlfcn/Makefile +++ b/dlfcn/Makefile @@ -124,7 +124,8 @@ $(objpfx)bug-atexit1.out: $(objpfx)bug-atexit1-lib.so $(objpfx)bug-atexit2: $(libdl) $(objpfx)bug-atexit2.out: $(objpfx)bug-atexit2-lib.so -LDLIBS-bug-atexit3-lib.so = -lstdc++ -lgcc_eh $(common-objpfx)libc_nonshared.a +LDLIBS-bug-atexit3-lib.so = -lstdc++ -lgcc_eh $(elfobjdir)/ld.so \ + $(common-objpfx)libc_nonshared.a $(objpfx)bug-atexit3: $(libdl) $(objpfx)bug-atexit3.out: $(objpfx)bug-atexit3-lib.so -- cgit v1.1 From f55ffe58e9754e54f2de20c67613e8a26a9878df Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 21 Mar 2011 15:00:21 +0100 Subject: Revert "Don't crash when dependencies are missing" This reverts commit f2092faf2b6bd491a1891d5d5e393a8bf85d01d7. --- ChangeLog | 3 +++ elf/dl-deps.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c9fea3..1cfaf54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-08-22 Andreas Schwab + * elf/dl-deps.c (_dl_map_object_deps): Move check for missing + dependencies back to end of function. + * dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Readd $(elfobjdir)/ld.so. diff --git a/elf/dl-deps.c b/elf/dl-deps.c index 0b03b90..37948af 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -491,10 +491,6 @@ _dl_map_object_deps (struct link_map *map, if (errno == 0 && errno_saved != 0) __set_errno (errno_saved); - if (errno_reason) - _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, - NULL, errstring); - struct link_map **old_l_initfini = NULL; if (map->l_initfini != NULL && map->l_type == lt_loaded) { @@ -690,4 +686,8 @@ Filters not supported with LD_TRACE_PRELINKING")); } if (old_l_initfini != NULL) map->l_orig_initfini = old_l_initfini; + + if (errno_reason) + _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, + NULL, errstring); } -- cgit v1.1 From 70538b7fe6c9a23fb942b10a9e6da4c138557e3c Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 22 Aug 2011 12:16:12 +0200 Subject: Fix missing declaration --- ChangeLog | 2 ++ sysdeps/unix/sysv/linux/i386/scandir64.c | 1 + 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1cfaf54..b206e65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2011-08-22 Andreas Schwab + * sysdeps/unix/sysv/linux/i386/scandir64.c: Include . + * elf/dl-deps.c (_dl_map_object_deps): Move check for missing dependencies back to end of function. diff --git a/sysdeps/unix/sysv/linux/i386/scandir64.c b/sysdeps/unix/sysv/linux/i386/scandir64.c index ae1970e..3953f46 100644 --- a/sysdeps/unix/sysv/linux/i386/scandir64.c +++ b/sysdeps/unix/sysv/linux/i386/scandir64.c @@ -35,6 +35,7 @@ versioned_symbol (libc, __scandir64, scandir64, GLIBC_2_2); #if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) +# include # include # include "olddirent.h" -- cgit v1.1