Update Dyson patches

4 files changed, 148 insertions, 207 deletions

diff --git a/debian/patches/dyson-biarch.patch b/debian/patches/dyson-biarch.patch
index 41d55d1..ddeae9f 100644
--- a/debian/patches/dyson-biarch.patch
+++ b/debian/patches/dyson-biarch.patch
@@ -1,10 +1,10 @@
-Index: binutils/ld/emulparams/elf_i386_sol2.sh
+Index: binutils.git/ld/emulparams/elf_i386_sol2.sh
 ===================================================================
---- binutils.orig/ld/emulparams/elf_i386_sol2.sh	2012-10-28 21:44:11.532380262 +0400
-+++ binutils/ld/emulparams/elf_i386_sol2.sh	2012-10-28 22:16:29.024955547 +0400
-@@ -2,3 +2,13 @@
- . ${srcdir}/emulparams/solaris2.sh
- EXTRA_EM_FILE=solaris2
+--- binutils.git.orig/ld/emulparams/elf_i386_sol2.sh
++++ binutils.git/ld/emulparams/elf_i386_sol2.sh
+@@ -2,3 +2,13 @@ source_sh ${srcdir}/emulparams/elf_i386_
+ source_sh ${srcdir}/emulparams/solaris2.sh
+ EXTRA_EM_FILE="solaris2-x86"
  OUTPUT_FORMAT="elf32-i386-sol2"
 +
 +# Dyson modify the default library search path to first include
diff --git a/debian/patches/dyson-ld_altexec.patch b/debian/patches/dyson-ld_altexec.patch
index d4c019a..7b3ed75 100644
--- a/debian/patches/dyson-ld_altexec.patch
+++ b/debian/patches/dyson-ld_altexec.patch
@@ -1,46 +1,17 @@
-Index: binutils-2.26/ld/ld.texinfo
+Index: binutils.git/ld/ldmain.c
 ===================================================================
---- binutils-2.26.orig/ld/ld.texinfo
-+++ binutils-2.26/ld/ld.texinfo
-@@ -2960,7 +2960,10 @@ You can change the behaviour of @command
- @ifclear SingleFormat
- @code{GNUTARGET},
- @end ifclear
--@code{LDEMULATION} and @code{COLLECT_NO_DEMANGLE}.
-+@code{LDEMULATION},
-+@code{COLLECT_NO_DEMANGLE}
-+and
-+@code{LD_ALTEXEC}.
- 
- @ifclear SingleFormat
- @kindex GNUTARGET
-@@ -2998,6 +3001,12 @@ a similar fashion by the @code{gcc} link
- may be overridden by the @samp{--demangle} and @samp{--no-demangle}
- options.
- 
-+@kindex LD_ALTEXEC
-+@cindex alternative linker
-+@code{LD_ALTEXEC} sets alternative linker. @command{ld} executes,
-+and passes control to this alternative linker. For instance one
-+can set @code{LD_ALTEXEC=echo} to debug linker command line.
-+
- @c man end
- @end ifset
- 
-Index: binutils-2.26/ld/ldmain.c
-===================================================================
---- binutils-2.26.orig/ld/ldmain.c
-+++ binutils-2.26/ld/ldmain.c
+--- binutils.git.orig/ld/ldmain.c
++++ binutils.git/ld/ldmain.c
 @@ -49,6 +49,7 @@
  #endif
  
  #include <string.h>
 +#include <errno.h>
  
