GNU C Library master sources branch, master, updated. glibc-2.14-199-gf55ffe5

[schwab at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  f55ffe58e9754e54f2de20c67613e8a26a9878df (commit)
       via  87162f462e8189943ee723b9bcff71269df2310d (commit)
      from  91b392a4bab0c2dc90e7e3ff914dec20b97adca8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f55ffe58e9754e54f2de20c67613e8a26a9878df

commit f55ffe58e9754e54f2de20c67613e8a26a9878df
Author: Andreas Schwab <schwab@redhat.com>
Date:   Mon Mar 21 15:00:21 2011 +0100

    Revert "Don't crash when dependencies are missing"
    
    This reverts commit f2092faf2b6bd491a1891d5d5e393a8bf85d01d7.

diff --git a/ChangeLog b/ChangeLog
index 4c9fea3..1cfaf54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +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.
+
 	* 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);
 }

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=87162f462e8189943ee723b9bcff71269df2310d

commit 87162f462e8189943ee723b9bcff71269df2310d
Author: Andreas Schwab <schwab@linux-m68k.org>
Date:   Fri Dec 24 18:30:26 2010 +0100

    Fix testsuite link failure

diff --git a/ChangeLog b/ChangeLog
index 0161040..4c9fea3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-22  Andreas Schwab  <schwab@redhat.com>
+
+	* dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Readd
+	$(elfobjdir)/ld.so.
+
 2011-08-21  Ulrich Drepper  <drepper@gmail.com>
 
 	* 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
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    8 ++++++++
 dlfcn/Makefile |    3 ++-
 elf/dl-deps.c  |    8 ++++----
 3 files changed, 14 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources