18 files changed, 38 insertions, 121 deletions
diff --git a/packages/binutils/2.37/0002-check_ldrunpath_length.patch b/packages/binutils/2.37/0001-check_ldrunpath_length.patch
index 13518db..13518db 100644
--- a/packages/binutils/2.37/0002-check_ldrunpath_length.patch
+++ b/packages/binutils/2.37/0001-check_ldrunpath_length.patch
diff --git a/packages/binutils/2.37/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.37/0002-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
index 99dee96..99dee96 100644
--- a/packages/binutils/2.37/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ b/packages/binutils/2.37/0002-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
diff --git a/packages/binutils/2.37/0004-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.37/0003-Dont-link-to-libfl-as-its-unnecessary.patch
index c3e525a..c3e525a 100644
--- a/packages/binutils/2.37/0004-Dont-link-to-libfl-as-its-unnecessary.patch
+++ b/packages/binutils/2.37/0003-Dont-link-to-libfl-as-its-unnecessary.patch
diff --git a/packages/binutils/2.37/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.37/0004-Darwin-gold-binary-cc-include-string-not-cstring.patch
index fbc4041..fbc4041 100644
--- a/packages/binutils/2.37/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch
+++ b/packages/binutils/2.37/0004-Darwin-gold-binary-cc-include-string-not-cstring.patch
diff --git a/packages/binutils/2.37/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.37/0005-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
index 6728c6e..6728c6e 100644
--- a/packages/binutils/2.37/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ b/packages/binutils/2.37/0005-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
diff --git a/packages/binutils/2.37/0007-sysroot.patch b/packages/binutils/2.37/0006-sysroot.patch
index 3b3c0ec..3b3c0ec 100644
--- a/packages/binutils/2.37/0007-sysroot.patch
+++ b/packages/binutils/2.37/0006-sysroot.patch
diff --git a/packages/binutils/2.37/0008-poison-system-directories.patch b/packages/binutils/2.37/0007-poison-system-directories.patch
index 0fd1adc..0fd1adc 100644
--- a/packages/binutils/2.37/0008-poison-system-directories.patch
+++ b/packages/binutils/2.37/0007-poison-system-directories.patch
diff --git a/packages/binutils/2.37/0009-arc-Fix-potential-invalid-pointer-access-when-fixing.patch b/packages/binutils/2.37/0008-arc-Fix-potential-invalid-pointer-access-when-fixing.patch
index ade3180..ade3180 100644
--- a/packages/binutils/2.37/0009-arc-Fix-potential-invalid-pointer-access-when-fixing.patch
+++ b/packages/binutils/2.37/0008-arc-Fix-potential-invalid-pointer-access-when-fixing.patch
diff --git a/packages/binutils/2.37/0010-change-uint-to-unsigned.patch b/packages/binutils/2.37/0009-change-uint-to-unsigned.patch
index d44b12e..016016e 100644
--- a/packages/binutils/2.37/0010-change-uint-to-unsigned.patch
+++ b/packages/binutils/2.37/0009-change-uint-to-unsigned.patch
@@ -19,12 +19,10 @@ So it's easy to see how such bugs can creep in.
 	"recursion" to unsigned.
 	(RUST_NO_RECURSION_LIMIT): Similarly in cast.
 ---
- libiberty/ChangeLog       | 6 ++++++
- libiberty/rust-demangle.c | 4 ++--
+ libiberty/ChangeLog       |    6 ++++++
+ libiberty/rust-demangle.c |    4 ++--
  2 files changed, 8 insertions(+), 2 deletions(-)
 
-diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
-index 8e39fd28eba8..3f749455f05d 100644
 --- a/libiberty/ChangeLog
 +++ b/libiberty/ChangeLog
 @@ -1,3 +1,9 @@
@@ -37,11 +35,9 @@ index 8e39fd28eba8..3f749455f05d 100644
  2021-07-15  Nick Clifton  <nickc@redhat.com>
  
  	PR 99935
-diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c
-index df09b7b8fddb..ac1eb8eb02c6 100644
 --- a/libiberty/rust-demangle.c
 +++ b/libiberty/rust-demangle.c
