From 3b3292ed1ea6915d2021738a0234091191506234 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 30 Jun 2022 15:57:49 +0100
Subject: [PATCH] Move update to  the correct patch file

---
 binutils-do-not-use-debuginfod.patch | 26 --------------------------
 binutils-link-following.patch        | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/binutils-do-not-use-debuginfod.patch b/binutils-do-not-use-debuginfod.patch
index 17a06d0..be1f43a 100644
--- a/binutils-do-not-use-debuginfod.patch
+++ b/binutils-do-not-use-debuginfod.patch
@@ -256,29 +256,3 @@ diff -rup binutils.orig/binutils/testsuite/binutils-all/debuginfod.exp binutils-
  } else {
      untested "$test (readelf not configured with debuginfod)"
  }
---- binutils.ori/binutils/dwarf.c	2022-06-30 14:55:24.390992919 +0100
-+++ binutils-2.38/binutils/dwarf.c	2022-06-30 14:58:06.540908399 +0100
-@@ -11764,7 +11764,10 @@ dwarf_select_sections_by_names (const ch
- 	  if (strncmp (p, entry->option, len) == 0
- 	      && (p[len] == ',' || p[len] == '\0'))
- 	    {
--	      * entry->variable = entry->val;
-+	      if (entry->val == 0)
-+		* entry->variable = 0;
-+	      else
-+		* entry->variable |= entry->val;
- 	      result |= entry->val;
- 
- 	      /* The --debug-dump=frames-interp option also
-@@ -11849,7 +11852,10 @@ dwarf_select_sections_by_letters (const
- 	{
- 	  if (entry->letter == * letters)
- 	    {
--	      * entry->variable |= entry->val;
-+	      if (entry->val == 0)
-+		* entry->variable = 0;
-+	      else
-+		* entry->variable |= entry->val;
- 	      result |= entry->val;
- 
- 	      if (! entry->cont)
diff --git a/binutils-link-following.patch b/binutils-link-following.patch
index 9d53dba..cd6ab08 100644
--- a/binutils-link-following.patch
+++ b/binutils-link-following.patch
@@ -342,3 +342,17 @@ diff -rup binutils.orig/binutils/testsuite/binutils-all/readelf.k binutils-2.38/
    Separate debug info file: linkdebug\.debug
    Build-ID \(0x18 bytes\):
   00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff 01 23 45 67 89 ab cd ef
+--- binutils.ori/binutils/dwarf.c	2022-06-30 14:55:24.390992919 +0100
++++ binutils-2.38/binutils/dwarf.c	2022-06-30 14:58:06.540908399 +0100
+@@ -11849,7 +11852,10 @@ dwarf_select_sections_by_letters (const
+ 	{
+ 	  if (entry->letter == * letters)
+ 	    {
+-	      * entry->variable |= entry->val;
++	      if (entry->val == 0)
++		* entry->variable = 0;
++	      else
++		* entry->variable |= entry->val;
+ 	      result |= entry->val;
+ 
+ 	      if (! entry->cont)