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>

10 files changed, 46 insertions, 54 deletions

diff --git a/packages/binutils/2.35.1/0000-sh-conf.patch b/packages/binutils/2.35.1/0000-sh-conf.patch
index 06693efc..b7e07d9d 100644
--- a/packages/binutils/2.35.1/0000-sh-conf.patch
+++ b/packages/binutils/2.35.1/0000-sh-conf.patch
@@ -12,7 +12,7 @@ inept targets than that one, really. Go look, I promise).
 
 --- a/configure
 +++ b/configure
-@@ -3937,7 +3937,7 @@ case "${target}" in
+@@ -3937,7 +3937,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
-@@ -1178,7 +1178,7 @@ case "${target}" in
+@@ -1178,7 +1178,7 @@
    nvptx*-*-*)
      noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
      ;;
diff --git a/packages/binutils/2.35.1/0001-ld_makefile_patch.patch b/packages/binutils/2.35.1/0001-ld_makefile_patch.patch
index 0eb94962..5a64fb9c 100644
--- a/packages/binutils/2.35.1/0001-ld_makefile_patch.patch
+++ b/packages/binutils/2.35.1/0001-ld_makefile_patch.patch
@@ -5,7 +5,7 @@
 
 --- a/ld/Makefile.am
 +++ b/ld/Makefile.am
-@@ -50,7 +50,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
+@@ -50,7 +50,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
-@@ -555,7 +555,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
+@@ -555,7 +555,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.35.1/0002-check_ldrunpath_length.patch b/packages/binutils/2.35.1/0002-check_ldrunpath_length.patch
index 0edd2fe3..407b48cd 100644
--- a/packages/binutils/2.35.1/0002-check_ldrunpath_length.patch
+++ b/packages/binutils/2.35.1/0002-check_ldrunpath_length.patch
@@ -4,7 +4,7 @@
 
 --- a/ld/ldelf.c
 +++ b/ld/ldelf.c