-@@ -75,10 +75,10 @@ struct rust_demangler
+@@ -75,10 +75,10 @@
    int version;
  
    /* Recursion depth.  */
diff --git a/packages/binutils/2.37/0011-bfd-close-the-file-descriptor-if-there-is-no-archive-fd.patch b/packages/binutils/2.37/0010-bfd-close-the-file-descriptor-if-there-is-no-archive-fd.patch
index 192d4e0..1fe3d9c 100644
--- a/packages/binutils/2.37/0011-bfd-close-the-file-descriptor-if-there-is-no-archive-fd.patch
+++ b/packages/binutils/2.37/0010-bfd-close-the-file-descriptor-if-there-is-no-archive-fd.patch
@@ -33,16 +33,16 @@ ld/
 (cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
 (cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
 ---
- bfd/plugin.c                       |  8 +++++++
- ld/testsuite/ld-plugin/lto.exp     | 34 ++++++++++++++++++++++++++++++
- ld/testsuite/ld-plugin/pr28138-1.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-2.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-3.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-4.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-5.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-6.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-7.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138.c   | 20 ++++++++++++++++++
+ bfd/plugin.c                       |    8 ++++++++
+ ld/testsuite/ld-plugin/lto.exp     |   34 ++++++++++++++++++++++++++++++++++
+ ld/testsuite/ld-plugin/pr28138-1.c |    6 ++++++
+ ld/testsuite/ld-plugin/pr28138-2.c |    6 ++++++
+ ld/testsuite/ld-plugin/pr28138-3.c |    6 ++++++
+ ld/testsuite/ld-plugin/pr28138-4.c |    6 ++++++
+ ld/testsuite/ld-plugin/pr28138-5.c |    6 ++++++
+ ld/testsuite/ld-plugin/pr28138-6.c |    6 ++++++
+ ld/testsuite/ld-plugin/pr28138-7.c |    6 ++++++
+ ld/testsuite/ld-plugin/pr28138.c   |   20 ++++++++++++++++++++
  10 files changed, 104 insertions(+)
  create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
  create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
@@ -53,11 +53,9 @@ ld/
  create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
  create mode 100644 ld/testsuite/ld-plugin/pr28138.c
 
-diff --git a/bfd/plugin.c b/bfd/plugin.c
-index 6cfa2b66470..3bab8febe88 100644
 --- a/bfd/plugin.c
 +++ b/bfd/plugin.c
-@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
+@@ -291,6 +291,14 @@
  	     && !bfd_is_thin_archive (abfd->my_archive))
  	abfd = abfd->my_archive;
  
@@ -72,11 +70,9 @@ index 6cfa2b66470..3bab8febe88 100644
        abfd->archive_plugin_fd_open_count--;
        /* Dup the archive plugin file descriptor for later use, which
  	 will be closed by _bfd_archive_close_and_cleanup.  */
-diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
-index def69e43ab3..999d911ce6a 100644
 --- a/ld/testsuite/ld-plugin/lto.exp
 +++ b/ld/testsuite/ld-plugin/lto.exp
-@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
+@@ -687,6 +687,40 @@
      }
  }
  
@@ -117,9 +113,6 @@ index def69e43ab3..999d911ce6a 100644
  set testname "Build liblto-11.a"
  remote_file host delete "tmpdir/liblto-11.a"
  set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
-diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
-new file mode 100644
-index 00000000000..51d119e1642
 --- /dev/null
 +++ b/ld/testsuite/ld-plugin/pr28138-1.c
 @@ -0,0 +1,6 @@
@@ -129,9 +122,6 @@ index 00000000000..51d119e1642
 +{
 +  return 1 + a0();
 +}
-diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
-new file mode 100644
-index 00000000000..1120cd797e9
 --- /dev/null
 +++ b/ld/testsuite/ld-plugin/pr28138-2.c
 @@ -0,0 +1,6 @@
@@ -141,9 +131,6 @@ index 00000000000..1120cd797e9
 +{
 +  return 1 + a1();
 +}
-diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
-new file mode 100644
-index 00000000000..ec464947ee6
 --- /dev/null
 +++ b/ld/testsuite/ld-plugin/pr28138-3.c
 @@ -0,0 +1,6 @@
@@ -153,9 +140,6 @@ index 00000000000..ec464947ee6
 +{
 +  return 1 + a2();
 +}
-diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
-new file mode 100644
-index 00000000000..475701b2c5c
 --- /dev/null
 +++ b/ld/testsuite/ld-plugin/pr28138-4.c
 @@ -0,0 +1,6 @@
@@ -165,9 +149,6 @@ index 00000000000..475701b2c5c
 +{
 +  return 1 + a3();
 +}
-diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
-new file mode 100644
-index 00000000000..e24f86c363e
 --- /dev/null
 +++ b/ld/testsuite/ld-plugin/pr28138-5.c
 @@ -0,0 +1,6 @@
@@ -177,9 +158,6 @@ index 00000000000..e24f86c363e
 +{
 +  return 1 + a4();
 +}
-diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
-new file mode 100644
-index 00000000000..b5b938bdb21
 --- /dev/null
 +++ b/ld/testsuite/ld-plugin/pr28138-6.c
 @@ -0,0 +1,6 @@
@@ -189,9 +167,6 @@ index 00000000000..b5b938bdb21
 +{
 +  return 1 + a5();
 +}
-diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
-new file mode 100644
-index 00000000000..4ef75bf0f0c
 --- /dev/null
 +++ b/ld/testsuite/ld-plugin/pr28138-7.c
 @@ -0,0 +1,6 @@
@@ -201,9 +176,6 @@ index 00000000000..4ef75bf0f0c
 +{
 +  return 1 + a6();
 +}
-diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
-new file mode 100644
-index 00000000000..68252c9f382
 --- /dev/null
 +++ b/ld/testsuite/ld-plugin/pr28138.c
 @@ -0,0 +1,20 @@
@@ -227,6 +199,3 @@ index 00000000000..68252c9f382
 +    }
 +  return 1;
 +}
--- 
-2.27.0
-
diff --git a/packages/binutils/2.37/0012-pr28391-strip-objcopy-preserve-dates-a-cannot-set-time.patch b/packages/binutils/2.37/0011-pr28391-strip-objcopy-preserve-dates-a-cannot-set-time.patch
index f7b5221..de54af3 100644
--- a/packages/binutils/2.37/0012-pr28391-strip-objcopy-preserve-dates-a-cannot-set-time.patch
+++ b/packages/binutils/2.37/0011-pr28391-strip-objcopy-preserve-dates-a-cannot-set-time.patch
@@ -16,15 +16,13 @@ and the whole st_atim timespec untouched leaving them uninitialized
 
 (cherry picked from commit 0d62064867c74286360e821b75ef6799bedc4b34)
 ---
- binutils/ar.c      | 3 +++
- binutils/objcopy.c | 1 +
+ binutils/ar.c      |    3 +++
+ binutils/objcopy.c |    1 +
  2 files changed, 4 insertions(+)
 
-diff --git a/binutils/ar.c b/binutils/ar.c
-index 5d6976c7027..8885585ef75 100644
 --- a/binutils/ar.c
 +++ b/binutils/ar.c
-@@ -1180,6 +1180,9 @@ extract_file (bfd *abfd)
+@@ -1180,6 +1180,9 @@
    bfd_size_type size;
    struct stat buf;
  
@@ -34,11 +32,9 @@ index 5d6976c7027..8885585ef75 100644
    if (bfd_stat_arch_elt (abfd, &buf) != 0)
      /* xgettext:c-format */
      fatal (_("internal stat error on %s"), bfd_get_filename (abfd));
-diff --git a/binutils/objcopy.c b/binutils/objcopy.c
-index a6c2e0dcc26..fd7557fe433 100644
 --- a/binutils/objcopy.c
 +++ b/binutils/objcopy.c
