Run all patches through renumbering and update

Signed-off-by: Alexey Neyman <stilor@att.net>

9 files changed, 87 insertions, 89 deletions

diff --git a/packages/binutils/2.29.1/120-sh-conf.patch b/packages/binutils/2.29.1/0000-sh-conf.patch
index 65fbcb0f..fd814d2e 100644
--- a/packages/binutils/2.29.1/120-sh-conf.patch
+++ b/packages/binutils/2.29.1/0000-sh-conf.patch
@@ -5,11 +5,14 @@ fix that up too.. now we're able to actually build a real toolchain for
 sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
 inept targets than that one, really. Go look, I promise).
 
-diff --git a/configure b/configure
-index 87677bc..2d916f1 100755
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/configure
 +++ b/configure
-@@ -3812,7 +3812,7 @@ case "${target}" in
+@@ -3844,7 +3844,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
@@ -18,11 +21,9 @@ index 87677bc..2d916f1 100755
      case "${target}" in
        sh*-*-elf)
           ;;
-diff --git a/configure.ac b/configure.ac
-index 8fe0eca..b10a99f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1140,7 +1140,7 @@ case "${target}" in
+@@ -1178,7 +1178,7 @@
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
diff --git a/packages/binutils/2.29.1/300-001_ld_makefile_patch.patch b/packages/binutils/2.29.1/0001-001_ld_makefile_patch.patch
index 2a1320cb..46236530 100644
--- a/packages/binutils/2.29.1/300-001_ld_makefile_patch.patch
+++ b/packages/binutils/2.29.1/0001-001_ld_makefile_patch.patch
@@ -1,8 +1,11 @@
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 9575f1f..84df0bf 100644
+---
+ ld/Makefile.am |    2 +-
+ ld/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/ld/Makefile.am
 +++ b/ld/Makefile.am
-@@ -54,7 +54,7 @@ endif
+@@ -57,7 +57,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.
@@ -11,11 +14,9 @@ index 9575f1f..84df0bf 100644
  
  EMUL = @EMUL@
  EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 9f56ca1..272860f 100644
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
-@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+@@ -446,7 +446,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.
diff --git a/packages/binutils/2.29.1/300-012_check_ldrunpath_length.patch b/packages/binutils/2.29.1/0002-012_check_ldrunpath_length.patch
index c1d5a978..9bdc4135 100644
--- a/packages/binutils/2.29.1/300-012_check_ldrunpath_length.patch
+++ b/packages/binutils/2.29.1/0002-012_check_ldrunpath_length.patch
@@ -1,8 +1,10 @@
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 137446f..bb8391a 100644
+---
+ ld/emultempl/elf32.em |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- a/ld/emultempl/elf32.em
 +++ b/ld/emultempl/elf32.em
