binutils: Update to 2.23.51.0.3.

diff --git a/binutils/binutils.nm b/binutils/binutils.nm
index b5c2c48c2671fdd99828f7f3869295c50a13218b..1b6e4bd190adfa7fb5c3b8cfb98d3c6ed19a2560 100644 (file)
--- a/binutils/binutils.nm
+++ b/binutils/binutils.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = binutils
-version    = 2.22.52.0.4
-release    = 2
+version    = 2.23.51.0.3
+release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Tools
@@ -29,6 +29,7 @@ build
                dejagnu
                flex
                gcc-c++
+               pakfire-builder >= 0.9.23-5
                texinfo
                zlib-devel
        end
@@ -92,10 +93,19 @@ end
 
 packages
        package %{name}
+               provides
+                       bundled(libiberty)
+               end
+       end
 
        package %{name}-devel
                template DEVEL
 
+               requires
+                       binutils = %{thisver}
+                       zlib-devel
+               end
+
                # Don't package libbfd and libopcodes in the -devel package.
                files
                        /usr/include

diff --git a/binutils/patches/binutils-2.19.1-asprintf_fix.patch b/binutils/patches/binutils-2.19.1-asprintf_fix.patch
deleted file mode 100644 (file)
index 102ec2e..0000000
--- a/binutils/patches/binutils-2.19.1-asprintf_fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://hardened.gentooexperimental.org/trac/secure/raw-attachment/ticket/33/libiberty.h-asprintf-glibc-2.8.patch
-
---- a/include/libiberty.h.orig 2007-02-09 15:29:21.000000000 +0000
-+++ b/include/libiberty.h      2008-07-25 21:17:25.000000000 +0000
-@@ -554,8 +554,11 @@
- /* Like sprintf but provides a pointer to malloc'd storage, which must
-    be freed by the caller.  */
- 
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL.  */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
- 
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which

diff --git a/binutils/patches/binutils-2.19.1-ld_makefile.patch b/binutils/patches/binutils-2.19.1-ld_makefile.patch
deleted file mode 100644 (file)
index 4624f29..0000000
--- a/binutils/patches/binutils-2.19.1-ld_makefile.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh -e
-## 001_ld_makefile_patch.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: correct where ld scripts are installed
-## DP: Author: Chris Chimelis <chris@debian.org>
-## DP: Upstream status: N/A
-## DP: Date: ??
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-Index: binutils-2.18/ld/Makefile.am
-===================================================================
---- binutils-2.18.orig/ld/Makefile.am  2007-06-28 09:19:34.837940280 +0200
-+++ binutils-2.18/ld/Makefile.am       2007-06-28 09:19:35.795794664 +0200
-@@ -18,7 +18,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
-
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-Index: binutils-2.18/ld/Makefile.in
-===================================================================
---- binutils-2.18.orig/ld/Makefile.in  2007-06-28 09:19:34.844939216 +0200
-+++ binutils-2.18/ld/Makefile.in       2007-06-28 09:19:35.796794512 +0200
-@@ -287,7 +287,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include

diff --git a/binutils/patches/binutils-2.20-objcopy.patch b/binutils/patches/binutils-2.20-objcopy.patch
deleted file mode 100644 (file)
index 62c90c7..0000000
--- a/binutils/patches/binutils-2.20-objcopy.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/binutils/objcopy.c b/binutils/objcopy.c
-index 9732b86..dec0feb 100644
---- a/binutils/objcopy.c
-+++ b/binutils/objcopy.c
-@@ -2287,6 +2287,18 @@ copy_file (const char *input_filename, const char *output_filename,
- 
-       status = 1;
-     }
-+
-+  if (status == 0)
-+    {
-+      struct stat statbuf;
-+
-+      /* No need to check the return value of stat().  It has already
-+       been checked in get_file_size().  */
-+      stat (input_filename, &statbuf);
-+
-+      /* Try to preserve the permission bits.  */
-+      chmod (output_filename, statbuf.st_mode);
-+    }
- }
- 
- /* Add a name to the section renaming list.  */
-

diff --git a/binutils/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch b/binutils/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch
deleted file mode 100644 (file)
index 3587c99..0000000
--- a/binutils/patches/binutils-2.20.1-all_dobumen-new-dtags-behaviour.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: binutils-2.19.51.0.5/ld/ld.texinfo
-===================================================================
---- binutils-2.19.51.0.5.orig/ld/ld.texinfo
-+++ binutils-2.19.51.0.5/ld/ld.texinfo
-@@ -2036,8 +2036,9 @@ This linker can create the new dynamic t
- systems may not understand them. If you specify
- @option{--enable-new-dtags}, the dynamic tags will be created as needed.
- If you specify @option{--disable-new-dtags}, no new dynamic tags will be
--created. By default, the new dynamic tags are not created. Note that
--those options are only available for ELF systems.
-+created. On IPFire, by default, the new dynamic tags are created (this
-+differs from upstream behaviour). Note that those options are only
-+available for ELF systems.
- 
- @kindex --hash-size=@var{number}
- @item --hash-size=@var{number}

diff --git a/binutils/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch b/binutils/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch
deleted file mode 100644 (file)
index 2e90f0c..0000000
--- a/binutils/patches/binutils-2.20.1-gentoo-rpath_envvar-smack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://sourceware.org/ml/binutils/2007-07/msg00401.html
-http://sourceware.org/bugzilla/show_bug.cgi?id=4970
-
---- a/configure
-+++ b/configure
-@@ -5601,6 +5601,7 @@ case "${host}" in
-   *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
-   *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
- esac
-+RPATH_ENVVAR="cant_touch_this_nah_nah_nah"
- 
- # On systems where the dynamic library environment variable is PATH,
- if test "$RPATH_ENVVAR" = PATH; then

diff --git a/binutils/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch b/binutils/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch
deleted file mode 100644 (file)
index 84e20f7..0000000
--- a/binutils/patches/binutils-2.20.1-gentoo-use-new-ld-dtags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- binutils/ld/ldmain.c
-+++ binutils/ld/ldmain.c
-@@ -296,6 +296,7 @@ main (int argc, char **argv)
- 
-   link_info.allow_undefined_version = TRUE;
-   link_info.keep_memory = TRUE;
-+  link_info.new_dtags = TRUE;
-   link_info.combreloc = TRUE;
-   link_info.strip_discarded = TRUE;
-   link_info.callbacks = &link_callbacks;

diff --git a/binutils/patches/binutils-2.20.51.0.10-copy-osabi.patch0 b/binutils/patches/binutils-2.20.51.0.10-copy-osabi.patch0
new file mode 100644 (file)
index 0000000..86cb447
--- /dev/null
+++ b/binutils/patches/binutils-2.20.51.0.10-copy-osabi.patch0
@@ -0,0 +1,19 @@
+*** ../binutils-2.20.51.0.10.original/bfd/elf.c        2010-08-10 15:04:55.000000000 +0100
+--- bfd/elf.c  2010-08-10 15:05:42.000000000 +0100
+*************** _bfd_elf_copy_private_bfd_data (bfd *ibf
+*** 1074,1079 ****
+--- 1074,1087 ----
+  
+    /* Copy object attributes.  */
+    _bfd_elf_copy_obj_attributes (ibfd, obfd);
++ 
++   /* If the input BFD has the OSABI field set and the
++      output BFD does not, then copy the value.  */
++   if (elf_elfheader (ibfd)->e_ident [EI_OSABI] != ELFOSABI_NONE
++       && elf_elfheader (obfd)->e_ident [EI_OSABI] == ELFOSABI_NONE)
++     elf_elfheader (obfd)->e_ident [EI_OSABI] =
++       elf_elfheader (ibfd)->e_ident [EI_OSABI];
++ 
+    return TRUE;
+  }
+  