-@@ -3600,6 +3600,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
+@@ -3600,6 +3600,7 @@
  
        if (preserve_dates)
  	{
@@ -46,6 +42,3 @@ index a6c2e0dcc26..fd7557fe433 100644
  	  stat_status = bfd_stat_arch_elt (this_element, &buf);
  
  	  if (stat_status != 0)
--- 
-2.27.0
-
diff --git a/packages/binutils/2.37/0013-ld-pru-fix-resource_table-output-section-alignment.patch b/packages/binutils/2.37/0012-ld-pru-fix-resource_table-output-section-alignment.patch
index 58921f1..863253e 100644
--- a/packages/binutils/2.37/0013-ld-pru-fix-resource_table-output-section-alignment.patch
+++ b/packages/binutils/2.37/0012-ld-pru-fix-resource_table-output-section-alignment.patch
@@ -19,12 +19,10 @@ ld/ChangeLog:
 Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu>
 (cherry picked from commit 5109a7bd9b87bdad530f2ebf97036e6087b4504d)
 ---
- ld/ChangeLog          | 5 +++++
- ld/scripttempl/pru.sc | 7 +++----
+ ld/ChangeLog          |    5 +++++
+ ld/scripttempl/pru.sc |    7 +++----
  2 files changed, 8 insertions(+), 4 deletions(-)
 
-diff --git a/ld/ChangeLog b/ld/ChangeLog
-index 5048b5b6a17..ee3259a06de 100644
 --- a/ld/ChangeLog
 +++ b/ld/ChangeLog
 @@ -1,3 +1,8 @@
@@ -36,11 +34,9 @@ index 5048b5b6a17..ee3259a06de 100644
  2021-07-18  Nick Clifton  <nickc@redhat.com>
  
  	* 2.37 release.
-diff --git a/ld/scripttempl/pru.sc b/ld/scripttempl/pru.sc
-index b2c941b7911..97d8be0a0a4 100644
 --- a/ld/scripttempl/pru.sc
 +++ b/ld/scripttempl/pru.sc
-@@ -151,11 +151,10 @@ SECTIONS
+@@ -151,11 +151,10 @@
      ${RELOCATING+ PROVIDE (_data_end = .) ; }
    } ${RELOCATING+ > dmem }
  
@@ -55,6 +51,3 @@ index b2c941b7911..97d8be0a0a4 100644
      KEEP (*(.resource_table))
    } ${RELOCATING+ > dmem}
  
--- 
-2.27.0
-
diff --git a/packages/binutils/2.37/0014-pr28422-build_id-use-after-free.patch b/packages/binutils/2.37/0013-pr28422-build_id-use-after-free.patch
index 5f6c81a..97308ca 100644
--- a/packages/binutils/2.37/0014-pr28422-build_id-use-after-free.patch
+++ b/packages/binutils/2.37/0013-pr28422-build_id-use-after-free.patch
@@ -11,14 +11,12 @@ bfd in struct bfd_preserve need to be cleared in bfd_reinit.
 
 (cherry picked from commit 6d661cdc5be46e890ed9255e749806f46a88e26c)
 ---
- bfd/format.c | 1 +
+ bfd/format.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/bfd/format.c b/bfd/format.c
-index 5d08d1d642c..408c984690e 100644
 --- a/bfd/format.c
 +++ b/bfd/format.c
-@@ -151,6 +151,7 @@ bfd_reinit (bfd *abfd, unsigned int section_id, bfd_cleanup cleanup)
+@@ -151,6 +151,7 @@
    abfd->tdata.any = NULL;
    abfd->arch_info = &bfd_default_arch_struct;
    abfd->flags &= BFD_FLAGS_SAVED;
@@ -26,6 +24,3 @@ index 5d08d1d642c..408c984690e 100644
    bfd_section_list_clear (abfd);
  }
  
--- 
-2.27.0
-
diff --git a/packages/binutils/2.37/0015-pr28459-readelf-issues-bogus-warning.patch b/packages/binutils/2.37/0014-pr28459-readelf-issues-bogus-warning.patch
index a860029..0a1d6d7 100644
--- a/packages/binutils/2.37/0015-pr28459-readelf-issues-bogus-warning.patch
+++ b/packages/binutils/2.37/0014-pr28459-readelf-issues-bogus-warning.patch
@@ -20,14 +20,12 @@ more than one unit.
 
 (cherry picked from commit e7f024765a48fba4452535a5fc006a7e858730fd)
 ---