-@@ -1195,6 +1195,8 @@ fragment <<EOF
+@@ -1463,6 +1463,8 @@
  	      && command_line.rpath == NULL)
  	    {
  	      path = (const char *) getenv ("LD_RUN_PATH");
@@ -11,7 +13,7 @@ index 137446f..bb8391a 100644
  	      if (path
  		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
  		break;
-@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+@@ -1740,6 +1742,8 @@
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/packages/binutils/2.29.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.29.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
index 2956385a..99dee969 100644
--- a/packages/binutils/2.29.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ b/packages/binutils/2.29.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
@@ -1,5 +1,9 @@
---- binutils-2.27/gold/gold-threads.cc.orig	2016-12-26 16:44:23.691075600 +1100
-+++ binutils-2.27/gold/gold-threads.cc	2016-12-26 16:46:21.071855200 +1100
+---
+ gold/gold-threads.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
 @@ -101,7 +101,7 @@
    int err = pthread_mutexattr_init(&attr);
    if (err != 0)
diff --git a/packages/binutils/2.29.1/330-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.29.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
index 4eaa7002..cb7af68f 100644
--- a/packages/binutils/2.29.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
+++ b/packages/binutils/2.29.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
@@ -1,8 +1,15 @@
-diff --git a/binutils/configure b/binutils/configure
-index 6e1f21e..78bf4ae 100755
+---
+ binutils/configure    |    3 +++
+ binutils/configure.ac |    3 +++
+ gas/configure         |    3 +++
+ gas/configure.ac      |    3 +++
+ ld/configure          |    3 +++
+ ld/configure.ac       |    3 +++
+ 6 files changed, 18 insertions(+)
+
 --- a/binutils/configure
 +++ b/binutils/configure
-@@ -12106,6 +12106,7 @@
+@@ -12150,6 +12150,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -10,7 +17,7 @@ index 6e1f21e..78bf4ae 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12267,6 +12268,8 @@
+@@ -12311,6 +12312,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -19,8 +26,6 @@ index 6e1f21e..78bf4ae 100755
  
  ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
  # If we haven't got the data from the intl directory,
-diff --git a/binutils/configure.ac b/binutils/configure.ac
-index defe781..8fd236a 100644
 --- a/binutils/configure.ac
 +++ b/binutils/configure.ac
 @@ -87,7 +87,10 @@
@@ -34,11 +39,9 @@ index defe781..8fd236a 100644
  
  ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
  ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/gas/configure b/gas/configure
-index f959e95..9bb4043 100755
 --- a/gas/configure
 +++ b/gas/configure
-@@ -12819,6 +12819,7 @@ fi
+@@ -13002,6 +13002,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -46,7 +49,7 @@ index f959e95..9bb4043 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12980,6 +12981,8 @@ esac
+@@ -13163,6 +13164,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -55,11 +58,9 @@ index f959e95..9bb4043 100755
  
  ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN sv"
  # If we haven't got the data from the intl directory,
-diff --git a/gas/configure.ac b/gas/configure.ac
-index 07f825d..c552b7e 100644
 --- a/gas/configure.ac
 +++ b/gas/configure.ac
-@@ -734,7 +734,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,	"${target_vendor}", [Target vendor.])
+@@ -794,7 +794,10 @@
  AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
  
  AC_PROG_YACC
@@ -70,11 +71,9 @@ index 07f825d..c552b7e 100644
  
  ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN sv"
  ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/ld/configure b/ld/configure
-index a446283..1a6bf81 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -16087,6 +16087,7 @@ fi
+@@ -16191,6 +16191,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -82,7 +81,7 @@ index a446283..1a6bf81 100755
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -16248,6 +16249,8 @@ esac
+@@ -16352,6 +16353,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -91,11 +90,9 @@ index a446283..1a6bf81 100755
  
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..45eec53 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -186,7 +186,10 @@ AM_PO_SUBDIRS
+@@ -208,7 +208,10 @@
  AC_EXEEXT
  
  AC_PROG_YACC
diff --git a/packages/binutils/2.29.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.29.1/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch
index e4f235b1..fbc40418 100644
--- a/packages/binutils/2.29.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
+++ b/packages/binutils/2.29.1/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch
@@ -1,5 +1,7 @@
-diff --git a/gold/binary.cc b/gold/binary.cc
-index 52df81a..03a8f20 100644
+---
+ gold/binary.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/gold/binary.cc
 +++ b/gold/binary.cc
 @@ -23,7 +23,7 @@
diff --git a/packages/binutils/2.29.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.29.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
index 6168b31e..f4dc91ac 100644
--- a/packages/binutils/2.29.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ b/packages/binutils/2.29.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
@@ -9,15 +9,13 @@ Subject: [PATCH] Fix darwin build
 
 Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
 ---
- binutils-2.25/bfd/peXXigen.c       | 22 ++++++++++++++++++++++
- binutils-2.25/gold/gold-threads.cc | 15 ++++++++++++---
+ bfd/peXXigen.c       |   22 ++++++++++++++++++++++
+ gold/gold-threads.cc |   15 ++++++++++++---
  2 files changed, 34 insertions(+), 3 deletions(-)
 
-diff --git binutils-2.25.orig/bfd/peXXigen.c binutils-2.25/bfd/peXXigen.c
-index 13e39e4..7a98306 100644
---- binutils-2.25.orig/bfd/peXXigen.c
-+++ binutils-2.25/bfd/peXXigen.c
-@@ -3522,6 +3522,28 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n)
+--- a/bfd/peXXigen.c
++++ b/bfd/peXXigen.c
+@@ -3609,6 +3609,28 @@
  }
  #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
  