-@@ -1247,6 +1247,8 @@ ldelf_after_open (int use_libpath, int n
+@@ -1247,6 +1247,8 @@
  		  && command_line.rpath == NULL)
  		{
  		  path = (const char *) getenv ("LD_RUN_PATH");
@@ -13,7 +13,7 @@
  		  if (path
  		      && ldelf_search_needed (path, &n, force,
  					      is_linux, elfsize))
-@@ -1605,6 +1607,8 @@ ldelf_before_allocation (char *audit, ch
+@@ -1605,6 +1607,8 @@
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/packages/binutils/2.35.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.35.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
index c712df5d..99dee969 100644
--- a/packages/binutils/2.35.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ b/packages/binutils/2.35.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.35.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.35.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
index 02efa21c..fd6b203e 100644
--- a/packages/binutils/2.35.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
+++ b/packages/binutils/2.35.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch
@@ -9,7 +9,7 @@
 
 --- a/binutils/configure
 +++ b/binutils/configure
-@@ -12570,6 +12570,7 @@ fi
+@@ -12570,6 +12570,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.
-@@ -12733,6 +12734,8 @@ esac
+@@ -12733,6 +12734,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
-@@ -95,7 +95,10 @@ if test -z "$host" ; then
+@@ -95,7 +95,10 @@
  fi
  
  AC_PROG_YACC
@@ -41,7 +41,7 @@
  ZW_GNU_GETTEXT_SISTER_DIR
 --- a/gas/configure
 +++ b/gas/configure
-@@ -13519,6 +13519,7 @@ fi
+@@ -13519,6 +13519,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.
-@@ -13682,6 +13683,8 @@ esac
+@@ -13682,6 +13683,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
-@@ -924,7 +924,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,	"${tar
+@@ -924,7 +924,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
-@@ -16584,6 +16584,7 @@ fi
+@@ -16584,6 +16584,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.
-@@ -16747,6 +16748,8 @@ esac
+@@ -16747,6 +16748,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
-@@ -258,7 +258,10 @@ AM_PO_SUBDIRS
+@@ -258,7 +258,10 @@
  AC_EXEEXT
  
  AC_PROG_YACC
diff --git a/packages/binutils/2.35.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.35.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
index 631d0135..6f2d1e1c 100644
--- a/packages/binutils/2.35.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ b/packages/binutils/2.35.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
-@@ -3696,6 +3696,28 @@ u16_mbtouc (wchar_t * puc, const unsigne
+@@ -3696,6 +3696,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.35.1/0007-sysroot.patch b/packages/binutils/2.35.1/0007-sysroot.patch
index c98f1476..0140fe8c 100644
--- a/packages/binutils/2.35.1/0007-sysroot.patch
+++ b/packages/binutils/2.35.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
-@@ -340,18 +340,25 @@ ldfile_open_file_search (const char *arc
+@@ -340,18 +340,25 @@
       directory first.  */
    if (!entry->flags.maybe_archive)
      {
diff --git a/packages/binutils/2.35.1/0008-poison-system-directories.patch b/packages/binutils/2.35.1/0008-poison-system-directories.patch
index d836f8af..970a7a1c 100644
--- a/packages/binutils/2.35.1/0008-poison-system-directories.patch
+++ b/packages/binutils/2.35.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
-@@ -826,6 +826,7 @@ with_lib_path
+@@ -826,6 +826,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
-@@ -1493,6 +1494,8 @@ Optional Features:
+@@ -1493,6 +1494,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)
-@@ -15814,7 +15817,18 @@ else
+@@ -15814,7 +15817,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
-@@ -161,6 +161,14 @@ typedef struct
+@@ -161,6 +161,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
-@@ -2655,6 +2655,18 @@ string identifying the original linked f
+@@ -2655,6 +2655,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
-@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *nam
+@@ -117,6 +117,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
-@@ -155,6 +155,8 @@ enum option_values
+@@ -155,6 +155,8 @@
    OPTION_NON_CONTIGUOUS_REGIONS,
    OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS,
    OPTION_DEPENDENCY_FILE,
@@ -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
-@@ -321,6 +321,8 @@ main (int argc, char **argv)
+@@ -321,6 +321,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
-@@ -572,6 +572,14 @@ static const struct ld_option ld_options
+@@ -572,6 +572,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)
-@@ -584,6 +592,7 @@ parse_args (unsigned argc, char **argv)
+@@ -584,6 +592,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;
-@@ -1591,6 +1600,14 @@ parse_args (unsigned argc, char **argv)
+@@ -1591,6 +1600,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),
-@@ -1681,6 +1698,10 @@ parse_args (unsigned argc, char **argv)
+@@ -1681,6 +1698,10 @@
        command_line.soname = NULL;
      }
  
diff --git a/packages/binutils/2.35.1/0009-Import-patch-from-mainline-to-fix-decoding-DWARF-inf.patch b/packages/binutils/2.35.1/0009-Import-patch-from-mainline-to-fix-decoding-DWARF-inf.patch
index b6b44965..674347f3 100644
--- a/packages/binutils/2.35.1/0009-Import-patch-from-mainline-to-fix-decoding-DWARF-inf.patch
+++ b/packages/binutils/2.35.1/0009-Import-patch-from-mainline-to-fix-decoding-DWARF-inf.patch
@@ -8,11 +8,13 @@ Subject: [PATCH] Import patch from mainline to fix decoding DWARF information
 	* dwarf2.c (scan_unit_for_symbols): Add member entries to the
 	variable table.
 ---
-diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
-index b8f0008a10d..977bf43a6a1 100644
+---
+ bfd/dwarf2.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
 --- a/bfd/dwarf2.c
 +++ b/bfd/dwarf2.c
-@@ -3404,7 +3404,8 @@ scan_unit_for_symbols (struct comp_unit *unit)
+@@ -3404,7 +3404,8 @@
        else
  	{
  	  func = NULL;
@@ -22,7 +24,7 @@ index b8f0008a10d..977bf43a6a1 100644
  	    {
  	      size_t amt = sizeof (struct varinfo);
  	      var = (struct varinfo *) bfd_zalloc (abfd, amt);
-@@ -3516,7 +3517,7 @@ scan_unit_for_symbols (struct comp_unit *unit)
+@@ -3516,7 +3517,7 @@
  		      spec_var = lookup_var_by_offset (attr.u.val,
  						       unit->variable_table);
  		      if (spec_var == NULL)
@@ -31,6 +33,3 @@ index b8f0008a10d..977bf43a6a1 100644
  			  _bfd_error_handler (_("DWARF error: could not find "
  						"variable specification "
  						"at offset %lx"),
--- 
-2.25.4
-
diff --git a/packages/binutils/2.35.1/0010-arm-Fix-the-wrong-error-message-string-for-mve-vldr-.patch b/packages/binutils/2.35.1/0010-arm-Fix-the-wrong-error-message-string-for-mve-vldr-.patch
index 9ea369ac..72763578 100644
--- a/packages/binutils/2.35.1/0010-arm-Fix-the-wrong-error-message-string-for-mve-vldr-.patch
+++ b/packages/binutils/2.35.1/0010-arm-Fix-the-wrong-error-message-string-for-mve-vldr-.patch
@@ -36,11 +36,16 @@ gas/ChangeLog:
 	* testsuite/gas/arm/mve-vldr-vstr-bad.l: Likewise.
 	* testsuite/gas/arm/mve-vldr-vstr-bad.s: Likewise.
 ---
-diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
-index a9aaffa3bdd..64475d66729 100644
+---
+ gas/config/tc-arm.c                       |   10 
+ gas/testsuite/gas/arm/mve-vldr-vstr-bad.d |    5 
+ gas/testsuite/gas/arm/mve-vldr-vstr-bad.l |  811 ++++++++++++++++++++++++++++++
+ gas/testsuite/gas/arm/mve-vldr-vstr-bad.s |   30 +
+ 4 files changed, 855 insertions(+), 1 deletion(-)
+
 --- a/gas/config/tc-arm.c
 +++ b/gas/config/tc-arm.c
-@@ -5936,7 +5936,15 @@ parse_address_main (char **str, int i, int group_relocations,
+@@ -5936,7 +5936,15 @@
  
    if (skip_past_char (&p, '[') == FAIL)
      {
@@ -57,9 +62,6 @@ index a9aaffa3bdd..64475d66729 100644
  	{
  	  /* Bare address - translate to PC-relative offset.  */
  	  inst.relocs[0].pc_rel = 1;
-diff --git a/gas/testsuite/gas/arm/mve-vldr-vstr-bad.d b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.d
-new file mode 100644
-index 00000000000..8989688f0f3
 --- /dev/null
 +++ b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.d
 @@ -0,0 +1,5 @@
@@ -68,9 +70,6 @@ index 00000000000..8989688f0f3
 +#error_output: mve-vldr-vstr-bad.l
 +
 +.*: +file format .*arm.*
-diff --git a/gas/testsuite/gas/arm/mve-vldr-vstr-bad.l b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.l
-new file mode 100644
-index 00000000000..2df3a37ac02
 --- /dev/null
 +++ b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.l
 @@ -0,0 +1,811 @@
@@ -885,9 +884,6 @@ index 00000000000..2df3a37ac02
 +[^:]*:30: Error: syntax error -- `vldrw.s32 q7,r14'
 +[^:]*:30: Error: syntax error -- `vldrw.u32 q7,r14'
 +[^:]*:30: Error: syntax error -- `vstrw.32 q7,r14'
-diff --git a/gas/testsuite/gas/arm/mve-vldr-vstr-bad.s b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.s
-new file mode 100644
-index 00000000000..c72c1296d2f
 --- /dev/null
 +++ b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.s
 @@ -0,0 +1,30 @@
@@ -921,6 +917,3 @@ index 00000000000..c72c1296d2f
 +vstrw.32 \op2, \op3
 +.endr
 +.endr
--- 
-2.25.4
-