- binutils/dwarf.c | 1 -
+ binutils/dwarf.c |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/binutils/dwarf.c b/binutils/dwarf.c
-index 1e7f4db7b7c..e73078f496f 100644
 --- a/binutils/dwarf.c
 +++ b/binutils/dwarf.c
-@@ -7727,7 +7727,6 @@ display_debug_ranges (struct dwarf_section *section,
+@@ -7727,7 +7727,6 @@
  	      return 0;
  	    }
  	}
@@ -35,6 +33,3 @@ index 1e7f4db7b7c..e73078f496f 100644
  
        /* Get and check the version number.  */
        SAFE_BYTE_GET_AND_INC (version, start, 2, finish);
--- 
-2.27.0
-
diff --git a/packages/binutils/2.37/0016-pr28417-std-string-no-longer-allows-accepting-nullptr_t.patch b/packages/binutils/2.37/0015-pr28417-std-string-no-longer-allows-accepting-nullptr_t.patch
index 7fa92df..f26591e 100644
--- a/packages/binutils/2.37/0016-pr28417-std-string-no-longer-allows-accepting-nullptr_t.patch
+++ b/packages/binutils/2.37/0015-pr28417-std-string-no-longer-allows-accepting-nullptr_t.patch
@@ -10,15 +10,13 @@ Subject: [PATCH] PR28417, std::string no longer allows accepting nullptr_t
 
 (cherry picked from commit 068a039b8bd7c7386bb0d88f0ae245b0fe4132e9)
 ---
- gold/incremental.cc | 2 +-
- gold/options.h      | 2 +-
+ gold/incremental.cc |    2 +-
+ gold/options.h      |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/gold/incremental.cc b/gold/incremental.cc
-index 52941985e6f..327a1527a29 100644
 --- a/gold/incremental.cc
 +++ b/gold/incremental.cc
-@@ -2286,7 +2286,7 @@ Sized_relobj_incr<size, big_endian>::do_section_name(unsigned int shndx) const
+@@ -2280,7 +2280,7 @@
    const Output_sections& out_sections(this->output_sections());
    const Output_section* os = out_sections[shndx];
    if (os == NULL)
@@ -27,11 +25,9 @@ index 52941985e6f..327a1527a29 100644
    return os->name();
  }
  
-diff --git a/gold/options.h b/gold/options.h
-index 757ebf18fec..47299a37834 100644
 --- a/gold/options.h
 +++ b/gold/options.h
-@@ -611,7 +611,7 @@ class Search_directory
+@@ -611,7 +611,7 @@
    // We need a default constructor because we put this in a
    // std::vector.
    Search_directory()
@@ -40,6 +36,3 @@ index 757ebf18fec..47299a37834 100644
    { }
  
    // This is the usual constructor.
--- 
-2.27.0
-
diff --git a/packages/binutils/2.37/0017-pr28540-segmentation-fault-on-NULL-byte_get.patch b/packages/binutils/2.37/0016-pr28540-segmentation-fault-on-NULL-byte_get.patch
index f7f26a7..e0be9b7 100644
--- a/packages/binutils/2.37/0017-pr28540-segmentation-fault-on-NULL-byte_get.patch
+++ b/packages/binutils/2.37/0016-pr28540-segmentation-fault-on-NULL-byte_get.patch
@@ -9,14 +9,12 @@ Subject: [PATCH] PR28540, segmentation fault on NULL byte_get
 
 (cherry picked from commit f2f105f518413ea3e4c212f89585f9a8a5dddcdd)
 ---
- binutils/objdump.c | 2 +-
+ binutils/objdump.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/binutils/objdump.c b/binutils/objdump.c
-index a7b8303b992..50317b3d48f 100644
 --- a/binutils/objdump.c
 +++ b/binutils/objdump.c