@@ -46,11 +44,9 @@ index 13e39e4..7a98306 100644
  /* Perform a comparison of two entries.  */
  static signed int
  rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
-diff --git binutils-2.25.orig/gold/gold-threads.cc binutils-2.25/gold/gold-threads.cc
-index ff5a8ac..45140e0 100644
---- binutils-2.25.orig/gold/gold-threads.cc
-+++ binutils-2.25/gold/gold-threads.cc
-@@ -284,9 +284,18 @@ Condvar::~Condvar()
+--- a/gold/gold-threads.cc
++++ b/gold/gold-threads.cc
+@@ -284,9 +284,18 @@
  class Once_initialize
  {
   public:
@@ -72,6 +68,3 @@ index ff5a8ac..45140e0 100644
  
    // Return a pointer to the pthread_once_t variable.
    pthread_once_t*
--- 
-2.1.3
-
diff --git a/packages/binutils/2.29.1/500-sysroot.patch b/packages/binutils/2.29.1/0007-sysroot.patch
index 4cb9bc79..ba7940a4 100644
--- a/packages/binutils/2.29.1/500-sysroot.patch
+++ b/packages/binutils/2.29.1/0007-sysroot.patch
@@ -5,9 +5,13 @@ Always try to prepend the sysroot prefix to absolute filenames first.
 http://bugs.gentoo.org/275666
 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
+---
+ ld/ldfile.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -336,18 +336,25 @@
+@@ -338,18 +338,25 @@
       directory first.  */
    if (!entry->flags.maybe_archive)
      {
diff --git a/packages/binutils/2.29.1/600-poison-system-directories.patch b/packages/binutils/2.29.1/0008-poison-system-directories.patch
index a0a4a30d..242b8ba2 100644
--- a/packages/binutils/2.29.1/600-poison-system-directories.patch
+++ b/packages/binutils/2.29.1/0008-poison-system-directories.patch
@@ -59,11 +59,21 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
 
-diff --git a/ld/config.in b/ld/config.in
-index 276fb77..35c58eb 100644
+---
+ ld/config.in    |    3 +++
+ ld/configure    |   14 ++++++++++++++
+ ld/configure.ac |   10 ++++++++++
+ ld/ld.h         |    8 ++++++++
+ ld/ld.texinfo   |   12 ++++++++++++
+ ld/ldfile.c     |   17 +++++++++++++++++
+ ld/ldlex.h      |    2 ++
+ ld/ldmain.c     |    2 ++
+ ld/lexsup.c     |   21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
 --- a/ld/config.in
 +++ b/ld/config.in
-@@ -17,6 +17,9 @@
+@@ -21,6 +21,9 @@
     language is requested. */
  #undef ENABLE_NLS
  
@@ -73,11 +83,9 @@ index 276fb77..35c58eb 100644
  /* Additional extension a shared object might have. */
  #undef EXTRA_SHLIB_EXTENSION
  
-diff --git a/ld/configure b/ld/configure
-index a446283..d1f9504 100755
 --- a/ld/configure
 +++ b/ld/configure
-@@ -788,6 +788,7 @@ with_lib_path
+@@ -785,6 +785,7 @@
  enable_targets
  enable_64_bit_bfd
  with_sysroot
@@ -85,7 +93,7 @@ index a446283..d1f9504 100755
  enable_gold
  enable_got
  enable_compressed_debug_sections
-@@ -1445,6 +1446,8 @@ Optional Features:
+@@ -1443,6 +1444,8 @@
    --disable-largefile     omit support for large files
    --enable-targets        alternative target configurations
    --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
@@ -94,7 +102,7 @@ index a446283..d1f9504 100755
    --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
    --enable-got=<type>     GOT handling scheme (target, single, negative,
                            multigot)
-@@ -15498,7 +15501,18 @@ else
+@@ -15497,7 +15500,18 @@
  fi
  
  
@@ -113,11 +121,9 @@ index a446283..d1f9504 100755
  
  # Check whether --enable-got was given.
  if test "${enable_got+set}" = set; then :
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..2cd8443 100644
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+@@ -95,6 +95,16 @@
  AC_SUBST(TARGET_SYSTEM_ROOT)
  AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
  
@@ -134,11 +140,9 @@ index 188172d..2cd8443 100644
  dnl Use --enable-gold to decide if this linker should be the default.
  dnl "install_as_default" is set to false if gold is the default linker.
  dnl "installed_linker" is the installed BFD linker name.
-diff --git a/ld/ld.h b/ld/ld.h
-index d84ec4e..3476b26 100644
 --- a/ld/ld.h
 +++ b/ld/ld.h
-@@ -169,6 +169,14 @@ typedef struct {
+@@ -172,6 +172,14 @@
    /* If set, display the target memory usage (per memory region).  */
    bfd_boolean print_memory_usage;
  
@@ -153,11 +157,9 @@ index d84ec4e..3476b26 100644
    /* Should we force section groups to be resolved?  Controlled with
       --force-group-allocation on the command line or FORCE_GROUP_ALLOCATION
       in the linker script.  */
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index 1dd7492..fb1438e 100644
 --- a/ld/ld.texinfo
 +++ b/ld/ld.texinfo
-@@ -2357,6 +2357,18 @@ string identifying the original linked file does not change.
+@@ -2480,6 +2480,18 @@
  
  Passing @code{none} for @var{style} disables the setting from any
  @code{--build-id} options earlier on the command line.
@@ -176,12 +178,10 @@ index 1dd7492..fb1438e 100644
  @end table
  
  @c man end
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 96f9ecc..af231c0 100644
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
-     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
+@@ -116,6 +116,23 @@
+     new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
    else
      new_dirs->name = xstrdup (name);
 +
@@ -204,11 +204,9 @@ index 96f9ecc..af231c0 100644
  }
  
  /* Try to open a BFD for a lang_input_statement.  */
-diff --git a/ld/ldlex.h b/ld/ldlex.h
-index 6f11e7b..0ca3110 100644
 --- a/ld/ldlex.h
 +++ b/ld/ldlex.h
-@@ -144,6 +144,8 @@ enum option_values
+@@ -147,6 +147,8 @@
    OPTION_REQUIRE_DEFINED_SYMBOL,
    OPTION_ORPHAN_HANDLING,
    OPTION_FORCE_GROUP_ALLOCATION,
@@ -217,11 +215,9 @@ index 6f11e7b..0ca3110 100644
  };
  
  /* The initial parser states.  */
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index bb0b9cc..a23c56c 100644
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
-@@ -257,6 +257,8 @@ main (int argc, char **argv)
+@@ -270,6 +270,8 @@
    command_line.warn_mismatch = TRUE;
    command_line.warn_search_mismatch = TRUE;
    command_line.check_section_addresses = -1;
@@ -230,11 +226,9 @@ index bb0b9cc..a23c56c 100644
  
    /* We initialize DEMANGLING based on the environment variable
       COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 4cad209..be7d584 100644
 --- a/ld/lexsup.c
 +++ b/ld/lexsup.c
-@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
+@@ -538,6 +538,14 @@
    { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
      '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
      TWO_DASHES },
@@ -249,7 +243,7 @@ index 4cad209..be7d584 100644
  };
  
  #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
+@@ -550,6 +558,7 @@
    int ingroup = 0;
    char *default_dirlist = NULL;
    char *shortopts;
@@ -257,7 +251,7 @@ index 4cad209..be7d584 100644
    struct option *longopts;
    struct option *really_longopts;
    int last_optind;
-@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
+@@ -1534,6 +1543,14 @@
            }
            break;
  
@@ -272,7 +266,7 @@ index 4cad209..be7d584 100644
  	case OPTION_PUSH_STATE:
  	  input_flags.pushed = xmemdup (&input_flags,
  					sizeof (input_flags),
-@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
+@@ -1577,6 +1594,10 @@
        command_line.soname = NULL;
      }