- #ifdef HAVE_SBRK
- #if !HAVE_DECL_SBRK
-@@ -183,9 +184,35 @@ ld_bfd_assert_handler (const char *fmt,
-   config.make_executable = FALSE;
+ #ifndef TARGET_SYSTEM_ROOT
+ #define TARGET_SYSTEM_ROOT ""
+@@ -187,9 +188,35 @@ ld_bfd_error_handler (const char *fmt, v
+   (*default_bfd_error_handler) (fmt, ap);
  }
  
 +static void
@@ -74,4 +45,29 @@ Index: binutils-2.26/ld/ldmain.c
 +
    char *emulation;
    long start_time = get_run_time ();
- #ifdef HAVE_SBRK
+ 
+Index: binutils.git/ld/ld.info
+===================================================================
+--- binutils.git.orig/ld/ld.info
++++ binutils.git/ld/ld.info
+@@ -2546,7 +2546,7 @@ File: ld.info,  Node: Environment,  Prev
+ =========================
+ 
+ You can change the behaviour of 'ld' with the environment variables
+-'GNUTARGET', 'LDEMULATION' and 'COLLECT_NO_DEMANGLE'.
++'GNUTARGET', 'LDEMULATION', 'COLLECT_NO_DEMANGLE', and 'LD_ALTEXEC'.
+ 
+    'GNUTARGET' determines the input-file object format if you don't use
+ '-b' (or its synonym '--format').  Its value should be one of the BFD
+@@ -2574,6 +2574,11 @@ not demangling symbols.  This environmen
+ fashion by the 'gcc' linker wrapper program.  The default may be
+ overridden by the '--demangle' and '--no-demangle' options.
+ 
++   'LD_ALTEXEC' sets alternative linker. The linker executes,
++and passes control to this alternative linker. For instance one
++can set 'LD_ALTEXEC=echo' to debug linker command line.
++
++
+ 
+ File: ld.info,  Node: Scripts,  Next: Machine Dependent,  Prev: Invocation,  Up: Top
+ 
diff --git a/debian/patches/dyson-pr12548-anonymous-version-tag.patch b/debian/patches/dyson-pr12548-anonymous-version-tag.patch
index 1ccbcff..fd4362c 100644
--- a/debian/patches/dyson-pr12548-anonymous-version-tag.patch
+++ b/debian/patches/dyson-pr12548-anonymous-version-tag.patch
@@ -1,10 +1,10 @@
 Description: anonymous version tag mapped to base version
 Bug: http://sourceware.org/bugzilla/show_bug.cgi?id=12548
-Index: binutils-2.26/ld/ldlang.c
+Index: binutils.git/ld/ldlang.c
 ===================================================================
---- binutils-2.26.orig/ld/ldlang.c
-+++ binutils-2.26/ld/ldlang.c
-@@ -7947,9 +7947,9 @@ lang_register_vers_node (const char *nam
+--- binutils.git.orig/ld/ldlang.c
++++ binutils.git/ld/ldlang.c
+@@ -8743,9 +8743,9 @@ lang_register_vers_node (const char *nam
    if (link_info.version_info != NULL
        && (name[0] == '\0' || link_info.version_info->name[0] == '\0'))
      {
diff --git a/debian/patches/dyson-pr14493-sol2.patch b/debian/patches/dyson-pr14493-sol2.patch
index cf6a47e..1f2dfde 100644
--- a/debian/patches/dyson-pr14493-sol2.patch
+++ b/debian/patches/dyson-pr14493-sol2.patch
@@ -1,27 +1,9 @@
 Description: fix .SUNW_ldynsym section processing
 Bug: http://sourceware.org/bugzilla/show_bug.cgi?id=14493
-@@ -, +, @@ 
----
- bfd/ChangeLog.pr14493         | 27 ++++++++++++++++++
- bfd/Makefile.am               |  4 +++
- bfd/Makefile.in               |  5 ++++
- bfd/configure                 | 30 ++++++++++----------
- bfd/configure.in              | 30 ++++++++++----------
- bfd/elf-sol2.c                | 66 +++++++++++++++++++++++++++++++++++++++++++
- bfd/elf-sol2.h                | 31 ++++++++++++++++++++
- bfd/elf32-i386.c              | 10 +++++++
- bfd/elf64-x86-64.c            | 10 +++++++
- include/elf/ChangeLog.pr14493 |  5 ++++
- include/elf/common.h          |  4 +++
- 11 files changed, 192 insertions(+), 30 deletions(-)
- create mode 100644 bfd/ChangeLog.pr14493
- create mode 100644 bfd/elf-sol2.c
- create mode 100644 bfd/elf-sol2.h
- create mode 100644 include/elf/ChangeLog.pr14493
-Index: binutils-2.26/bfd/ChangeLog.pr14493
+Index: binutils.git/bfd/ChangeLog.pr14493
 ===================================================================
 --- /dev/null
-+++ binutils-2.26/bfd/ChangeLog.pr14493
++++ binutils.git/bfd/ChangeLog.pr14493
 @@ -0,0 +1,27 @@
 +2012-08-24  H.J. Lu  <hongjiu.lu@intel.com>
 +
@@ -50,11 +32,11 @@ Index: binutils-2.26/bfd/ChangeLog.pr14493
 +
 +	* Makefile.in: Regenerated.
 +	* configure: Likewise.
-Index: binutils-2.26/bfd/Makefile.am
+Index: binutils.git/bfd/Makefile.am
 ===================================================================
---- binutils-2.26.orig/bfd/Makefile.am
-+++ binutils-2.26/bfd/Makefile.am
-@@ -315,6 +315,7 @@ BFD32_BACKENDS = \
+--- binutils.git.orig/bfd/Makefile.am
++++ binutils.git/bfd/Makefile.am
+@@ -295,6 +295,7 @@ BFD32_BACKENDS = \
  	elf-m10200.lo \
  	elf-m10300.lo \
  	elf-nacl.lo \
@@ -62,7 +44,7 @@ Index: binutils-2.26/bfd/Makefile.am
  	elf-strtab.lo \
  	elf-vxworks.lo \
  	elf.lo \
-@@ -506,6 +507,7 @@ BFD32_BACKENDS_CFILES = \
+@@ -432,6 +433,7 @@ BFD32_BACKENDS_CFILES = \
  	elf-m10200.c \
  	elf-m10300.c \
  	elf-nacl.c \
@@ -70,27 +52,27 @@ Index: binutils-2.26/bfd/Makefile.am
  	elf-strtab.c \
  	elf-vxworks.c \
  	elf.c \
-@@ -660,6 +662,7 @@ BFD64_BACKENDS = \
+@@ -552,6 +554,7 @@ BFD64_BACKENDS = \
+ 	coff-alpha.lo \
  	coff-x86_64.lo \
  	coff64-rs6000.lo \
- 	demo64.lo \
-+	elf-sol2.lo \
++ 	elf-sol2.lo \
  	elf32-ia64.lo \
  	elf32-mips.lo \
  	elf32-score.lo \
-@@ -699,6 +702,7 @@ BFD64_BACKENDS_CFILES = \
+@@ -594,6 +597,7 @@ BFD64_BACKENDS_CFILES = \
+ 	coff-alpha.c \
  	coff-x86_64.c \
  	coff64-rs6000.c \
- 	demo64.c \
-+	elf-sol2.c \
++ 	elf-sol2.c \
  	elf32-mips.c \
  	elf32-score.c \
  	elf32-score7.c \
-Index: binutils-2.26/bfd/Makefile.in
+Index: binutils.git/bfd/Makefile.in
 ===================================================================
---- binutils-2.26.orig/bfd/Makefile.in
-+++ binutils-2.26/bfd/Makefile.in
-@@ -619,6 +619,7 @@ BFD32_BACKENDS = \
+--- binutils.git.orig/bfd/Makefile.in
++++ binutils.git/bfd/Makefile.in
+@@ -720,6 +720,7 @@ BFD32_BACKENDS = \
  	elf-m10200.lo \
  	elf-m10300.lo \
  	elf-nacl.lo \
@@ -98,7 +80,7 @@ Index: binutils-2.26/bfd/Makefile.in
  	elf-strtab.lo \
  	elf-vxworks.lo \
  	elf.lo \
-@@ -810,6 +811,7 @@ BFD32_BACKENDS_CFILES = \
+@@ -857,6 +858,7 @@ BFD32_BACKENDS_CFILES = \
  	elf-m10200.c \
  	elf-m10300.c \
  	elf-nacl.c \
@@ -106,34 +88,34 @@ Index: binutils-2.26/bfd/Makefile.in
  	elf-strtab.c \
  	elf-vxworks.c \
  	elf.c \
-@@ -965,6 +967,7 @@ BFD64_BACKENDS = \
+@@ -978,6 +980,7 @@ BFD64_BACKENDS = \
+ 	coff-alpha.lo \
  	coff-x86_64.lo \
  	coff64-rs6000.lo \
- 	demo64.lo \
-+	elf-sol2.lo \
++ 	elf-sol2.lo \
  	elf32-ia64.lo \
  	elf32-mips.lo \
  	elf32-score.lo \
-@@ -1004,6 +1007,7 @@ BFD64_BACKENDS_CFILES = \
+@@ -1020,6 +1023,7 @@ BFD64_BACKENDS_CFILES = \
+ 	coff-alpha.c \
  	coff-x86_64.c \
  	coff64-rs6000.c \
- 	demo64.c \
-+	elf-sol2.c \
++ 	elf-sol2.c \
  	elf32-mips.c \
  	elf32-score.c \
  	elf32-score7.c \
-@@ -1414,6 +1418,7 @@ distclean-compile:
+@@ -1416,6 +1420,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-m10200.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-m10300.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-nacl.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-sol2.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-properties.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-strtab.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-vxworks.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf.Plo@am__quote@
-Index: binutils-2.26/bfd/elf-sol2.c
+Index: binutils.git/bfd/elf-sol2.c
 ===================================================================
 --- /dev/null
-+++ binutils-2.26/bfd/elf-sol2.c
++++ binutils.git/bfd/elf-sol2.c
 @@ -0,0 +1,66 @@
 +/* Solaris support for ELF
 +   Copyright 2012 Free Software Foundation, Inc.
@@ -201,10 +183,10 @@ Index: binutils-2.26/bfd/elf-sol2.c
 +
 +  return _bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec);
 +}
-Index: binutils-2.26/bfd/elf-sol2.h
+Index: binutils.git/bfd/elf-sol2.h
 ===================================================================
 --- /dev/null
-+++ binutils-2.26/bfd/elf-sol2.h
++++ binutils.git/bfd/elf-sol2.h
 @@ -0,0 +1,31 @@
 +/* Solaris support for ELF
 +   Copyright 2012 Free Software Foundation, Inc.
@@ -237,21 +219,21 @@ Index: binutils-2.26/bfd/elf-sol2.h
 +							   asection *,
 +							   bfd *,
 +							   asection *);
-Index: binutils-2.26/bfd/elf32-i386.c
+Index: binutils.git/bfd/elf32-i386.c
 ===================================================================
---- binutils-2.26.orig/bfd/elf32-i386.c
-+++ binutils-2.26/bfd/elf32-i386.c
-@@ -24,6 +24,7 @@
- #include "libbfd.h"
- #include "elf-bfd.h"
+--- binutils.git.orig/bfd/elf32-i386.c
++++ binutils.git/bfd/elf32-i386.c
+@@ -20,6 +20,7 @@
+ 
+ #include "elfxx-x86.h"
  #include "elf-nacl.h"
 +#include "elf-sol2.h"
  #include "elf-vxworks.h"
- #include "bfd_stdint.h"
- #include "objalloc.h"
-@@ -5871,7 +5872,14 @@ elf_i386_fbsd_post_process_headers (bfd
- #undef elf_backend_want_plt_sym
- #define elf_backend_want_plt_sym	1
+ #include "dwarf2.h"
+ #include "opcode/i386.h"
+@@ -4779,7 +4780,14 @@ elf32_i386_nacl_elf_object_p (bfd *abfd)
+ #undef	elf_backend_final_write_processing
+ #define elf_backend_final_write_processing	nacl_final_write_processing
  
 +#undef elf_backend_section_processing
 +#define elf_backend_section_processing _bfd_solaris_section_processing
@@ -262,23 +244,23 @@ Index: binutils-2.26/bfd/elf32-i386.c
 +#undef elf_backend_section_processing
 +#undef bfd_elf32_bfd_copy_private_section_data
  
- /* Intel MCU support.  */
- 
-Index: binutils-2.26/bfd/elf64-x86-64.c
+ /* Restore defaults.  */
+ #undef	elf_backend_object_p
+Index: binutils.git/bfd/elf64-x86-64.c
 ===================================================================
---- binutils-2.26.orig/bfd/elf64-x86-64.c
-+++ binutils-2.26/bfd/elf64-x86-64.c
-@@ -25,6 +25,7 @@
- #include "libbfd.h"
- #include "elf-bfd.h"
+--- binutils.git.orig/bfd/elf64-x86-64.c
++++ binutils.git/bfd/elf64-x86-64.c
+@@ -21,6 +21,7 @@
+ 
+ #include "elfxx-x86.h"
  #include "elf-nacl.h"
 +#include "elf-sol2.h"
- #include "bfd_stdint.h"
- #include "objalloc.h"
- #include "hashtab.h"
-@@ -6468,8 +6469,17 @@ static const struct bfd_elf_special_sect
- #undef elf_backend_want_plt_sym
- #define elf_backend_want_plt_sym	    1
+ #include "dwarf2.h"
+ #include "libiberty.h"
+ 
+@@ -5265,8 +5266,17 @@ elf64_x86_64_copy_solaris_special_sectio
+ #undef  elf_backend_copy_special_section_fields
+ #define elf_backend_copy_special_section_fields elf64_x86_64_copy_solaris_special_section_fields
  
 +#undef elf_backend_section_processing
 +#define elf_backend_section_processing _bfd_solaris_section_processing
@@ -294,21 +276,21 @@ Index: binutils-2.26/bfd/elf64-x86-64.c
  /* Native Client support.  */
  
  static bfd_boolean
-Index: binutils-2.26/include/elf/ChangeLog.pr14493
+Index: binutils.git/include/elf/ChangeLog.pr14493
 ===================================================================
 --- /dev/null
-+++ binutils-2.26/include/elf/ChangeLog.pr14493
++++ binutils.git/include/elf/ChangeLog.pr14493
 @@ -0,0 +1,5 @@
 +2012-08-24  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	PR binutils/14493
 +	* common.h (SHT_SUNW_symsort): New.
 +	(SHT_SUNW_LDYNSYM): Likewise.
-Index: binutils-2.26/include/elf/common.h
+Index: binutils.git/include/elf/common.h
 ===================================================================
---- binutils-2.26.orig/include/elf/common.h
-+++ binutils-2.26/include/elf/common.h
-@@ -496,6 +496,10 @@
+--- binutils.git.orig/include/elf/common.h
++++ binutils.git/include/elf/common.h
+@@ -531,6 +531,10 @@
  /* #define SHT_HIUSER	0x8FFFFFFF    *//* Application-specific semantics */
  #define SHT_HIUSER	0xFFFFFFFF	/* New value, defined in Oct 4, 1999 Draft */
  
@@ -319,96 +301,59 @@ Index: binutils-2.26/include/elf/common.h
  /* Values for section header, sh_flags field.  */
  
  #define SHF_WRITE	(1 << 0)	/* Writable data during execution */
-Index: binutils-2.26/bfd/configure.ac
+Index: binutils.git/bfd/configure.ac
 ===================================================================
---- binutils-2.26.orig/bfd/configure.ac
-+++ binutils-2.26/bfd/configure.ac
-@@ -784,11 +784,11 @@ do
-     i386_coff_go32_vec)		 tb="$tb coff-go32.lo $coff" ;;
-     i386_coff_go32stubbed_vec)	 tb="$tb coff-stgo32.lo $coff" ;;
-     i386_coff_lynx_vec)		 tb="$tb cf-i386lynx.lo lynx-core.lo $coff" ;;
--    i386_elf32_vec)		 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
--    i386_elf32_fbsd_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
--    i386_elf32_nacl_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
--    i386_elf32_sol2_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
--    i386_elf32_vxworks_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-+    i386_elf32_vec)		 tb="$tb elf32-i386.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-+    i386_elf32_fbsd_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-+    i386_elf32_nacl_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-+    i386_elf32_sol2_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-+    i386_elf32_vxworks_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-     i386_mach_o_vec)		 tb="$tb mach-o-i386.lo" ;;
-     i386_msdos_vec)		 tb="$tb i386msdos.lo" ;;
-     i386_nlm32_vec)		 tb="$tb nlm32-i386.lo nlm32.lo nlm.lo" ;;
-@@ -811,10 +811,10 @@ do
-     ieee_vec)			 tb="$tb ieee.lo" ;;
+--- binutils.git.orig/bfd/configure.ac
++++ binutils.git/bfd/configure.ac
+@@ -409,7 +409,7 @@ coff="cofflink.lo $coffgen"
+ ecoff="ecofflink.lo $coffgen"
+ xcoff="xcofflink.lo $coffgen"
+ 
+-elfxx_x86="elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo"
++elfxx_x86="elfxx-x86.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo"
+ for vec in $selvecs
+ do
+     target_size=32
+@@ -512,10 +512,10 @@ do
+     ia64_pei_vec)		 tb="$tb pei-ia64.lo pepigen.lo $coff"; target_size=64 ;;
      ip2k_elf32_vec)		 tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
      iq2000_elf32_vec)		 tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
