From: Andreas Schwab <schwab@redhat.com>
Date: Mon, 21 Mar 2011 14:00:21 +0000 (+0100)
Subject: Revert "Don't crash when dependencies are missing"
X-Git-Tag: glibc-2.14.1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9f35ea6af4b3f9dae6d28e8a306550fd9b7aeb5;p=thirdparty%2Fglibc.git

Revert "Don't crash when dependencies are missing"

This reverts commit f2092faf2b6bd491a1891d5d5e393a8bf85d01d7.
(cherry picked from commit f55ffe58e9754e54f2de20c67613e8a26a9878df)
---

diff --git a/ChangeLog b/ChangeLog
index cc3943fc472..823cf21a9bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2011-08-16  Andreas Schwab  <schwab@redhat.com>
 
 	[BZ #11724]
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index cc0023d3817..7fa4d691c37 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);
 }