ooo-build r11316 - trunk/patches/test

[michael svn gnome org]

Author: michael
Date: Fri Jan 18 11:31:41 2008
New Revision: 11316
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11316&view=rev

Log:
doh, don't bail on the first non-local vtreloc copy.


Modified:
   trunk/patches/test/glibc-vt-reloc-3.diff

Modified: trunk/patches/test/glibc-vt-reloc-3.diff
==============================================================================
--- trunk/patches/test/glibc-vt-reloc-3.diff	(original)
+++ trunk/patches/test/glibc-vt-reloc-3.diff	Fri Jan 18 11:31:41 2008
@@ -1,5 +1,5 @@
 diff -u -r -x '*~' -x testsuite -x libjava -x cc-nptl -x build-dir -x '*.orig' -x obj-i586-suse-linux -x texis -x Makeconfig -x version.h -x '*.o' -x '*.1' -x 'Makefile*' -x 'config*' -x libtool -x '*.info' -x '*.tex' pristine-glibc-2.6.1/elf/dl-load.c glibc-2.6.1/elf/dl-load.c
---- glibc-2.6.1/elf/dl-load.c	2008-01-08 20:45:11.000000000 +0000
+--- pristine-glibc-2.6.1/elf/dl-load.c	2008-01-08 20:45:11.000000000 +0000
 +++ glibc-2.6.1/elf/dl-load.c	2008-01-11 15:23:16.000000000 +0000
 @@ -1200,9 +1200,13 @@
  
@@ -16,9 +16,9 @@
  	if (__builtin_expect ((void *) l->l_map_start == MAP_FAILED, 0))
  	  {
  	  map_error:
-diff -u -r -x '*~' -x testsuite -x libjava -x cc-nptl -x build-dir -x '*.orig' -x obj-i586-suse-linux -x texis -x Makeconfig -x version.h -x '*.o' -x '*.1' -x 'Makefile*' -x 'config*' -x libtool -x '*.info' -x '*.tex' glibc-2.6.1/elf/dl-reloc.c glibc-2.6.1/elf/dl-reloc.c
---- glibc-2.6.1/elf/dl-reloc.c	2007-05-18 09:37:39.000000000 +0100
-+++ glibc-2.6.1/elf/dl-reloc.c	2008-01-17 19:34:38.000000000 +0000
+diff -u -r -x '*~' -x testsuite -x libjava -x cc-nptl -x build-dir -x '*.orig' -x obj-i586-suse-linux -x texis -x Makeconfig -x version.h -x '*.o' -x '*.1' -x 'Makefile*' -x 'config*' -x libtool -x '*.info' -x '*.tex' pristine-glibc-2.6.1/elf/dl-reloc.c glibc-2.6.1/elf/dl-reloc.c
+--- pristine-glibc-2.6.1/elf/dl-reloc.c	2007-05-18 09:37:39.000000000 +0100
++++ glibc-2.6.1/elf/dl-reloc.c	2008-01-18 11:03:37.000000000 +0000
 @@ -27,6 +27,9 @@
  #include <sys/types.h>
  #include "dynamic-link.h"
@@ -71,32 +71,32 @@
 +	{ /* weak symbol defined in another dso - thus already fixed up, and readonly */
 +	  if (debug_output)
 +	    _dl_debug_printf ("  skip, defined elsewhere\n");
-+	  return;
 +	}
-+
-+      for (mask = rel->r_mask; mask; mask >>= 1)
-+        {
-+/*          _dl_debug_printf ("%s copy [&0x%x -> &0x%x]\n",
-+            mask & 1 ? "do" : "no", src, dest); */
-+          if (mask & 1)
-+            {
-+              if (debug_output || !(*src == *dest || *dest == (ElfW(Addr) *)0xdeadbeef))
-+                {
-+                    _dl_debug_printf ("do copy 0x%x to 0x%x %s [&0x%x -> &0x%x]\n",
-+                                      *src, *dest,
-+                                      *src == *dest || *dest == (ElfW(Addr) *)0xdeadbeef ? "match" : "Bug",
-+                                      src, dest);
-+                }
-+              *dest = *src;
-+            }
-+          else if (debug_output)
-+            _dl_debug_printf ("no copy 0x%x to 0x%x %s\n",
-+                              *src, *dest, *src == *dest && (int)*src > 0x100 ? "Bug" : "skip");
-+          dest++; src++;
-+        }
-+
++      else
++	{
++	  for (mask = rel->r_mask; mask; mask >>= 1)
++	    {
++	      /*          _dl_debug_printf ("%s copy [&0x%x -> &0x%x]\n",
++			  mask & 1 ? "do" : "no", src, dest); */
++	      if (mask & 1)
++		{
++		  if (debug_output || !(*src == *dest || *dest == (ElfW(Addr) *)0xdeadbeef))
++		    {
++		      _dl_debug_printf ("do copy 0x%x to 0x%x %s [&0x%x -> &0x%x]\n",
++					*src, *dest,
++					*src == *dest || *dest == (ElfW(Addr) *)0xdeadbeef ? "match" : "Bug",
++					src, dest);
++		    }
++		  *dest = *src;
++		}
++	      else if (debug_output)
++		_dl_debug_printf ("no copy 0x%x to 0x%x %s\n",
++				  *src, *dest, *src == *dest && (int)*src > 0x100 ? "Bug" : "skip");
++	      dest++; src++;
++	    }
++	}
 +      if (debug_output)
-+        _dl_debug_printf ("move to next vtrel entry\n");
++	_dl_debug_printf ("move to next vtrel entry\n");
 +      rel++;
 +    }
 +}