-@@ -4869,7 +4869,7 @@ dump_bfd (bfd *abfd, bool is_mainfile)
+@@ -4869,7 +4869,7 @@
       
       The test on is_mainfile is there because the chain of separate debug
       info files is a global variable shared by all invocations of dump_bfd.  */
@@ -25,6 +23,3 @@ index a7b8303b992..50317b3d48f 100644
      {
        load_separate_debug_files (abfd, bfd_get_filename (abfd));
  
--- 
-2.27.0
-
diff --git a/packages/binutils/2.37/0018-gold-place-note-gnu-property-section-before-other-note-sections.patch b/packages/binutils/2.37/0017-gold-place-note-gnu-property-section-before-other-note-sections.patch
index 9b53a90..0063e0d 100644
--- a/packages/binutils/2.37/0018-gold-place-note-gnu-property-section-before-other-note-sections.patch
+++ b/packages/binutils/2.37/0017-gold-place-note-gnu-property-section-before-other-note-sections.patch
@@ -14,15 +14,13 @@ avoid being placed between other note sections with different alignments.
 
 (cherry picked from commit f85dcfc3af9cf7c2859241253f1d37b1133abea2)
 ---
- gold/layout.cc | 3 ++-
- gold/layout.h  | 9 +++++++--
+ gold/layout.cc |    3 ++-
+ gold/layout.h  |    9 +++++++--
  2 files changed, 9 insertions(+), 3 deletions(-)
 
-diff --git a/gold/layout.cc b/gold/layout.cc
-index a27cb071c75..38e9bceec7e 100644
 --- a/gold/layout.cc
 +++ b/gold/layout.cc
-@@ -3245,7 +3245,8 @@ Layout::create_note(const char* name, int note_type,
+@@ -3245,7 +3245,8 @@
    if (allocate)
      {
        flags = elfcpp::SHF_ALLOC;
@@ -32,11 +30,9 @@ index a27cb071c75..38e9bceec7e 100644
      }
    Output_section* os = this->choose_output_section(NULL, section_name,
  						   elfcpp::SHT_NOTE,
-diff --git a/gold/layout.h b/gold/layout.h
-index 0b378003679..05c31714e47 100644
 --- a/gold/layout.h
 +++ b/gold/layout.h
-@@ -399,8 +399,13 @@ enum Output_section_order
+@@ -399,8 +399,13 @@
    // linker can pick it up quickly.
    ORDER_INTERP,
  
@@ -52,6 +48,3 @@ index 0b378003679..05c31714e47 100644
    ORDER_RO_NOTE,
  
    // Put read-only sections used by the dynamic linker early in the
--- 
-2.27.0
-
diff --git a/packages/binutils/2.37/0019-waddress-warning-in-ldelf.c.patch b/packages/binutils/2.37/0018-waddress-warning-in-ldelf.c.patch
index 4091806..685af62 100644
--- a/packages/binutils/2.37/0019-waddress-warning-in-ldelf.c.patch
+++ b/packages/binutils/2.37/0018-waddress-warning-in-ldelf.c.patch
@@ -16,14 +16,12 @@ In file included from ldelf.c:37:
 
 (cherry picked from commit ced10cb78d01652f9e1bb1d1e465327dfe1debaa)
 ---
- ld/ldelf.c | 1 -
+ ld/ldelf.c |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/ld/ldelf.c b/ld/ldelf.c
-index 21e655bb55c..0c39eb6024f 100644
 --- a/ld/ldelf.c
 +++ b/ld/ldelf.c
-@@ -1046,7 +1046,6 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
+@@ -1046,7 +1046,6 @@
        if (abfd->xvec->flavour == bfd_target_elf_flavour
  	  && !bfd_input_just_syms (abfd)
  	  && elf_tdata (abfd) != NULL
@@ -31,6 +29,3 @@ index 21e655bb55c..0c39eb6024f 100644
  	  /* FIXME: Maybe check for other non-supportable types as well ?  */
  	  && (elf_tdata (abfd)->elf_header->e_type == ET_EXEC
  	      || (elf_tdata (abfd)->elf_header->e_type == ET_DYN
--- 
-2.27.0
-