Run patches thru `manage-packages -P`

This refreshes the line numbers, removes any fuzz (which would make any
future forward ports easier) and standardizes the patch/file headers
(which makes them easier to read).

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

8 files changed, 32 insertions, 32 deletions

diff --git a/packages/binutils/2.33.1/0000-sh-conf.patch b/packages/binutils/2.33.1/0000-sh-conf.patch
index f6362898..ecd28af4 100644
--- a/packages/binutils/2.33.1/0000-sh-conf.patch
+++ b/packages/binutils/2.33.1/0000-sh-conf.patch
@@ -12,7 +12,7 @@ inept targets than that one, really. Go look, I promise).
 
 --- a/configure
 +++ b/configure
-@@ -3865,7 +3865,7 @@ case "${target}" in
+@@ -3865,7 +3865,7 @@
    nvptx*-*-*)
      noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
      ;;
@@ -23,7 +23,7 @@ inept targets than that one, really. Go look, I promise).
           ;;
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1158,7 +1158,7 @@ case "${target}" in
+@@ -1158,7 +1158,7 @@
    nvptx*-*-*)
      noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
      ;;
diff --git a/packages/binutils/2.33.1/0001-ld_makefile_patch.patch b/packages/binutils/2.33.1/0001-ld_makefile_patch.patch
index e76207e6..f73ff26d 100644
--- a/packages/binutils/2.33.1/0001-ld_makefile_patch.patch
+++ b/packages/binutils/2.33.1/0001-ld_makefile_patch.patch
@@ -5,7 +5,7 @@
 
 --- a/ld/Makefile.am
 +++ b/ld/Makefile.am
-@@ -57,7 +57,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.
@@ -16,7 +16,7 @@
  EMULATION_OFILES = @EMULATION_OFILES@
 --- a/ld/Makefile.in
 +++ b/ld/Makefile.in
-@@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
+@@ -563,7 +563,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.33.1/0002-check_ldrunpath_length.patch b/packages/binutils/2.33.1/0002-check_ldrunpath_length.patch
index 131c6bf3..95730af8 100644
--- a/packages/binutils/2.33.1/0002-check_ldrunpath_length.patch
+++ b/packages/binutils/2.33.1/0002-check_ldrunpath_length.patch
@@ -4,7 +4,7 @@
 
 --- a/ld/emultempl/elf32.em
 +++ b/ld/emultempl/elf32.em