@@ -141,8 +141,8 @@
  
    /* In case we can protect the data now that the relocations are
       done, do it.  */
-diff -u -r -x '*~' -x testsuite -x libjava -x cc-nptl -x build-dir -x '*.orig' -x obj-i586-suse-linux -x texis -x Makeconfig -x version.h -x '*.o' -x '*.1' -x 'Makefile*' -x 'config*' -x libtool -x '*.info' -x '*.tex' glibc-2.6.1/elf/dynamic-link.h glibc-2.6.1/elf/dynamic-link.h
---- glibc-2.6.1/elf/dynamic-link.h	2006-07-10 22:52:18.000000000 +0100
+diff -u -r -x '*~' -x testsuite -x libjava -x cc-nptl -x build-dir -x '*.orig' -x obj-i586-suse-linux -x texis -x Makeconfig -x version.h -x '*.o' -x '*.1' -x 'Makefile*' -x 'config*' -x libtool -x '*.info' -x '*.tex' pristine-glibc-2.6.1/elf/dynamic-link.h glibc-2.6.1/elf/dynamic-link.h
+--- pristine-glibc-2.6.1/elf/dynamic-link.h	2006-07-10 22:52:18.000000000 +0100
 +++ glibc-2.6.1/elf/dynamic-link.h	2008-01-10 18:08:21.000000000 +0000
 @@ -65,6 +65,10 @@
  #ifndef VERSYMIDX
@@ -173,8 +173,8 @@
        ADJUST_DYN_INFO (DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM + DT_THISPROCNUM
  		       + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM);
  # undef ADJUST_DYN_INFO
-diff -u -r -x '*~' -x testsuite -x libjava -x cc-nptl -x build-dir -x '*.orig' -x obj-i586-suse-linux -x texis -x Makeconfig -x version.h -x '*.o' -x '*.1' -x 'Makefile*' -x 'config*' -x libtool -x '*.info' -x '*.tex' glibc-2.6.1/elf/elf.h glibc-2.6.1/elf/elf.h
---- glibc-2.6.1/elf/elf.h	2007-05-18 09:37:39.000000000 +0100
+diff -u -r -x '*~' -x testsuite -x libjava -x cc-nptl -x build-dir -x '*.orig' -x obj-i586-suse-linux -x texis -x Makeconfig -x version.h -x '*.o' -x '*.1' -x 'Makefile*' -x 'config*' -x libtool -x '*.info' -x '*.tex' pristine-glibc-2.6.1/elf/elf.h glibc-2.6.1/elf/elf.h
+--- pristine-glibc-2.6.1/elf/elf.h	2007-05-18 09:37:39.000000000 +0100
 +++ glibc-2.6.1/elf/elf.h	2008-01-09 16:43:02.000000000 +0000
 @@ -518,6 +518,22 @@
    Elf64_Sxword	r_addend;		/* Addend */
@@ -214,8 +214,8 @@
  /* Sun added these machine-independent extensions in the "processor-specific"
     range.  Be compatible.  */
  #define DT_AUXILIARY    0x7ffffffd      /* Shared object to load before self */
-diff -u -r -x '*~' -x testsuite -x libjava -x cc-nptl -x build-dir -x '*.orig' -x obj-i586-suse-linux -x texis -x Makeconfig -x version.h -x '*.o' -x '*.1' -x 'Makefile*' -x 'config*' -x libtool -x '*.info' -x '*.tex' glibc-2.6.1/include/link.h glibc-2.6.1/include/link.h
---- glibc-2.6.1/include/link.h	2007-08-03 14:57:06.000000000 +0100
+diff -u -r -x '*~' -x testsuite -x libjava -x cc-nptl -x build-dir -x '*.orig' -x obj-i586-suse-linux -x texis -x Makeconfig -x version.h -x '*.o' -x '*.1' -x 'Makefile*' -x 'config*' -x libtool -x '*.info' -x '*.tex' pristine-glibc-2.6.1/include/link.h glibc-2.6.1/include/link.h
+--- pristine-glibc-2.6.1/include/link.h	2007-08-03 14:57:06.000000000 +0100
 +++ glibc-2.6.1/include/link.h	2008-01-09 16:43:02.000000000 +0000
 @@ -121,7 +121,7 @@
         are indexed by DT_ADDRTAGIDX(tagvalue), see <elf.h>.  */