about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-08-22 16:10:16 -0400
committerUlrich Drepper <drepper@gmail.com>2011-08-22 16:10:16 -0400
commit304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a (patch)
treef2697c0731253059c56256775460abd4ce7b1167 /elf
parente888bcbe4fb8ad538ec640bfb18b687d51e001e7 (diff)
parent70538b7fe6c9a23fb942b10a9e6da4c138557e3c (diff)
downloadglibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.tar.gz
glibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.tar.xz
glibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-deps.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index cc0023d381..7fa4d691c3 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);
 }