-@@ -1470,6 +1470,8 @@ fragment <<EOF
+@@ -1470,6 +1470,8 @@
  	      && command_line.rpath == NULL)
  	    {
  	      path = (const char *) getenv ("LD_RUN_PATH");
@@ -13,7 +13,7 @@
  	      if (path
  		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
  		break;
-@@ -1745,6 +1747,8 @@ gld${EMULATION_NAME}_before_allocation (
+@@ -1745,6 +1747,8 @@
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/packages/binutils/2.33.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.33.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
index c712df5d..99dee969 100644
--- a/packages/binutils/2.33.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ b/packages/binutils/2.33.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
@@ -4,7 +4,7 @@
 
 --- a/gold/gold-threads.cc
 +++ b/gold/gold-threads.cc
-@@ -101,7 +101,7 @@ Lock_impl_threads::Lock_impl_threads()
+@@ -101,7 +101,7 @@
    int err = pthread_mutexattr_init(&attr);
    if (err != 0)
      gold_fatal(_("pthead_mutexattr_init failed: %s"), strerror(err));
diff --git a/packages/binutils/2.33.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.33.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
index 582983fd..e40f317e 100644
--- a/packages/binutils/2.33.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
+++ b/packages/binutils/2.33.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
@@ -9,7 +9,7 @@
 
 --- a/binutils/configure
 +++ b/binutils/configure
-@@ -12449,6 +12449,7 @@ fi
+@@ -12449,6 +12449,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -17,7 +17,7 @@
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12612,6 +12613,8 @@ esac
+@@ -12612,6 +12613,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -28,7 +28,7 @@
  # If we haven't got the data from the intl directory,
 --- a/binutils/configure.ac
 +++ b/binutils/configure.ac
-@@ -86,7 +86,10 @@ if test -z "$host" ; then
+@@ -86,7 +86,10 @@
  fi
  
  AC_PROG_YACC
@@ -41,7 +41,7 @@
  ZW_GNU_GETTEXT_SISTER_DIR
 --- a/gas/configure
 +++ b/gas/configure
-@@ -13469,6 +13469,7 @@ fi
+@@ -13469,6 +13469,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -49,7 +49,7 @@
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -13632,6 +13633,8 @@ esac
+@@ -13632,6 +13633,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -60,7 +60,7 @@
  # If we haven't got the data from the intl directory,
 --- a/gas/configure.ac
 +++ b/gas/configure.ac
-@@ -893,7 +893,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,	"${tar
+@@ -893,7 +893,10 @@
  AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
  
  AC_PROG_YACC
@@ -73,7 +73,7 @@
  ZW_GNU_GETTEXT_SISTER_DIR
 --- a/ld/configure
 +++ b/ld/configure
-@@ -16537,6 +16537,7 @@ fi
+@@ -16537,6 +16537,7 @@
  done
  test -n "$YACC" || YACC="yacc"
  
@@ -81,7 +81,7 @@
  for ac_prog in flex lex
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -16700,6 +16701,8 @@ esac
+@@ -16700,6 +16701,8 @@
  if test "$LEX" = :; then
    LEX=${am_missing_run}flex
  fi
@@ -92,7 +92,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -243,7 +243,10 @@ AM_PO_SUBDIRS
+@@ -243,7 +243,10 @@
  AC_EXEEXT
  
  AC_PROG_YACC
diff --git a/packages/binutils/2.33.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.33.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
index 0537aa42..2b32b9ae 100644
--- a/packages/binutils/2.33.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ b/packages/binutils/2.33.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
@@ -15,7 +15,7 @@ Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
 
 --- a/bfd/peXXigen.c
 +++ b/bfd/peXXigen.c
-@@ -3623,6 +3623,28 @@ u16_mbtouc (wchar_t * puc, const unsigne
+@@ -3623,6 +3623,28 @@
  }
  #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
  
@@ -46,7 +46,7 @@ Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
  rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
 --- a/gold/gold-threads.cc
 +++ b/gold/gold-threads.cc
-@@ -284,9 +284,18 @@ Condvar::~Condvar()
+@@ -284,9 +284,18 @@
  class Once_initialize
  {
   public:
diff --git a/packages/binutils/2.33.1/0007-sysroot.patch b/packages/binutils/2.33.1/0007-sysroot.patch
index bcf6f346..ba7940a4 100644
--- a/packages/binutils/2.33.1/0007-sysroot.patch
+++ b/packages/binutils/2.33.1/0007-sysroot.patch
@@ -11,7 +11,7 @@ http://sourceware.org/bugzilla/show_bug.cgi?id=10340
 
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -338,18 +338,25 @@ ldfile_open_file_search (const char *arc
+@@ -338,18 +338,25 @@
       directory first.  */
    if (!entry->flags.maybe_archive)
      {
diff --git a/packages/binutils/2.33.1/0008-poison-system-directories.patch b/packages/binutils/2.33.1/0008-poison-system-directories.patch
index 907036c9..461c8df1 100644
--- a/packages/binutils/2.33.1/0008-poison-system-directories.patch
+++ b/packages/binutils/2.33.1/0008-poison-system-directories.patch
@@ -85,7 +85,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
  
 --- a/ld/configure
 +++ b/ld/configure
-@@ -823,6 +823,7 @@ with_lib_path
+@@ -823,6 +823,7 @@
  enable_targets
  enable_64_bit_bfd
  with_sysroot
@@ -93,7 +93,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
  enable_gold
  enable_got
  enable_compressed_debug_sections
-@@ -1487,6 +1488,8 @@ Optional Features:
+@@ -1487,6 +1488,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)
@@ -102,7 +102,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
    --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
    --enable-got=<type>     GOT handling scheme (target, single, negative,
                            multigot)
-@@ -15804,7 +15807,18 @@ else
+@@ -15804,7 +15807,18 @@
  fi
  
  
@@ -123,7 +123,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
  if test "${enable_got+set}" = set; then :
 --- a/ld/configure.ac
 +++ b/ld/configure.ac
-@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot)
+@@ -94,6 +94,16 @@
  AC_SUBST(TARGET_SYSTEM_ROOT)
  AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
  
@@ -142,7 +142,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
  dnl "installed_linker" is the installed BFD linker name.
 --- a/ld/ld.h
 +++ b/ld/ld.h
-@@ -175,6 +175,14 @@ typedef struct
+@@ -175,6 +175,14 @@
    /* If set, display the target memory usage (per memory region).  */
    bfd_boolean print_memory_usage;
  
@@ -159,7 +159,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
       in the linker script.  */
 --- a/ld/ld.texi
 +++ b/ld/ld.texi
-@@ -2557,6 +2557,18 @@ string identifying the original linked f
+@@ -2557,6 +2557,18 @@
  
  Passing @code{none} for @var{style} disables the setting from any
  @code{--build-id} options earlier on the command line.
@@ -180,7 +180,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
  @c man end
 --- a/ld/ldfile.c
 +++ b/ld/ldfile.c
-@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam
+@@ -116,6 +116,23 @@
      new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
    else
      new_dirs->name = xstrdup (name);
@@ -206,7 +206,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
  /* Try to open a BFD for a lang_input_statement.  */
 --- a/ld/ldlex.h
 +++ b/ld/ldlex.h
-@@ -150,6 +150,8 @@ enum option_values
+@@ -150,6 +150,8 @@
    OPTION_FORCE_GROUP_ALLOCATION,
    OPTION_PRINT_MAP_DISCARDED,
    OPTION_NO_PRINT_MAP_DISCARDED,
@@ -217,7 +217,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
  /* The initial parser states.  */
 --- a/ld/ldmain.c
 +++ b/ld/ldmain.c
-@@ -270,6 +270,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;
@@ -228,7 +228,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
       COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
 --- a/ld/lexsup.c
 +++ b/ld/lexsup.c
-@@ -549,6 +549,14 @@ static const struct ld_option ld_options
+@@ -549,6 +549,14 @@
    { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED},
      '\0', NULL, N_("Do not show discarded sections in map file output"),
      TWO_DASHES },
@@ -243,7 +243,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
  };
  
  #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -561,6 +569,7 @@ parse_args (unsigned argc, char **argv)
+@@ -561,6 +569,7 @@
    int ingroup = 0;
    char *default_dirlist = NULL;
    char *shortopts;
@@ -251,7 +251,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
    struct option *longopts;
    struct option *really_longopts;
    int last_optind;
-@@ -1549,6 +1558,14 @@ parse_args (unsigned argc, char **argv)
+@@ -1549,6 +1558,14 @@
  	  }
  	  break;
  
@@ -266,7 +266,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
  	case OPTION_PUSH_STATE:
  	  input_flags.pushed = xmemdup (&input_flags,
  					sizeof (input_flags),
-@@ -1600,6 +1617,10 @@ parse_args (unsigned argc, char **argv)
+@@ -1600,6 +1617,10 @@
        command_line.soname = NULL;
      }