diff --git a/binutils/patches/binutils-2.20.51.0.2-set-long-long.patch b/binutils/patches/binutils-2.20.51.0.2-set-long-long.patch0
similarity index 100%
rename from binutils/patches/binutils-2.20.51.0.2-set-long-long.patch
rename to binutils/patches/binutils-2.20.51.0.2-set-long-long.patch0

diff --git a/binutils/patches/binutils-2.20.51.0.2-version.patch b/binutils/patches/binutils-2.20.51.0.2-version.patch0
similarity index 100%
rename from binutils/patches/binutils-2.20.51.0.2-version.patch
rename to binutils/patches/binutils-2.20.51.0.2-version.patch0

diff --git a/binutils/patches/binutils-2.22.52.0.1-relro-on-by-default.patch b/binutils/patches/binutils-2.22.52.0.1-relro-on-by-default.patch
deleted file mode 100644 (file)
index 3910df1..0000000
--- a/binutils/patches/binutils-2.22.52.0.1-relro-on-by-default.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur binutils-2.22.52.0.4-vanilla/ld/emultempl/armelf.em binutils-2.22.52.0.4/ld/emultempl/armelf.em
---- binutils-2.22.52.0.4-vanilla/ld/emultempl/armelf.em        2012-06-05 18:44:10.000000000 +0200
-+++ binutils-2.22.52.0.4/ld/emultempl/armelf.em        2012-06-08 13:34:30.578427241 +0200
-@@ -52,6 +52,7 @@
- #endif /* not TARGET_ */
-   input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
-   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
-+  link_info.relro = TRUE;
- }
- 
- static void
-diff -Nur binutils-2.22.52.0.4-vanilla/ld/emultempl/elf32.em binutils-2.22.52.0.4/ld/emultempl/elf32.em
---- binutils-2.22.52.0.4-vanilla/ld/emultempl/elf32.em 2012-06-05 18:44:10.000000000 +0200
-+++ binutils-2.22.52.0.4/ld/emultempl/elf32.em 2012-06-08 13:33:07.090612102 +0200
-@@ -106,6 +106,7 @@
-   input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
-   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
-   link_info.sharable_sections = `if test "$SHARABLE_SECTIONS" = "yes" ; then echo TRUE ; else echo FALSE ; fi`;
-+  link_info.relro = TRUE;
- }
- 
- EOF
-diff -Nur binutils-2.22.52.0.4-vanilla/ld/testsuite/config/default.exp binutils-2.22.52.0.4/ld/testsuite/config/default.exp
---- binutils-2.22.52.0.4-vanilla/ld/testsuite/config/default.exp       2012-06-05 18:44:10.000000000 +0200
-+++ binutils-2.22.52.0.4/ld/testsuite/config/default.exp       2012-06-08 13:33:07.085612052 +0200
-@@ -23,7 +23,7 @@
- #
- 
- if ![info exists ld] then {
--    set ld [findfile $base_dir/ld-new $base_dir/ld-new [transform ld]]
-+    set ld "[findfile $base_dir/ld-new $base_dir/ld-new [transform ld]] -znorelro"
- }
- 
- if ![info exists as] then {
-@@ -69,7 +69,7 @@
-     catch "exec ln -s ../../ld-new tmpdir/ld/ld" status
-     catch "exec ln -s ld tmpdir/ld/collect-ld" status
- }
--set gcc_ld_flag "-B[pwd]/tmpdir/ld/"
-+set gcc_ld_flag "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro"
- 
- # load the linker path
- if {[file exists tmpdir/libpath.exp]} {
-@@ -279,7 +279,7 @@
- }
- 
- if ![info exists LD] then {
--    set LD [findfile $base_dir/ld-new ./ld-new [transform ld]]
-+    set LD "[findfile $base_dir/ld-new ./ld-new [transform ld]] -znorelro"
- }
- 
- if ![info exists LDFLAGS] then {
-diff -Nur binutils-2.22.52.0.4-vanilla/ld/testsuite/ld-bootstrap/bootstrap.exp binutils-2.22.52.0.4/ld/testsuite/ld-bootstrap/bootstrap.exp
---- binutils-2.22.52.0.4-vanilla/ld/testsuite/ld-bootstrap/bootstrap.exp       2012-06-05 18:44:10.000000000 +0200
-+++ binutils-2.22.52.0.4/ld/testsuite/ld-bootstrap/bootstrap.exp       2012-06-08 13:33:07.086612062 +0200
-@@ -71,7 +71,13 @@
- 
-     # This test can only be run if we have the ld build directory,
-     # since we need the object files.
--    if {$ld != "$objdir/ld-new"} {
-+    set ldexe $ld
-+    set ldparm [string first " " $ld]
-+    if { $ldparm > 0 } then {
-+      set ldparm [expr $ldparm - 1]
-+      set ldexe [string range $ld 0 $ldparm]
-+    }
-+    if {$ldexe != "$objdir/ld-new"} {
-       untested $testname
-       continue
-     }

diff --git a/binutils/patches/binutils-2.22.52.0.1-relro-on-by-default.patch0 b/binutils/patches/binutils-2.22.52.0.1-relro-on-by-default.patch0
new file mode 100644 (file)
index 0000000..83ae415
--- /dev/null
+++ b/binutils/patches/binutils-2.22.52.0.1-relro-on-by-default.patch0
@@ -0,0 +1,92 @@
+diff -cpr ../binutils-2.22.52.0.1.orig/ld/testsuite/config/default.exp ld/testsuite/config/default.exp
+*** ../binutils-2.22.52.0.1.orig/ld/testsuite/config/default.exp       2012-03-06 14:00:31.141957656 +0000
+--- ld/testsuite/config/default.exp    2012-03-06 14:09:33.492940503 +0000
+***************
+*** 23,29 ****
+  #
+  
+  if ![info exists ld] then {
+!     set ld [findfile $base_dir/ld-new $base_dir/ld-new [transform ld]]
+  }
+  
+  if ![info exists as] then {
+--- 23,29 ----
+  #
+  
+  if ![info exists ld] then {
+!     set ld "[findfile $base_dir/ld-new $base_dir/ld-new [transform ld]] -znorelro"
+  }
+  
+  if ![info exists as] then {
+*************** if {![file isdirectory tmpdir/ld]} then
+*** 69,75 ****
+      catch "exec ln -s ../../ld-new tmpdir/ld/ld" status
+      catch "exec ln -s ld tmpdir/ld/collect-ld" status
+  }
+! set gcc_ld_flag "-B[pwd]/tmpdir/ld/"
+  
+  # load the linker path
+  if {[file exists tmpdir/libpath.exp]} {
+--- 69,75 ----
+      catch "exec ln -s ../../ld-new tmpdir/ld/ld" status
+      catch "exec ln -s ld tmpdir/ld/collect-ld" status
+  }
+! set gcc_ld_flag "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro"
+  
+  # load the linker path
+  if {[file exists tmpdir/libpath.exp]} {
+*************** if ![info exists READELFFLAGS] then {
+*** 279,285 ****
+  }
+  
+  if ![info exists LD] then {
+!     set LD [findfile $base_dir/ld-new ./ld-new [transform ld]]
+  }
+  
+  if ![info exists LDFLAGS] then {
+--- 279,285 ----
+  }
+  
+  if ![info exists LD] then {
+!     set LD "[findfile $base_dir/ld-new ./ld-new [transform ld]] -znorelro"
+  }
+  
+  if ![info exists LDFLAGS] then {
+diff -cpr ../binutils-2.22.52.0.1.orig/ld/testsuite/ld-bootstrap/bootstrap.exp ld/testsuite/ld-bootstrap/bootstrap.exp
+*** ../binutils-2.22.52.0.1.orig/ld/testsuite/ld-bootstrap/bootstrap.exp       2012-03-06 14:00:30.503957676 +0000
+--- ld/testsuite/ld-bootstrap/bootstrap.exp    2012-03-06 15:03:33.949837926 +0000
+*************** foreach flags {"" "strip" "--static" "--
+*** 71,77 ****
+  
+      # This test can only be run if we have the ld build directory,
+      # since we need the object files.
+!     if {$ld != "$objdir/ld-new"} {
+       untested $testname
+       continue
+      }
+--- 71,83 ----
+  
+      # This test can only be run if we have the ld build directory,
+      # since we need the object files.
+!     set ldexe $ld
+!     set ldparm [string first " " $ld]
+!     if { $ldparm > 0 } then {
+!      set ldparm [expr $ldparm - 1]
+!      set ldexe [string range $ld 0 $ldparm]
+!     }
+!     if {$ldexe != "$objdir/ld-new"} {
+       untested $testname
+       continue
+      }
+*** ../binutils-2.22.52.0.2.orig/ld/emultempl/elf32.em 2012-04-30 16:12:52.642766221 +0100
+--- ld/emultempl/elf32.em      2012-04-30 16:13:13.869766905 +0100
+*************** gld${EMULATION_NAME}_before_parse (void)
+*** 106,111 ****
+--- 106,112 ----
+    input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
+    config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
+    link_info.sharable_sections = `if test "$SHARABLE_SECTIONS" = "yes" ; then echo TRUE ; else echo FALSE ; fi`;
++   link_info.relro = TRUE;
+  }
+  
+  EOF

diff --git a/binutils/patches/binutils-2.22.52.0.2-flexible-tests.patch b/binutils/patches/binutils-2.22.52.0.2-flexible-tests.patch
deleted file mode 100644 (file)
index af6c927..0000000
--- a/binutils/patches/binutils-2.22.52.0.2-flexible-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-making some of the address matches more flexible fixes tests when using
-pax/relro/hash patches
-
---- binutils/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
-+++ binutils/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
-@@ -4,6 +4,6 @@
- #target: x86_64-*-*
- 
- #...
--[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x220@plt>
--[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*\(%rip\),%rax.*[ \t0-9a-fq]+<\*ABS\*\+0x220@plt>
-+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x[a-f0-9]+@plt>
-+[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*\(%rip\),%rax.*[ \t0-9a-fq]+<\*ABS\*\+0x[a-f0-9]+@plt>
- #pass
---- binutils/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
-+++ binutils/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
-@@ -4,6 +4,6 @@
- #target: x86_64-*-*
- 
- #...
--[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x220@plt>
--[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*\(%rip\),%rax.*[ \t0-9a-fq]+<\*ABS\*\+0x220@plt>
-+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x[a-f0-9]+@plt>
-+[ \t0-9a-f]+:[ \t0-9a-f]+lea[ \t]+.*\(%rip\),%rax.*[ \t0-9a-fq]+<\*ABS\*\+0x[a-f0-9]+@plt>
- #pass

diff --git a/binutils/patches/binutils-2.22.52.0.4-no-config-h-check.patch0 b/binutils/patches/binutils-2.22.52.0.4-no-config-h-check.patch0
new file mode 100644 (file)
index 0000000..2fc32e3
--- /dev/null
+++ b/binutils/patches/binutils-2.22.52.0.4-no-config-h-check.patch0
@@ -0,0 +1,32 @@
+*** ../binutils-2.22.52.0.4.orig/bfd/bfd-in.h  2012-08-02 10:56:34.561769686 +0100
+--- bfd/bfd-in.h       2012-08-02 11:13:27.134797755 +0100
+***************
+*** 25,35 ****
+  #ifndef __BFD_H_SEEN__
+  #define __BFD_H_SEEN__
+  
+- /* PR 14072: Ensure that config.h is included first.  */
+- #if !defined PACKAGE && !defined PACKAGE_VERSION
+- #error config.h must be included before this header
+- #endif
+- 
+  #ifdef __cplusplus
+  extern "C" {
+  #endif
+--- 25,30 ----
+*** ../binutils-2.22.52.0.4.orig/bfd/bfd-in2.h 2012-08-02 10:56:34.349769680 +0100
+--- bfd/bfd-in2.h      2012-08-02 11:13:40.015798113 +0100
+***************
+*** 32,42 ****
+  #ifndef __BFD_H_SEEN__
+  #define __BFD_H_SEEN__
+  
+- /* PR 14072: Ensure that config.h is included first.  */
+- #if !defined PACKAGE && !defined PACKAGE_VERSION
+- #error config.h must be included before this header
+- #endif
+- 
+  #ifdef __cplusplus
+  extern "C" {
+  #endif
+--- 32,37 ----

diff --git a/binutils/patches/binutils-2.22.52.0.4-refcount.patch0 b/binutils/patches/binutils-2.22.52.0.4-refcount.patch0
deleted file mode 100644 (file)
index 33fcfd4..0000000
--- a/binutils/patches/binutils-2.22.52.0.4-refcount.patch0
+++ /dev/null
@@ -1,19 +0,0 @@
-http://sourceware.org/bugzilla/show_bug.cgi?id=14189
-
-Index: bfd/elf32-arm.c
-===================================================================
-RCS file: /cvs/src/src/bfd/elf32-arm.c,v
-retrieving revision 1.294
-diff -u -3 -p -r1.294 elf32-arm.c
---- bfd/elf32-arm.c    28 Jun 2012 16:57:24 -0000      1.294
-+++ bfd/elf32-arm.c    29 Jun 2012 13:21:52 -0000
-@@ -12668,7 +12668,8 @@ elf32_arm_check_relocs (bfd *abfd, struc
- 
-         /* If the symbol is a function that doesn't bind locally,
-            this relocation will need a PLT entry.  */
--        root_plt->refcount += 1;
-+        if (root_plt->refcount != -1)
-+          root_plt->refcount += 1;
- 
-         if (!call_reloc_p)
-           arm_plt->noncall_refcount++;

diff --git a/binutils/patches/binutils-2.22.52.0.2-pt-pax-flags-20120425.patch b/binutils/patches/binutils-2.23.51.0.2-pt-pax-flags-20120807.patch
similarity index 84%
rename from binutils/patches/binutils-2.22.52.0.2-pt-pax-flags-20120425.patch
rename to binutils/patches/binutils-2.23.51.0.2-pt-pax-flags-20120807.patch
index 00494cb520075236fb6088edbafc0fbf6505633d..15530168437e85d232dbdae3640179f05442deb2 100644 (file)
--- a/binutils/patches/binutils-2.22.52.0.2-pt-pax-flags-20120425.patch
+++ b/binutils/patches/binutils-2.23.51.0.2-pt-pax-flags-20120807.patch
@@ -1,5 +1,5 @@
---- binutils-2.22/bfd/elf-bfd.h
-+++ binutils-2.22/bfd/elf-bfd.h
+--- binutils-2.23.51.0.2/bfd/elf-bfd.h
++++ binutils-2.23.51.0.2/bfd/elf-bfd.h
 @@ -1577,6 +1577,9 @@ struct elf_obj_tdata
    /* Segment flags for the PT_GNU_STACK segment.  */
    unsigned int stack_flags;
@@ -10,8 +10,8 @@
    /* Symbol version definitions in external objects.  */
    Elf_Internal_Verdef *verdef;
  
---- binutils-2.22/bfd/elf.c
-+++ binutils-2.22/bfd/elf.c
+--- binutils-2.23.51.0.2/bfd/elf.c
++++ binutils-2.23.51.0.2/bfd/elf.c
 @@ -1158,6 +1158,7 @@ get_segment_type (unsigned int p_type)
      case PT_GNU_EH_FRAME: pt = "EH_FRAME"; break;
      case PT_GNU_STACK: pt = "STACK"; break;
@@ -81,8 +81,8 @@
     && (segment->p_type != PT_TLS                                      \
         || (section->flags & SEC_THREAD_LOCAL))                                \
     && (segment->p_type == PT_LOAD                                     \
---- binutils-2.22/bfd/elflink.c
-+++ binutils-2.22/bfd/elflink.c
+--- binutils-2.23.51.0.2/bfd/elflink.c
++++ binutils-2.23.51.0.2/bfd/elflink.c
 @@ -5545,16 +5545,30 @@ bfd_elf_size_dynamic_sections (bfd *output_bfd,
      return TRUE;
  
@@ -129,8 +129,8 @@
              notesec = s;
            }
          else if (bed->default_execstack)
---- binutils-2.22/binutils/readelf.c
-+++ binutils-2.22/binutils/readelf.c
+--- binutils-2.23.51.0.2/binutils/readelf.c
++++ binutils-2.23.51.0.2/binutils/readelf.c
 @@ -2740,6 +2740,7 @@ get_segment_type (unsigned long p_type)
                        return "GNU_EH_FRAME";
      case PT_GNU_STACK:        return "GNU_STACK";
@@ -139,8 +139,8 @@
  
      default:
        if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC))
---- binutils-2.22/include/bfdlink.h
-+++ binutils-2.22/include/bfdlink.h
+--- binutils-2.23.51.0.2/include/bfdlink.h
++++ binutils-2.23.51.0.2/include/bfdlink.h
 @@ -322,6 +322,14 @@ struct bfd_link_info
    /* TRUE if PT_GNU_RELRO segment should be created.  */
    unsigned int relro: 1;
@@ -156,8 +156,8 @@
    /* TRUE if .eh_frame_hdr section and PT_GNU_EH_FRAME ELF segment
       should be created.  */
    unsigned int eh_frame_hdr: 1;
---- binutils-2.22/include/elf/common.h
-+++ binutils-2.22/include/elf/common.h
+--- binutils-2.23.51.0.2/include/elf/common.h
++++ binutils-2.23.51.0.2/include/elf/common.h
 @@ -429,6 +429,7 @@
  #define PT_SUNW_EH_FRAME PT_GNU_EH_FRAME      /* Solaris uses the same value */
  #define PT_GNU_STACK  (PT_LOOS + 0x474e551) /* Stack flags */
@@ -188,8 +188,8 @@
  /* Values for section header, sh_type field.  */
  
  #define SHT_NULL      0               /* Section header table entry unused */
---- binutils-2.22/ld/emultempl/elf32.em
-+++ binutils-2.22/ld/emultempl/elf32.em
+--- binutils-2.23.51.0.2/ld/emultempl/elf32.em
++++ binutils-2.23.51.0.2/ld/emultempl/elf32.em
 @@ -2285,6 +2285,16 @@ fragment <<EOF
          link_info.noexecstack = TRUE;
          link_info.execstack = FALSE;
@@ -225,8 +225,8 @@
  EOF
  if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
  fragment <<EOF
---- binutils-2.22/ld/ldgram.y
-+++ binutils-2.22/ld/ldgram.y
+--- binutils-2.23.51.0.2/ld/ldgram.y
++++ binutils-2.23.51.0.2/ld/ldgram.y
 @@ -1119,6 +1119,8 @@ phdr_type:
                            $$ = exp_intop (0x6474e550);
                          else if (strcmp (s, "PT_GNU_STACK") == 0)
@@ -236,8 +236,8 @@
                          else
                            {
                              einfo (_("\
---- binutils-2.22/ld/testsuite/ld-alpha/tlsbin.rd
-+++ binutils-2.22/ld/testsuite/ld-alpha/tlsbin.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-alpha/tlsbin.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-alpha/tlsbin.rd
 @@ -35,13 +35,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
  
  Program Headers:
@@ -254,8 +254,8 @@
  #...
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries:
---- binutils-2.22/ld/testsuite/ld-alpha/tlsbinr.rd
-+++ binutils-2.22/ld/testsuite/ld-alpha/tlsbinr.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-alpha/tlsbinr.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-alpha/tlsbinr.rd
 @@ -42,6 +42,7 @@ Program Headers:
   +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
   +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
@@ -264,8 +264,8 @@
  #...
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries:
---- binutils-2.22/ld/testsuite/ld-alpha/tlspic.rd
-+++ binutils-2.22/ld/testsuite/ld-alpha/tlspic.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-alpha/tlspic.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-alpha/tlspic.rd
 @@ -38,6 +38,7 @@ Program Headers:
   +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
   +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
@@ -274,8 +274,8 @@
  #...
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 7 entries:
---- binutils-2.22/ld/testsuite/ld-elf/eh1.d
-+++ binutils-2.22/ld/testsuite/ld-elf/eh1.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-elf/eh1.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-elf/eh1.d
 @@ -22,11 +22,11 @@ Contents of the .eh_frame section:
    DW_CFA_nop
    DW_CFA_nop
@@ -291,8 +291,8 @@
    DW_CFA_def_cfa_register: r6 \(rbp\)
  
  00000038 ZERO terminator
---- binutils-2.22/ld/testsuite/ld-elf/eh2.d
-+++ binutils-2.22/ld/testsuite/ld-elf/eh2.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-elf/eh2.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-elf/eh2.d
 @@ -22,11 +22,11 @@ Contents of the .eh_frame section:
    DW_CFA_nop
    DW_CFA_nop
@@ -308,8 +308,8 @@
    DW_CFA_def_cfa_register: r6 \(rbp\)
  
  00000038 ZERO terminator
---- binutils-2.22/ld/testsuite/ld-elf/eh3.d
-+++ binutils-2.22/ld/testsuite/ld-elf/eh3.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-elf/eh3.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-elf/eh3.d
 @@ -22,11 +22,11 @@ Contents of the .eh_frame section:
    DW_CFA_nop
    DW_CFA_nop
@@ -325,8 +325,8 @@
    DW_CFA_def_cfa_register: r6 \(rbp\)
  
  00000038 ZERO terminator
---- binutils-2.22/ld/testsuite/ld-elf/orphan-region.d
-+++ binutils-2.22/ld/testsuite/ld-elf/orphan-region.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-elf/orphan-region.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-elf/orphan-region.d
 @@ -15,7 +15,9 @@
  Program Headers:
    Type.*
@@ -337,8 +337,8 @@
    Segment Sections...
     00     .text .rodata .moredata *
 +   01 +
---- binutils-2.22/ld/testsuite/ld-i386/tlsbin.rd
-+++ binutils-2.22/ld/testsuite/ld-i386/tlsbin.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlsbin.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlsbin.rd
 @@ -44,6 +44,7 @@ Program Headers:
   +LOAD.*
   +DYNAMIC.*
@@ -355,8 +355,8 @@
  
  Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
   Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.22/ld/testsuite/ld-i386/tlsbindesc.rd
-+++ binutils-2.22/ld/testsuite/ld-i386/tlsbindesc.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlsbindesc.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlsbindesc.rd
 @@ -42,6 +42,7 @@ Program Headers:
   +LOAD.*
   +DYNAMIC.*
@@ -373,8 +373,8 @@
  
  Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
   Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.22/ld/testsuite/ld-i386/tlsdesc.rd
-+++ binutils-2.22/ld/testsuite/ld-i386/tlsdesc.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlsdesc.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlsdesc.rd
 @@ -39,6 +39,7 @@ Program Headers:
   +LOAD.*
   +DYNAMIC.*
@@ -391,8 +391,8 @@
  
  Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
   Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.22/ld/testsuite/ld-i386/tlsgdesc.rd
-+++ binutils-2.22/ld/testsuite/ld-i386/tlsgdesc.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlsgdesc.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlsgdesc.rd
 @@ -36,12 +36,14 @@ Program Headers:
   +LOAD.*
   +LOAD.*
@@ -408,8 +408,8 @@
  
  Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
   Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.22/ld/testsuite/ld-i386/tlsnopic.rd
-+++ binutils-2.22/ld/testsuite/ld-i386/tlsnopic.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlsnopic.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlsnopic.rd
 @@ -37,6 +37,7 @@ Program Headers:
   +LOAD.*
   +DYNAMIC.*
@@ -426,8 +426,8 @@
  
  Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
   Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.22/ld/testsuite/ld-i386/tlspic.rd
-+++ binutils-2.22/ld/testsuite/ld-i386/tlspic.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlspic.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-i386/tlspic.rd
 @@ -40,6 +40,7 @@ Program Headers:
   +LOAD.*
   +DYNAMIC.*
@@ -444,8 +444,8 @@
  
  Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries:
   Offset +Info +Type +Sym.Value +Sym. Name
---- binutils-2.22/ld/testsuite/ld-ia64/merge1.d
-+++ binutils-2.22/ld/testsuite/ld-ia64/merge1.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-ia64/merge1.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-ia64/merge1.d
 @@ -4,7 +4,7 @@
  #objdump: -d
  
@@ -455,8 +455,8 @@
  [     ]*[a-f0-9]+:    0b 60 80 02 00 24       \[MMI\]       addl r12=32,r1;;
  [     ]*[a-f0-9]+:    c0 c0 04 00 48 00                   addl r12=24,r1
  [     ]*[a-f0-9]+:    00 00 04 00                         nop.i 0x0;;
---- binutils-2.22/ld/testsuite/ld-ia64/merge2.d
-+++ binutils-2.22/ld/testsuite/ld-ia64/merge2.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-ia64/merge2.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-ia64/merge2.d
 @@ -4,7 +4,7 @@
  #objdump: -d
  
@@ -466,8 +466,8 @@
  [     ]*[a-f0-9]+:    0b 60 80 02 00 24       \[MMI\]       addl r12=32,r1;;
  [     ]*[a-f0-9]+:    c0 c0 04 00 48 00                   addl r12=24,r1
  [     ]*[a-f0-9]+:    00 00 04 00                         nop.i 0x0;;
---- binutils-2.22/ld/testsuite/ld-ia64/merge3.d
-+++ binutils-2.22/ld/testsuite/ld-ia64/merge3.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-ia64/merge3.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-ia64/merge3.d
 @@ -4,7 +4,7 @@
  #objdump: -d
  
@@ -477,8 +477,8 @@
  [     ]*[a-f0-9]+:    0b 60 80 02 00 24       \[MMI\]       addl r12=32,r1;;
  [     ]*[a-f0-9]+:    c0 40 05 00 48 00                   addl r12=40,r1
  [     ]*[a-f0-9]+:    00 00 04 00                         nop.i 0x0;;
---- binutils-2.22/ld/testsuite/ld-ia64/merge4.d
-+++ binutils-2.22/ld/testsuite/ld-ia64/merge4.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-ia64/merge4.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-ia64/merge4.d
 @@ -4,7 +4,7 @@
  #objdump: -d
  
@@ -488,8 +488,8 @@
  [     ]*[a-f0-9]+:    0b 60 80 02 00 24       \[MMI\]       addl r12=32,r1;;
  [     ]*[a-f0-9]+:    c0 40 05 00 48 00                   addl r12=40,r1
  [     ]*[a-f0-9]+:    00 00 04 00                         nop.i 0x0;;
---- binutils-2.22/ld/testsuite/ld-ia64/merge5.d
-+++ binutils-2.22/ld/testsuite/ld-ia64/merge5.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-ia64/merge5.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-ia64/merge5.d
 @@ -4,7 +4,7 @@
  #objdump: -d
  
@@ -499,8 +499,8 @@
  [     ]*[a-f0-9]+:    0b 60 80 02 00 24       \[MMI\]       addl r12=32,r1;;
  [     ]*[a-f0-9]+:    c0 40 05 00 48 00                   addl r12=40,r1
  [     ]*[a-f0-9]+:    00 00 04 00                         nop.i 0x0;;
---- binutils-2.22/ld/testsuite/ld-ia64/tlsbin.rd
-+++ binutils-2.22/ld/testsuite/ld-ia64/tlsbin.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-ia64/tlsbin.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-ia64/tlsbin.rd
 @@ -36,13 +36,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
  
  Program Headers:
@@ -518,8 +518,8 @@
   +IA_64_UNWIND .* R +0x8
  #...
  
---- binutils-2.22/ld/testsuite/ld-ia64/tlspic.rd
-+++ binutils-2.22/ld/testsuite/ld-ia64/tlspic.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-ia64/tlspic.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-ia64/tlspic.rd
 @@ -40,6 +40,7 @@ Program Headers:
   +LOAD +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+0[0-9a-f]+ 0x0+0[0-9a-f]+ RW +0x10000
   +DYNAMIC +0x0+1[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+11[0-9a-f]+ 0x0+140 0x0+140 RW +0x8
@@ -528,8 +528,8 @@
   +IA_64_UNWIND +0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+1[0-9a-f]+ 0x0+18 0x0+18 R +0x8
  #...
  
---- binutils-2.22/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
 @@ -8,9 +8,9 @@
  .*: +file format.*
  
@@ -543,8 +543,8 @@
  #...
  00408d60 <[^>]*> 3c1c0043     lui     gp,0x43
  00408d64 <[^>]*> 279c2c98     addiu   gp,gp,11416
---- binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd
 @@ -1,7 +1,7 @@
  
  Elf file type is DYN \(Shared object file\)
@@ -567,8 +567,8 @@
   *0*3 * \.dynamic *
   *0*4 *
 + *0*5 *
---- binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.sd
 @@ -1,7 +1,7 @@
  
  Elf file type is EXEC \(Executable file\)
@@ -591,8 +591,8 @@
   *0*6 *\.dynamic *
   *0*7 *
 + *0*8 *
---- binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.sd
 @@ -1,7 +1,7 @@
  
  Elf file type is EXEC \(Executable file\)
@@ -615,8 +615,8 @@
   *0*6 * \.dynamic *
   *0*7 *
 + *0*8 *
---- binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.sd
 @@ -1,7 +1,7 @@
  
  Elf file type is EXEC \(Executable file\)
@@ -639,8 +639,8 @@
   *0*6 * \.dynamic *
   *0*7 *
 + *0*8 *
---- binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.sd
 @@ -1,7 +1,7 @@
  
  Elf file type is EXEC \(Executable file\)
@@ -663,8 +663,8 @@
   *0*6 * \.dynamic *
   *0*7 *
 + *0*8 *
---- binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.sd
 @@ -1,7 +1,7 @@
  
  Elf file type is EXEC \(Executable file\)
@@ -687,8 +687,8 @@
   *0*5 * \.dynamic *
   *0*6 *
 + *0*7 *
---- binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.sd
 @@ -1,7 +1,7 @@
  
  Elf file type is EXEC \(Executable file\)
@@ -711,42 +711,8 @@
   *0*6 * \.dynamic *
   *0*7 *
 + *0*8 *
---- binutils-2.22/ld/testsuite/ld-mips-elf/rel32-n32.d
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/rel32-n32.d
-@@ -10,6 +10,6 @@ Relocation section '.rel.dyn' at offset .* contains 2 entries:
- [0-9a-f ]+R_MIPS_REL32     
- 
- Hex dump of section '.text':
--  0x000002e0 00000000 00000000 00000000 00000000 ................
--  0x000002f0 000002f0 00000000 00000000 00000000 ................
-   0x00000300 00000000 00000000 00000000 00000000 ................
-+  0x00000310 00000310 00000000 00000000 00000000 ................
-+  0x00000320 00000000 00000000 00000000 00000000 ................
---- binutils-2.22/ld/testsuite/ld-mips-elf/rel32-o32.d
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/rel32-o32.d
-@@ -10,6 +10,6 @@ Relocation section '.rel.dyn' at offset .* contains 2 entries:
- [0-9a-f ]+R_MIPS_REL32     
- 
- Hex dump of section '.text':
--  0x000002e0 00000000 00000000 00000000 00000000 ................
--  0x000002f0 000002f0 00000000 00000000 00000000 ................
-   0x00000300 00000000 00000000 00000000 00000000 ................
-+  0x00000310 00000310 00000000 00000000 00000000 ................
-+  0x00000320 00000000 00000000 00000000 00000000 ................
---- binutils-2.22/ld/testsuite/ld-mips-elf/rel64.d
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/rel64.d
-@@ -14,6 +14,6 @@ Relocation section '.rel.dyn' at offset .* contains 2 entries:
-  +Type3: R_MIPS_NONE      
- 
- Hex dump of section '.text':
--  0x00000450 00000000 00000000 00000000 00000000 ................
--  0x00000460 00000000 00000460 00000000 00000000 ................
--  0x00000470 00000000 00000000 00000000 00000000 ................
-+  0x00000490 00000000 00000000 00000000 00000000 ................
-+  0x000004a0 00000000 000004a0 00000000 00000000 ................
-+  0x000004b0 00000000 00000000 00000000 00000000 ................
---- binutils-2.22/ld/testsuite/ld-mips-elf/tlsbin-o32.d
-+++ binutils-2.22/ld/testsuite/ld-mips-elf/tlsbin-o32.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/tlsbin-o32.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-mips-elf/tlsbin-o32.d
 @@ -2,42 +2,42 @@
  
  Disassembly of section .text:
@@ -828,8 +794,8 @@
 +00400[0-9a-f]{3} <__tls_get_addr>:
 +  400[0-9a-f]{3}:     03e00008        jr      ra
 +  400[0-9a-f]{3}:     00000000        nop
---- binutils-2.22/ld/testsuite/ld-powerpc/tls.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tls.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tls.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tls.d
 @@ -9,45 +9,45 @@
  
  Disassembly of section \.text:
@@ -917,8 +883,8 @@
 -    10000180: 4e 80 00 20     blr
 +0+10000[0-9a-f]{3} <\.__tls_get_addr>:
 +    10000[0-9a-f]{3}: 4e 80 00 20     blr
---- binutils-2.22/ld/testsuite/ld-powerpc/tls.g
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tls.g
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tls.g
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tls.g
 @@ -8,5 +8,5 @@
  .*: +file format elf64-powerpc
  
@@ -927,8 +893,8 @@
 - 100101f0 ffffffff ffff8058                    .*
 + 10010([0-9a-f]{3}) 00000000 10018\1 ffffffff ffff8018  .*
 + 10010[0-9a-f]{3} ffffffff ffff8058                    .*
---- binutils-2.22/ld/testsuite/ld-powerpc/tls32.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tls32.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tls32.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tls32.d
 @@ -9,42 +9,42 @@
  
  Disassembly of section \.text:
@@ -1006,16 +972,16 @@
 -0+181012c <_GLOBAL_OFFSET_TABLE_>:
 +0+1810[0-9a-f]{3} <_GLOBAL_OFFSET_TABLE_>:
        \.\.\.
---- binutils-2.22/ld/testsuite/ld-powerpc/tls32.g
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tls32.g
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tls32.g
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tls32.g
 @@ -8,4 +8,4 @@
  .*: +file format elf32-powerpc
  
  Contents of section \.got:
 - 1810128 4e800021 00000000 00000000 00000000  .*
 + 18101[0-9a-f]{2} 4e800021 00000000 00000000 00000000  .*
---- binutils-2.22/ld/testsuite/ld-powerpc/tls32.t
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tls32.t
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tls32.t
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tls32.t
 @@ -8,5 +8,5 @@
  .*: +file format elf32-powerpc
  
@@ -1024,24 +990,24 @@
 - 1810118 56789abc 6789abcd 789abcde 00c0ffee  .*
 + 18101[0-9a-f]{2} 12345678 23456789 3456789a 456789ab  .*
 + 18101[0-9a-f]{2} 56789abc 6789abcd 789abcde 00c0ffee  .*
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsexe32.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsexe32.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsexe32.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsexe32.d
 @@ -44,4 +44,4 @@ Disassembly of section \.got:
  .*:   4e 80 00 21     blrl
  
  .* <_GLOBAL_OFFSET_TABLE_>:
 -.*:   01 81 02 b8 00 00 00 00 00 00 00 00  .*
 +.*:   01 81 02 [bd]8 00 00 00 00 00 00 00 00  .*
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsexe32.g
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsexe32.g
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsexe32.g
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsexe32.g
 @@ -8,4 +8,4 @@
  
  Contents of section \.got:
  .* 00000000 00000000 00000000 4e800021  .*
 -.* 018102b8 00000000 00000000           .*
 +.* 018102[bd]8 00000000 00000000           .*
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsexe32.r
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsexe32.r
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsexe32.r
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsexe32.r
 @@ -33,13 +33,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
  
  Program Headers:
@@ -1067,8 +1033,8 @@
  
  Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
   Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsmark.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsmark.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsmark.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsmark.d
 @@ -9,29 +9,29 @@
  
  Disassembly of section \.text:
@@ -1124,8 +1090,8 @@
 -    10000140: 4e 80 00 20     blr
 +0+10000[0-9a-f]{3} <\.__tls_get_addr>:
 +    10000[0-9a-f]{3}: 4e 80 00 20     blr
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsmark32.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsmark32.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsmark32.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsmark32.d
 @@ -9,17 +9,17 @@
  
  Disassembly of section \.text:
@@ -1158,8 +1124,8 @@
 +0+18000[0-9a-f]{2} <__tls_get_addr>:
 + 18000[0-9a-f]{2}:    4e 80 00 20     blr
 +#pass
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsopt1.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsopt1.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt1.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt1.d
 @@ -9,17 +9,17 @@
  
  Disassembly of section \.text:
@@ -1189,8 +1155,8 @@
 +    10000[0-9a-f]{3}: 48 00 00 0c     b       .*
 +    10000[0-9a-f]{3}: 4b ff ff e5     bl      10000[0-9a-f]{3} <\.__tls_get_addr>
 +    10000[0-9a-f]{3}: 60 00 00 00     nop
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsopt1_32.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsopt1_32.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt1_32.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt1_32.d
 @@ -9,16 +9,16 @@
  
  Disassembly of section \.text:
@@ -1217,8 +1183,8 @@
 + 18000[0-9a-f]{2}:    48 00 00 08     b       .*
 + 18000[0-9a-f]{2}:    4b ff ff e9     bl      18000[0-9a-f]{2} <__tls_get_addr>
  #pass
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsopt2.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsopt2.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt2.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt2.d
 @@ -9,15 +9,15 @@
  
  Disassembly of section \.text:
@@ -1244,8 +1210,8 @@
 +    10000[0-9a-f]{3}: 38 62 80 08     addi    r3,r2,-32760
 +    10000[0-9a-f]{3}: 4b ff ff ed     bl      10000[0-9a-f]{3} <\.__tls_get_addr>
 +    10000[0-9a-f]{3}: 60 00 00 00     nop
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsopt2_32.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsopt2_32.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt2_32.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt2_32.d
 @@ -9,15 +9,15 @@
  
  Disassembly of section \.text:
@@ -1270,8 +1236,8 @@
 + 18000[0-9a-f]{2}:    38 6d ff f4     addi    r3,r13,-12
 + 18000[0-9a-f]{2}:    4b ff ff ed     bl      18000[0-9a-f]{2} <__tls_get_addr>
  #pass
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsopt3.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsopt3.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt3.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt3.d
 @@ -9,18 +9,18 @@
  
  Disassembly of section \.text:
@@ -1303,8 +1269,8 @@
 +    10000[0-9a-f]{3}: 48 00 00 0c     b       .*
 +    10000[0-9a-f]{3}: 4b ff ff e1     bl      10000[0-9a-f]{3} <\.__tls_get_addr>
 +    10000[0-9a-f]{3}: 60 00 00 00     nop
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsopt3_32.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsopt3_32.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt3_32.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt3_32.d
 @@ -9,17 +9,17 @@
  
  Disassembly of section \.text:
@@ -1333,8 +1299,8 @@
 + 18000[0-9a-f]{2}:    48 00 00 08     b       .*
 + 18000[0-9a-f]{2}:    4b ff ff e5     bl      18000[0-9a-f]{2} <__tls_get_addr>
  #pass
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsopt4.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsopt4.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt4.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt4.d
 @@ -9,40 +9,40 @@
  
  Disassembly of section \.text:
@@ -1404,8 +1370,8 @@
 +    10000[0-9a-f]{3}: 48 00 00 0c     b       .*
 +    10000[0-9a-f]{3}: 60 00 00 00     nop
 +    10000[0-9a-f]{3}: 38 63 90 08     addi    r3,r3,-28664
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsopt4_32.d
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsopt4_32.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt4_32.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsopt4_32.d
 @@ -9,36 +9,36 @@
  
  Disassembly of section \.text:
@@ -1466,8 +1432,17 @@
 + 18000[0-9a-f]{2}:    48 00 00 08     b       .*
 + 18000[0-9a-f]{2}:    38 63 90 08     addi    r3,r3,-28664
  #pass
---- binutils-2.22/ld/testsuite/ld-powerpc/tlsso32.g
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlsso32.g
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsso32.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsso32.d
+@@ -42,5 +42,5 @@ Disassembly of section \.got:
+ #...
+ .*:   4e 80 00 21     blrl
+ .* <_GLOBAL_OFFSET_TABLE_>:
+-.*:   00 01 03 ec .*
++.*:   00 01 [0-9a-f]{2} [0-9a-f]{2} .*
+ #pass
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsso32.g
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsso32.g
 @@ -9,5 +9,5 @@
  Contents of section \.got:
  .* 00000000 00000000 00000000 00000000  .*
@@ -1475,8 +1450,39 @@
 -.* 00000000 4e800021 000103ec 00000000  .*
 +.* 00000000 4e800021 00010[0-9a-f]{3} 00000000  .*
  .* 00000000                             .*
---- binutils-2.22/ld/testsuite/ld-powerpc/tlstoc.g
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlstoc.g
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsso32.r
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlsso32.r
+@@ -35,6 +35,7 @@ Program Headers:
+  +LOAD .* RWE 0x10000
+  +DYNAMIC .* RW +0x4
+  +TLS .* 0x0+1c 0x0+38 R +0x4
++ +PAX_FLAGS +0x0+ 0x0+ 0x0+ 0x0+ 0x0+ +0x[48]
+ 
+  Section to Segment mapping:
+  +Segment Sections\.\.\.
+@@ -42,6 +43,7 @@ Program Headers:
+  +01 +\.tdata \.dynamic \.got \.plt 
+  +02 +\.dynamic 
+  +03 +\.tdata \.tbss 
++ +04 +
+ 
+ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
+  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
+@@ -52,9 +54,9 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
+ [0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 \+ 0
+ [0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 \+ 0
+ [0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 \+ 0
+-[0-9a-f ]+R_PPC_TPREL16 +0+103d0 +\.tdata \+ 103e4
+-[0-9a-f ]+R_PPC_TPREL16_HA +0+103d0 +\.tdata \+ 103e8
+-[0-9a-f ]+R_PPC_TPREL16_LO +0+103d0 +\.tdata \+ 103e8
++[0-9a-f ]+R_PPC_TPREL16 +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
++[0-9a-f ]+R_PPC_TPREL16_HA +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
++[0-9a-f ]+R_PPC_TPREL16_LO +0+103[df]0 +\.tdata \+ 10[0-9a-f]{3}
+ [0-9a-f ]+R_PPC_DTPMOD32 +0
+ [0-9a-f ]+R_PPC_DTPREL32 +0
+ [0-9a-f ]+R_PPC_DTPMOD32 +0
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlstoc.g
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlstoc.g
 @@ -8,8 +8,8 @@
  .*: +file format elf64-powerpc
  
@@ -1491,8 +1497,8 @@
 + 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000  .*
 + 10010[0-9a-f]{3} 00000000 00000001 00000000 00000000  .*
 + 10010[0-9a-f]{3} ffffffff ffff8060 00000000 00000000  .*
---- binutils-2.22/ld/testsuite/ld-powerpc/tlstoc.t
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlstoc.t
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlstoc.t
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlstoc.t
 @@ -8,7 +8,7 @@
  .*: +file format elf64-powerpc
  
@@ -1505,8 +1511,8 @@
 + 10010190 23456789 abcdef01 3456789a bcdef012  .*
 + 100101a0 456789ab cdef0123 56789abc def01234  .*
 + 100101b0 6789abcd ef012345 789abcde f0123456  .*
---- binutils-2.22/ld/testsuite/ld-powerpc/tlstocso.g
-+++ binutils-2.22/ld/testsuite/ld-powerpc/tlstocso.g
+--- binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlstocso.g
++++ binutils-2.23.51.0.2/ld/testsuite/ld-powerpc/tlstocso.g
 @@ -7,7 +7,7 @@
  .*: +file format elf64-powerpc
  
@@ -1516,18 +1522,9 @@
  .* 00000000 00000000 00000000 00000000  .*
  .* 00000000 00000000 00000000 00000000  .*
  .* 00000000 00000000 00000000 00000000  .*
---- binutils-2.22/ld/testsuite/ld-s390/tlsbin.rd
-+++ binutils-2.22/ld/testsuite/ld-s390/tlsbin.rd
-@@ -36,13 +36,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-- +PHDR +0x0+34 0x0+400034 0x0+400034 0x0+c0 0x0+c0 R E 0x4
-- +INTERP +0x0+f4 0x0+4000f4 0x0+4000f4 0x0+11 0x0+11 R +0x1
-+ +PHDR +0x0+34 0x0+400034 0x0+400034 0x0+e0 0x0+e0 R E 0x4
-+ +INTERP +0x0+114 0x0+400114 0x0+400114 0x0+11 0x0+11 R +0x1
- .*Requesting program interpreter.*
-  +LOAD .* R E 0x1000
+--- binutils-2.23.51.0.2/ld/testsuite/ld-s390/tlsbin.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-s390/tlsbin.rd
+@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+
   +LOAD .* RW +0x1000
   +DYNAMIC .* RW +0x4
   +TLS .* 0x0+60 0x0+a0 R +0x20
@@ -1543,18 +1540,9 @@
  
  Relocation section '.rela.dyn' at offset .* contains 4 entries:
   Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
---- binutils-2.22/ld/testsuite/ld-s390/tlsbin_64.rd
-+++ binutils-2.22/ld/testsuite/ld-s390/tlsbin_64.rd
-@@ -36,13 +36,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
- 
- Program Headers:
-  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-- +PHDR +0x0+40 0x0+80000040 0x0+80000040 0x0+150 0x0+150 R E 0x8
-- +INTERP +0x0+190 0x0+80000190 0x0+80000190 0x0+11 0x0+11 R +0x1
-+ +PHDR +0x0+40 0x0+80000040 0x0+80000040 0x0+188 0x0+188 R E 0x8
-+ +INTERP +0x0+1c8 0x0+800001c8 0x0+800001c8 0x0+11 0x0+11 R +0x1
- .*Requesting program interpreter.*
-  +LOAD .* R E 0x1000
+--- binutils-2.23.51.0.2/ld/testsuite/ld-s390/tlsbin_64.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-s390/tlsbin_64.rd
+@@ -36,6 +36,7 @@ There are [0-9]+ program headers, starting at offset [0-9]+
   +LOAD .* RW +0x1000
   +DYNAMIC .* RW +0x8
   +TLS .* 0x0+60 0x0+a0 R +0x20
@@ -1570,8 +1558,8 @@
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
   +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
---- binutils-2.22/ld/testsuite/ld-s390/tlspic.rd
-+++ binutils-2.22/ld/testsuite/ld-s390/tlspic.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-s390/tlspic.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-s390/tlspic.rd
 @@ -39,6 +39,7 @@ Program Headers:
   +LOAD .* RW +0x1000
   +DYNAMIC .* RW +0x4
@@ -1588,8 +1576,8 @@
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
   Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
---- binutils-2.22/ld/testsuite/ld-s390/tlspic_64.rd
-+++ binutils-2.22/ld/testsuite/ld-s390/tlspic_64.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-s390/tlspic_64.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-s390/tlspic_64.rd
 @@ -39,6 +39,7 @@ Program Headers:
   +LOAD .* RW +0x1000
   +DYNAMIC .* RW +0x8
@@ -1606,8 +1594,8 @@
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
   +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
---- binutils-2.22/ld/testsuite/ld-scripts/empty-aligned.d
-+++ binutils-2.22/ld/testsuite/ld-scripts/empty-aligned.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-scripts/empty-aligned.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-scripts/empty-aligned.d
 @@ -8,7 +8,9 @@
  Program Headers:
   +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg +Align
@@ -1618,8 +1606,8 @@
   +Segment Sections\.\.\.
   +00 +.text 
 + +01 +
---- binutils-2.22/ld/testsuite/ld-sh/tlsbin-2.d
-+++ binutils-2.22/ld/testsuite/ld-sh/tlsbin-2.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-sh/tlsbin-2.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-sh/tlsbin-2.d
 @@ -44,6 +44,7 @@ Program Headers:
   +LOAD.*
   +DYNAMIC.*
@@ -1636,8 +1624,8 @@
  
  Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
   Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
---- binutils-2.22/ld/testsuite/ld-sh/tlspic-2.d
-+++ binutils-2.22/ld/testsuite/ld-sh/tlspic-2.d
+--- binutils-2.23.51.0.2/ld/testsuite/ld-sh/tlspic-2.d
++++ binutils-2.23.51.0.2/ld/testsuite/ld-sh/tlspic-2.d
 @@ -32,7 +32,7 @@ Key to Flags:
  
  Elf file type is DYN \(Shared object file\)
@@ -1663,8 +1651,8 @@
  
  Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 10 entries:
   Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
---- binutils-2.22/ld/testsuite/ld-sparc/gotop32.rd
-+++ binutils-2.22/ld/testsuite/ld-sparc/gotop32.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-sparc/gotop32.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-sparc/gotop32.rd
 @@ -31,6 +31,7 @@ Program Headers:
   +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000
   +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+2000 0x0+2000 RW +0x10000
@@ -1673,8 +1661,8 @@
  #...
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
---- binutils-2.22/ld/testsuite/ld-sparc/gotop64.rd
-+++ binutils-2.22/ld/testsuite/ld-sparc/gotop64.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-sparc/gotop64.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-sparc/gotop64.rd
 @@ -31,6 +31,7 @@ Program Headers:
   +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x100000
   +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+2000 0x0+2000 RW +0x100000
@@ -1683,8 +1671,8 @@
  #...
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
---- binutils-2.22/ld/testsuite/ld-sparc/tlssunbin32.rd
-+++ binutils-2.22/ld/testsuite/ld-sparc/tlssunbin32.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunbin32.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunbin32.rd
 @@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
  
  Program Headers:
@@ -1702,8 +1690,8 @@
  #...
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
---- binutils-2.22/ld/testsuite/ld-sparc/tlssunbin64.rd
-+++ binutils-2.22/ld/testsuite/ld-sparc/tlssunbin64.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunbin64.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunbin64.rd
 @@ -30,13 +30,14 @@ There are [0-9]+ program headers, starting at offset [0-9]+
  
  Program Headers:
@@ -1721,8 +1709,8 @@
  #...
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
---- binutils-2.22/ld/testsuite/ld-sparc/tlssunnopic32.rd
-+++ binutils-2.22/ld/testsuite/ld-sparc/tlssunnopic32.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunnopic32.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunnopic32.rd
 @@ -32,6 +32,7 @@ Program Headers:
   +LOAD .* RW +0x10000
   +DYNAMIC .* RW +0x4
@@ -1731,8 +1719,8 @@
  #...
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries:
---- binutils-2.22/ld/testsuite/ld-sparc/tlssunnopic64.rd
-+++ binutils-2.22/ld/testsuite/ld-sparc/tlssunnopic64.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunnopic64.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunnopic64.rd
 @@ -32,6 +32,7 @@ Program Headers:
   +LOAD .* RW +0x100000
   +DYNAMIC .* RW +0x8
@@ -1741,8 +1729,8 @@
  #...
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
---- binutils-2.22/ld/testsuite/ld-sparc/tlssunpic32.rd
-+++ binutils-2.22/ld/testsuite/ld-sparc/tlssunpic32.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunpic32.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunpic32.rd
 @@ -36,6 +36,7 @@ Program Headers:
   +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+184 0x0+184 RWE 0x10000
   +DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+98 0x0+98 RW +0x4
@@ -1751,8 +1739,8 @@
  #...
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
---- binutils-2.22/ld/testsuite/ld-sparc/tlssunpic64.rd
-+++ binutils-2.22/ld/testsuite/ld-sparc/tlssunpic64.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunpic64.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-sparc/tlssunpic64.rd
 @@ -36,6 +36,7 @@ Program Headers:
   +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+3a0 0x0+3a0 RWE 0x100000
   +DYNAMIC +0x0+2060 0x0+102060 0x0+102060 0x0+130 0x0+130 RW +0x8
@@ -1761,8 +1749,8 @@
  #...
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
---- binutils-2.22/ld/testsuite/ld-x86-64/tlsgdesc.rd
-+++ binutils-2.22/ld/testsuite/ld-x86-64/tlsgdesc.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-x86-64/tlsgdesc.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-x86-64/tlsgdesc.rd
 @@ -36,12 +36,14 @@ Program Headers:
   +LOAD.*
   +LOAD.*
@@ -1778,8 +1766,8 @@
  
  Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
   +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
---- binutils-2.22/ld/testsuite/ld-x86-64/tlspic.rd
-+++ binutils-2.22/ld/testsuite/ld-x86-64/tlspic.rd
+--- binutils-2.23.51.0.2/ld/testsuite/ld-x86-64/tlspic.rd
++++ binutils-2.23.51.0.2/ld/testsuite/ld-x86-64/tlspic.rd
 @@ -40,6 +40,7 @@ Program Headers:
   +LOAD +0x0+11ac 0x0+2011ac 0x0+2011ac 0x0+244 0x0+244 RW +0x200000
   +DYNAMIC +0x0+1210 0x0+201210 0x0+201210 0x0+130 0x0+130 RW +0x8

diff --git a/binutils/patches/binutils-2.20.51.0.2-libtool-lib64.patch b/binutils/patches/x86_64/binutils-2.20.51.0.2-libtool-lib64.patch0
similarity index 100%
rename from binutils/patches/binutils-2.20.51.0.2-libtool-lib64.patch
rename to binutils/patches/x86_64/binutils-2.20.51.0.2-libtool-lib64.patch0