--    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
--    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
--    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
--    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+-    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+-    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+-    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+-    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
++    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
++    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
++    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
++    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
      lm32_elf32_vec)		 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
      lm32_elf32_fdpic_vec)	 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
      m32c_elf32_vec)		 tb="$tb elf32-m32c.lo elf32.lo $elf" ;;
-@@ -1011,13 +1011,13 @@ do
-     w65_coff_vec)		 tb="$tb coff-w65.lo reloc16.lo $coffgen" ;;
-     we32k_coff_vec)		 tb="$tb coff-we32k.lo $coffgen" ;;
-     x86_64_coff_vec)		 tb="$tb coff-x86_64.lo $coff"; target_size=64 ;;
--    x86_64_elf32_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
--    x86_64_elf32_nacl_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
--    x86_64_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
--    x86_64_elf64_cloudabi_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
--    x86_64_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
--    x86_64_elf64_nacl_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
--    x86_64_elf64_sol2_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    x86_64_elf32_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
-+    x86_64_elf32_nacl_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
-+    x86_64_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    x86_64_elf64_cloudabi_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    x86_64_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    x86_64_elf64_nacl_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    x86_64_elf64_sol2_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-     x86_64_mach_o_vec)		 tb="$tb mach-o-x86-64.lo" ;;
-     x86_64_pe_vec)		 tb="$tb pe-x86_64.lo pex64igen.lo $coff"; target_size=64 ;;
-     x86_64_pe_be_vec)		 tb="$tb pe-x86_64.lo pex64igen.lo $coff"; target_size=64 ;;
-Index: binutils-2.26/bfd/configure
+Index: binutils.git/bfd/configure
 ===================================================================
