packages: glibc/glibc.spec, glibc/glibc-pr12892.patch (NEW), glibc/glibc-re...

[pluto]

Author: pluto                        Date: Thu Oct 20 20:01:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- the right fix for PR#12892 for glibc-2.14.1.

---- Files affected:
packages/glibc:
   glibc.spec (1.932 -> 1.933) , glibc-pr12892.patch (NONE -> 1.1)  (NEW), glibc-revert-dso-breakout.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/glibc/glibc.spec
diff -u packages/glibc/glibc.spec:1.932 packages/glibc/glibc.spec:1.933
--- packages/glibc/glibc.spec:1.932	Thu Oct 20 19:30:52 2011
+++ packages/glibc/glibc.spec	Thu Oct 20 22:01:27 2011
@@ -86,7 +86,7 @@
 Patch38:	1055_all_glibc-resolv-dynamic.patch
 Patch39:	%{name}-git.patch
 Patch40:	%{name}-bad-fix.patch
-Patch41:	%{name}-revert-dso-breakout.patch
+Patch41:	%{name}-pr12892.patch
 URL:		http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf
@@ -1755,6 +1755,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.933  2011/10/20 20:01:27  pluto
+- the right fix for PR#12892 for glibc-2.14.1.
+
 Revision 1.932  2011/10/20 17:30:52  arekm
 - up to 2.14.1 (dso breakage patch needs some decision)
 

================================================================
Index: packages/glibc/glibc-pr12892.patch
diff -u /dev/null packages/glibc/glibc-pr12892.patch:1.1
--- /dev/null	Thu Oct 20 22:01:32 2011
+++ packages/glibc/glibc-pr12892.patch	Thu Oct 20 22:01:27 2011
@@ -0,0 +1,27 @@
+From d45c60c2feb38d95e7ad95af6edb39a6d5afba81 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab at redhat.com>
+Date: Wed, 19 Oct 2011 17:13:56 +0200
+Subject: [PATCH] Preserve link time dependencies over relocation dependencies
+
+--- a/elf/dl-fini.c
++++ b/elf/dl-fini.c
+@@ -100,7 +100,17 @@ _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used, Lmid_t ns)
+ 	      /* Look through the relocation dependencies of the object.  */
+ 	      while (m-- > 0)
+ 		if (__builtin_expect (relmaps[m] == thisp, 0))
+-		  goto move;
++		  {
++		    /* If a cycle exists with a link time dependency,
++		       preserve the latter.  */
++		    struct link_map **runp = thisp->l_initfini;
++		    if (runp != NULL)
++		      while (*runp != NULL)
++			if (__builtin_expect (*runp++ == maps[k], 0))
++			  goto ignore;
++		    goto move;
++		  }
++	    ignore:;
+ 	    }
+ 
+ 	  --k;
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glibc/glibc.spec?r1=1.932&r2=1.933&f=u