diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-08-22 16:10:16 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-08-22 16:10:16 -0400 |
| commit | 304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a (patch) | |
| tree | f2697c0731253059c56256775460abd4ce7b1167 /elf | |
| parent | e888bcbe4fb8ad538ec640bfb18b687d51e001e7 (diff) | |
| parent | 70538b7fe6c9a23fb942b10a9e6da4c138557e3c (diff) | |
| download | glibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.zip glibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.tar.gz glibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.tar.bz2 | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-deps.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c index cc0023d..7fa4d69 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) { @@ -691,4 +687,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); } |