---- binutils-2.26.orig/bfd/configure
-+++ binutils-2.26/bfd/configure
-@@ -15338,11 +15338,11 @@ do
-     i386_coff_go32_vec)		 tb="$tb coff-go32.lo $coff" ;;
-     i386_coff_go32stubbed_vec)	 tb="$tb coff-stgo32.lo $coff" ;;
-     i386_coff_lynx_vec)		 tb="$tb cf-i386lynx.lo lynx-core.lo $coff" ;;
--    i386_elf32_vec)		 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
--    i386_elf32_fbsd_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
--    i386_elf32_nacl_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
--    i386_elf32_sol2_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
--    i386_elf32_vxworks_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-+    i386_elf32_vec)		 tb="$tb elf32-i386.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-+    i386_elf32_fbsd_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-+    i386_elf32_nacl_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-+    i386_elf32_sol2_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-+    i386_elf32_vxworks_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-     i386_mach_o_vec)		 tb="$tb mach-o-i386.lo" ;;
-     i386_msdos_vec)		 tb="$tb i386msdos.lo" ;;
-     i386_nlm32_vec)		 tb="$tb nlm32-i386.lo nlm32.lo nlm.lo" ;;
-@@ -15365,10 +15365,10 @@ do
-     ieee_vec)			 tb="$tb ieee.lo" ;;
+--- binutils.git.orig/bfd/configure
++++ binutils.git/bfd/configure
+@@ -14673,7 +14673,7 @@ coff="cofflink.lo $coffgen"
+ ecoff="ecofflink.lo $coffgen"
+ xcoff="xcofflink.lo $coffgen"
+ 
+-elfxx_x86="elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo"
++elfxx_x86="elfxx-x86.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf-vxworks.lo"
+ for vec in $selvecs
+ do
+     target_size=32
+@@ -14776,10 +14776,10 @@ do
+     ia64_pei_vec)		 tb="$tb pei-ia64.lo pepigen.lo $coff"; target_size=64 ;;
      ip2k_elf32_vec)		 tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
      iq2000_elf32_vec)		 tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
--    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
--    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
--    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
--    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-+    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+-    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+-    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+-    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+-    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
++    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
++    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
++    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
++    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-sol2.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
      lm32_elf32_vec)		 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
      lm32_elf32_fdpic_vec)	 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
      m32c_elf32_vec)		 tb="$tb elf32-m32c.lo elf32.lo $elf" ;;