AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Don't crash when dependencies are missing"

Browse Source 
This reverts commit f2092faf2b.
This commit is contained in:
Andreas Schwab 2011-03-21 15:00:21 +01:00
parent 87162f462e
commit f55ffe58e9
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2011-08-22 Andreas Schwab <schwab@redhat.com> 2011-08-22 Andreas Schwab <schwab@redhat.com>
* 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 * dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Readd
$(elfobjdir)/ld.so. $(elfobjdir)/ld.so.

8
elf/dl-deps.c
View File

@ -491,10 +491,6 @@ _dl_map_object_deps (struct link_map *map,
if (errno == 0 && errno_saved != 0) if (errno == 0 && errno_saved != 0)
__set_errno (errno_saved); __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; struct link_map **old_l_initfini = NULL;
if (map->l_initfini != NULL && map->l_type == lt_loaded) 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) if (old_l_initfini != NULL)
map->l_orig_initfini = old_l_initfini; map->l_orig_initfini = old_l_initfini;
if (errno_reason)
_dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
NULL, errstring);
} }