From 94c52a6c76233315cd381c79ff1c2e5033e4616d Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 1 Feb 2021 11:03:26 +0000
Subject: [PATCH] Add support for DWARF-5 sections to the bfd linker's scripts.
 Resolves: #1922707

---
 binutils-ld-DWARF-5-sections.patch | 60 ++++++++++++++++++++++++++++++
 binutils.spec                      |  9 ++++-
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 binutils-ld-DWARF-5-sections.patch

diff --git a/binutils-ld-DWARF-5-sections.patch b/binutils-ld-DWARF-5-sections.patch
new file mode 100644
index 0000000..60d4224
--- /dev/null
+++ b/binutils-ld-DWARF-5-sections.patch
@@ -0,0 +1,60 @@
+--- binutils.orig/ld/scripttempl/DWARF.sc	2021-02-01 10:29:33.596729908 +0000
++++ binutils-2.35.1/ld/scripttempl/DWARF.sc	2021-02-01 10:30:00.454552083 +0000
+@@ -1,4 +1,4 @@
+-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
++# Copyright (C) 2014-2021 Free Software Foundation, Inc.
+ #
+ # Copying and distribution of this file, with or without modification,
+ # are permitted in any medium without royalty provided the copyright
+@@ -9,19 +9,19 @@ cat <<EOF
+      Symbols in the DWARF debugging sections are relative to the beginning
+      of the section so we begin them at 0.  */
+ 
+-  /* DWARF 1 */
++  /* DWARF 1.  */
+   .debug          0 : { *(.debug) }
+   .line           0 : { *(.line) }
+ 
+-  /* GNU DWARF 1 extensions */
++  /* GNU DWARF 1 extensions.  */
+   .debug_srcinfo  0 : { *(.debug_srcinfo) }
+   .debug_sfnames  0 : { *(.debug_sfnames) }
+ 
+-  /* DWARF 1.1 and DWARF 2 */
++  /* DWARF 1.1 and DWARF 2.  */
+   .debug_aranges  0 : { *(.debug_aranges) }
+   .debug_pubnames 0 : { *(.debug_pubnames) }
+ 
+-  /* DWARF 2 */
++  /* DWARF 2.  */
+   .debug_info     0 : { *(.debug_info${RELOCATING+ .gnu.linkonce.wi.*}) }
+   .debug_abbrev   0 : { *(.debug_abbrev) }
+   .debug_line     0 : { *(.debug_line${RELOCATING+ .debug_line.* .debug_line_end}) }
+@@ -30,17 +30,23 @@ cat <<EOF
+   .debug_loc      0 : { *(.debug_loc) }
+   .debug_macinfo  0 : { *(.debug_macinfo) }
+ 
+-  /* SGI/MIPS DWARF 2 extensions */
++  /* SGI/MIPS DWARF 2 extensions.  */
+   .debug_weaknames 0 : { *(.debug_weaknames) }
+   .debug_funcnames 0 : { *(.debug_funcnames) }
+   .debug_typenames 0 : { *(.debug_typenames) }
+   .debug_varnames  0 : { *(.debug_varnames) }
+ 
+-  /* DWARF 3 */
++  /* DWARF 3.  */
+   .debug_pubtypes 0 : { *(.debug_pubtypes) }
+   .debug_ranges   0 : { *(.debug_ranges) }
+ 
+-  /* DWARF Extension.  */
+-  .debug_macro    0 : { *(.debug_macro) }
++  /* DWARF 5.  */
+   .debug_addr     0 : { *(.debug_addr) }
++  .debug_line_str 0 : { *(.debug_line_str) }
++  .debug_loclists 0 : { *(.debug_loclists) }
++  .debug_macro    0 : { *(.debug_macro) }
++  .debug_names    0 : { *(.debug_names) }
++  .debug_rnglists 0 : { *(.debug_rnglists) }
++  .debug_str_offsets 0 : { *(.debug_str_offsets) }
++  .debug_sup      0 : { *(.debug_sup) }
+ EOF
diff --git a/binutils.spec b/binutils.spec
index 19074b6..97431bb 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -39,7 +39,7 @@
 Summary: A GNU collection of binary utilities
 Name: binutils%{?name_cross}%{?_with_debug:-debug}
 Version: 2.35.1
-Release: 28%{?dist}
+Release: 29%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -328,6 +328,10 @@ Patch34: binutils-testsuite-failures.patch
 # Lifetime: Fixed in 2.36
 Patch35: binutils-CVE-2021-20197.patch
 
+# Purpose:  Add DWARF-5 sections to linker scripts.
+# Lifetime: Fixed in 2.37
+Patch36: binutils-ld-DWARF-5-sections.patch
+
 #----------------------------------------------------------------------------
 
 Provides: bundled(libiberty)
@@ -912,6 +916,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Mon Feb 01 2021 Nick Clifton  <nickc@redhat.com> - 2.35.1-29
+- Add support for DWARF-5 sections to the bfd linker's scripts.  (#1922707)
+
 * Fri Jan 29 2021 Nick Clifton  <nickc@redhat.com> - 2.35.1-28
 - Fix a vulnerability in the smart_rename function.  (#1913744)