Rebase to commit 48c933a69a8.

Fix logic to enable and disable gold linker
Rebase to bring in commits d9ab6e42e739fe826b02a5f868586132ea2d893a and - 0f9faaebc91bc1886a563bde6c178601b4be743b, thus fixing CVE-2026-19548.
2026-09-01 11:34:23 +01:00 · 2026-08-25 09:22:43 +02:00 · 2026-08-19 13:25:44 +01:00 · 2026-08-13 14:09:50 +01:00 · 2026-08-13 10:00:35 +01:00 · 2026-08-12 11:22:10 +01:00
244 changed files with 3367 additions and 12788 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,8 @@
 *.diff
 *.orig
 *.rej
+*.sed
+*.xz

 *~
 .#*
@ -61,10 +63,8 @@ stamp-*
 /mpc*
 /gmp*
 /isl*
-/binutils-2.34.0-5dfc0c955dbe912cd328fc2688e5fceb3239ac2a.tar.xz
 /binutils-2.19.50.0.1-output-format.sed
-/binutils-2.35.tar.xz
-/binutils-2.35.1.tar.xz
-/binutils-2.36.1.tar.xz
-/binutils-2.37.tar.xz
-/binutils-2.38.tar.xz
+/binutils-2.44.50-13.fc43.src.rpm
+/binutils-with-gold-2.45.50-be970c68891.tar.gz
+/binutils-with-gold-2.45.50-ba5838a98fb.tar.gz
+/binutils-2.47.50-1.fc46.src.rpm
--- a/binutils-CVE-2019-1010204.patch
+++ b/binutils-CVE-2019-1010204.patch
@ -1,15 +0,0 @@
--- binutils.orig/gold/fileread.cc	2019-08-06 14:22:08.669313110 +0100
-+++ binutils-2.32/gold/fileread.cc	2019-08-06 14:22:28.799177543 +0100
-@@ -381,6 +381,12 @@ File_read::do_read(off_t start, section_
-   ssize_t bytes;
-   if (this->whole_file_view_ != NULL)
-     {
-+      // See PR 23765 for an example of a testcase that triggers this error.
-+      if (((ssize_t) start) < 0)
-+	gold_fatal(_("%s: read failed, starting offset (%#llx) less than zero"),
-+		   this->filename().c_str(),
-+		   static_cast<long long>(start));
-+	
-       bytes = this->size_ - start;
-       if (static_cast<section_size_type>(bytes) >= size)
- 	{
--- a/binutils-LTO-restore-wrapper-symbol.patch
+++ b/binutils-LTO-restore-wrapper-symbol.patch
@ -0,0 +1,154 @@
+From 3221c470f0765886a49a1a3d2ec602e4104a377b Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Fri, 2 Aug 2024 19:52:00 -0700
+Subject: [PATCH] LTO: Restore the wrapper symbol check for standard function
+
+Call unwrap_hash_lookup to restore the wrapper symbol check for standard
+function since reference to standard function may not show up in LTO
+symbol table:
+
+[hjl@gnu-tgl-3 pr31956-3]$ nm foo.o
+00000000 T main
+         U __real_malloc
+00000000 T __wrap_malloc
+[hjl@gnu-tgl-3 pr31956-3]$  lto-dump -list foo.o
+Type   Visibility  Size  Name
+function  default     0  malloc
+function  default     0  __real_malloc
+function  default     3  main
+function  default     5  __wrap_malloc
+[hjl@gnu-tgl-3 pr31956-3]$ make
+gcc -O2 -flto -Wall   -c -o foo.o foo.c
+gcc -Wl,--wrap=malloc -O2 -flto -Wall -o x foo.o
+/usr/local/bin/ld: /tmp/ccsPW0a9.ltrans0.ltrans.o: in function `main':
+<artificial>:(.text.startup+0xa): undefined reference to `__wrap_malloc'
+collect2: error: ld returned 1 exit status
+make: *** [Makefile:22: x] Error 1
+[hjl@gnu-tgl-3 pr31956-3]$
+
+Also add a test to verify that the unused wrapper is removed.
+
+	PR ld/31956
+	* plugin.c (get_symbols): Restore the wrapper symbol check for
+	standard function.
+	* testsuite/ld-plugin/lto.exp: Run the malloc test and the
+	unused test.
+	* testsuite/ld-plugin/pr31956c.c: New file.
+	* testsuite/ld-plugin/pr31956d.c: New file.
+	* testsuite/ld-plugin/pr31956d.d: New file.
+
+Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
+---
+ ld/plugin.c                       | 14 ++++++++++++--
+ ld/testsuite/ld-plugin/lto.exp    | 16 ++++++++++++++++
+ ld/testsuite/ld-plugin/pr31956c.c | 19 +++++++++++++++++++
+ ld/testsuite/ld-plugin/pr31956d.c |  7 +++++++
+ ld/testsuite/ld-plugin/pr31956d.d |  4 ++++
+ 5 files changed, 58 insertions(+), 2 deletions(-)
+ create mode 100644 ld/testsuite/ld-plugin/pr31956c.c
+ create mode 100644 ld/testsuite/ld-plugin/pr31956d.c
+ create mode 100644 ld/testsuite/ld-plugin/pr31956d.d
+
+diff --git a/ld/plugin.c b/ld/plugin.c
+index 03ee9880d10..51c4765cc5b 100644
+--- a/ld/plugin.c
+++ b/ld/plugin.c
+@@ -778,8 +778,18 @@ get_symbols (const void *handle, int nsyms, struct ld_plugin_symbol *syms,
+ 	{
+ 	  blhe = h;
+ 	  /* Check if a symbol is a wrapper symbol.  */
+-	  if (blhe && blhe->wrapper_symbol)
+-	    wrap_status = wrapper;
+	  if (blhe)
+	    {
+	      if (blhe->wrapper_symbol)
+		wrap_status = wrapper;
+	      else if (link_info.wrap_hash != NULL)
+		{
+		  struct bfd_link_hash_entry *unwrap
+		    = unwrap_hash_lookup (&link_info, (bfd *) abfd, blhe);
+		  if (unwrap != NULL && unwrap != h)
+		    wrap_status = wrapper;
+		}
+	    }
+ 	}
+       else
+ 	{
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index ad59e2abd61..1a8c3736307 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -546,6 +546,22 @@ set lto_link_elf_tests [list \
+    {} \
+    "pr31956b" \
+   ] \
+  [list \
+   "PR ld/31956 (malloc)" \
+   "-Wl,--wrap=malloc" \
+   "-O2 -flto" \
+   {pr31956c.c} \
+   {} \
+   "pr31956c" \
+  ] \
+  [list \
+   "PR ld/31956 (unused)" \
+   "-Wl,--wrap=parse_line" \
+   "-O2 -flto" \
+   {pr31956d.c} \
+   {{"nm" {} "pr31956d.d"}} \
+   "pr31956d" \
+  ] \
+   [list \
+    "Build pr30281.so" \
+    "-shared -Wl,--version-script,pr30281.t \
+diff --git a/ld/testsuite/ld-plugin/pr31956c.c b/ld/testsuite/ld-plugin/pr31956c.c
+new file mode 100644
+index 00000000000..4a46b2b49a8
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr31956c.c
+@@ -0,0 +1,19 @@
+#include <stdlib.h>
+
+extern void *__real_malloc (size_t);
+
+void *
+__wrap_malloc (size_t n)
+{
+  if (n == 0)
+    return NULL;
+  else
+    return __real_malloc (n);
+};
+
+int
+main (void)
+{
+  void *ptr = malloc (30);
+  return ptr == NULL ? 1 : 0;
+}
+diff --git a/ld/testsuite/ld-plugin/pr31956d.c b/ld/testsuite/ld-plugin/pr31956d.c
+new file mode 100644
+index 00000000000..cb7f2d50643
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr31956d.c
+@@ -0,0 +1,7 @@
+void __wrap_parse_line(void) {};
+
+int
+main (void)
+{
+  return 0;
+}
+diff --git a/ld/testsuite/ld-plugin/pr31956d.d b/ld/testsuite/ld-plugin/pr31956d.d
+new file mode 100644
+index 00000000000..b579cdc7353
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr31956d.d
+@@ -0,0 +1,4 @@
+#failif
+#...
+[0-9a-f]+ T .*parse_line
+#...
+-- 
+2.45.2
+
--- a/binutils-aarch64-small-plt0.patch
+++ b/binutils-aarch64-small-plt0.patch
@ -0,0 +1,12 @@
+--- binutils.orig/bfd/elfnn-aarch64.c	2025-02-07 13:42:20.961333141 +0000
+++ binutils-with-gold-2.44/bfd/elfnn-aarch64.c	2025-02-07 13:42:29.781353740 +0000
+@@ -10162,7 +10162,8 @@ elfNN_aarch64_init_small_plt0_entry (bfd
+   /* PR 26312: Explicitly set the sh_entsize to 0 so that
+      consumers do not think that the section contains fixed
+      sized objects.  */
+-  elf_section_data (htab->root.splt->output_section)->this_hdr.sh_entsize = 0;
+  if (elf_section_data (htab->root.splt->output_section) != NULL)
+    elf_section_data (htab->root.splt->output_section)->this_hdr.sh_entsize = 0;
+ 
+   plt_got_2nd_ent = (htab->root.sgotplt->output_section->vma
+ 		  + htab->root.sgotplt->output_offset
--- a/binutils-do-not-link-with-static-libstdc++.patch
+++ b/binutils-do-not-link-with-static-libstdc++.patch
@ -1,7 +1,7 @@
-diff -rup binutils.orig/configure binutils-2.30/configure
--- binutils.orig/configure	2018-09-24 17:50:06.967172922 +0100
-+++ binutils-2.30/configure	2018-09-24 17:51:16.648624865 +0100
-@@ -4996,49 +4996,6 @@ if test -z "$LD"; then
+diff -rup binutils.orig/configure binutils-2.40/configure
+--- binutils.orig/configure	2023-02-13 14:43:00.728877170 +0000
+++ binutils-2.40/configure	2023-02-13 14:43:13.671864892 +0000
+@@ -5442,49 +5442,6 @@ if test -z "$LD"; then
   fi
 fi
 
@ -51,10 +51,9 @@ diff -rup binutils.orig/configure binutils-2.30/configure
 
 
 if test -n "$ac_tool_prefix"; then
-diff -rup binutils.orig/configure.ac binutils-2.30/configure.ac
--- binutils.orig/configure.ac	2018-09-24 17:50:07.241170767 +0100
-+++ binutils-2.30/configure.ac	2018-09-24 17:50:29.908992486 +0100
-@@ -1288,26 +1288,6 @@ if test -z "$LD"; then
+--- binutils.orig/configure.ac	2024-11-26 15:08:50.162328683 +0000
+++ binutils-2.43.50-1686dc7079f/configure.ac	2024-11-26 15:08:56.929374527 +0000
+@@ -1410,26 +1410,6 @@ if test -z "$LD"; then
   fi
 fi
 
@ -79,5 +78,5 @@ diff -rup binutils.orig/configure.ac binutils-2.30/configure.ac
 -fi
 -
 ACX_PROG_GNAT
- ACX_PROG_CMP_IGNORE_INITIAL
- 
+ ACX_PROG_GDC
+ ACX_PROG_CARGO
--- a/binutils-do-not-use-debuginfod.patch
+++ b/binutils-do-not-use-debuginfod.patch
@ -1,258 +0,0 @@
-diff -rup binutils.orig/binutils/NEWS binutils-2.38/binutils/NEWS
--- binutils.orig/binutils/NEWS	2022-03-10 09:13:18.284641005 +0000
-+++ binutils-2.38/binutils/NEWS	2022-03-10 09:13:26.007586352 +0000
-@@ -1,5 +1,8 @@
- -*- text -*-
- 
-+* Add an option to objdump and readelf to prevent attempts to access debuginfod
-+  servers when following links.
-+
- Changes in 2.38:
- 
- * elfedit: Add --output-abiversion option to update ABIVERSION.
-diff -rup binutils.orig/binutils/doc/binutils.texi binutils-2.38/binutils/doc/binutils.texi
--- binutils.orig/binutils/doc/binutils.texi	2022-03-10 09:13:18.285640998 +0000
-+++ binutils-2.38/binutils/doc/binutils.texi	2022-03-10 09:13:26.009586338 +0000
-@@ -2246,6 +2246,8 @@ objdump [@option{-a}|@option{--archive-h
-          @option{--dwarf}[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,=frames-interp,=str,=str-offsets,=loc,=Ranges,=pubtypes,=trace_info,=trace_abbrev,=trace_aranges,=gdb_index,=addr,=cu_index,=links]]
-         [@option{-WK}|@option{--dwarf=follow-links}]
-         [@option{-WN}|@option{--dwarf=no-follow-links}]
-+        [@option{-wD}|@option{--dwarf=use-debuginfod}]
-+        [@option{-wE}|@option{--dwarf=do-not-use-debuginfod}]
-         [@option{-L}|@option{--process-links}]
-         [@option{--ctf=}@var{section}]
-         [@option{-G}|@option{--stabs}]
-@@ -4879,6 +4881,8 @@ readelf [@option{-a}|@option{--all}]
-          @option{--debug-dump}[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,=frames-interp,=str,=str-offsets,=loc,=Ranges,=pubtypes,=trace_info,=trace_abbrev,=trace_aranges,=gdb_index,=addr,=cu_index,=links]]
-         [@option{-wK}|@option{--debug-dump=follow-links}]
-         [@option{-wN}|@option{--debug-dump=no-follow-links}]
-+        [@option{-wD}|@option{--debug-dump=use-debuginfod}]
-+        [@option{-wE}|@option{--debug-dump=do-not-use-debuginfod}]
-         [@option{-P}|@option{--process-links}]
-         [@option{--dwarf-depth=@var{n}}]
-         [@option{--dwarf-start=@var{n}}]
-@@ -5504,7 +5508,8 @@ deduced from the input file
- @cindex separate debug files
- 
- debuginfod is a web service that indexes ELF/DWARF debugging resources
-by build-id and serves them over HTTP.
-+by build-id and serves them over HTTP.  For more information see:
-+@emph{https://sourceware.org/elfutils/Debuginfod.html}
- 
- Binutils can be built with the debuginfod client library
- @code{libdebuginfod} using the @option{--with-debuginfod} configure option.
-@@ -5516,6 +5521,10 @@ separate debug files when the files are
- debuginfod is packaged with elfutils, starting with version 0.178.
- You can get the latest version from `https://sourceware.org/elfutils/'.
- 
-+The DWARF info dumping tools (@command{readelf} and @command{objdump})
-+have options to control when they should access the debuginfod
-+servers.  By default this access is enabled.
-+
- @node Reporting Bugs
- @chapter Reporting Bugs
- @cindex bugs
-Only in binutils-2.38/binutils/doc: binutils.texi.orig
-diff -rup binutils.orig/binutils/doc/debug.options.texi binutils-2.38/binutils/doc/debug.options.texi
--- binutils.orig/binutils/doc/debug.options.texi	2022-03-10 09:13:18.285640998 +0000
-+++ binutils-2.38/binutils/doc/debug.options.texi	2022-03-10 09:13:26.009586338 +0000
-@@ -68,10 +68,27 @@ chosen when configuring the binutils via
- @option{--enable-follow-debug-links=no} options.  If these are not
- used then the default is to enable the following of debug links.
- 
-+Note - if support for the debuginfod protocol was enabled when the
-+binutils were built then this option will also include an attempt to
-+contact any debuginfod servers mentioned in the @var{DEBUGINFOD_URLS}
-+environment variable.  This could take some time to resolve.  This
-+behaviour can be disabled via the @option{=do-not-use-debuginfod} debug
-+option.
-+
- @item N
- @itemx =no-follow-links
- Disables the following of links to separate debug info files.
- 
-+@item D
-+@itemx =use-debuginfod
-+Enables contacting debuginfod servers if there is a need to follow
-+debug links.  This is the default behaviour.
-+
-+@item E
-+@itemx =do-not-use-debuginfod
-+Disables contacting debuginfod servers when there is a need to follow
-+debug links.
-+
- @item l
- @itemx =rawline
- Displays the contents of the @samp{.debug_line} section in a raw
-diff -rup binutils.orig/binutils/dwarf.c binutils-2.38/binutils/dwarf.c
--- binutils.orig/binutils/dwarf.c	2022-03-10 09:13:18.283641012 +0000
-+++ binutils-2.38/binutils/dwarf.c	2022-03-10 09:13:26.010586331 +0000
-@@ -109,6 +109,9 @@ int do_debug_cu_index;
- int do_wide;
- int do_debug_links;
- int do_follow_links = DEFAULT_FOR_FOLLOW_LINKS;
-+#ifdef HAVE_LIBDEBUGINFOD
-+int use_debuginfod = 1;
-+#endif
- bool do_checks;
- 
- int dwarf_cutoff_level = -1;
-@@ -11038,7 +11041,7 @@ debuginfod_fetch_separate_debug_info (st
- 
-   return false;
- }
-#endif
-+#endif /* HAVE_LIBDEBUGINFOD  */
- 
- static void *
- load_separate_debug_info (const char *            main_filename,
-@@ -11157,9 +11160,10 @@ load_separate_debug_info (const char *
-   {
-     char * tmp_filename;
- 
-    if (debuginfod_fetch_separate_debug_info (xlink,
-                                              & tmp_filename,
-                                              file))
-+    if (use_debuginfod
-+	&& debuginfod_fetch_separate_debug_info (xlink,
-+						 & tmp_filename,
-+						 file))
-       {
-         /* File successfully downloaded from server, replace
-            debug_filename with the file's path.  */
-@@ -11207,13 +11211,15 @@ load_separate_debug_info (const char *
-       warn (_("tried: %s\n"), debug_filename);
- 
- #if HAVE_LIBDEBUGINFOD
-      {
-	char *urls = getenv (DEBUGINFOD_URLS_ENV_VAR);
-	if (urls == NULL)
-	  urls = "";
-+      if (use_debuginfod)
-+	{
-+	  char *urls = getenv (DEBUGINFOD_URLS_ENV_VAR);
- 
-	warn (_("tried: DEBUGINFOD_URLS=%s\n"), urls);
-      }
-+	  if (urls == NULL)
-+	    urls = "";
-+
-+	  warn (_("tried: DEBUGINFOD_URLS=%s\n"), urls);
-+	}
- #endif
-     }
- 
-@@ -11707,6 +11713,9 @@ dwarf_select_sections_by_names (const ch
-       { "aranges", & do_debug_aranges, 1 },
-       { "cu_index", & do_debug_cu_index, 1 },
-       { "decodedline", & do_debug_lines, FLAG_DEBUG_LINES_DECODED },
-+#ifdef HAVE_LIBDEBUGINFOD
-+      { "do-not-use-debuginfod", & use_debuginfod, 0 },
-+#endif
-       { "follow-links", & do_follow_links, 1 },
-       { "frames", & do_debug_frames, 1 },
-       { "frames-interp", & do_debug_frames_interp, 1 },
-@@ -11730,6 +11739,9 @@ dwarf_select_sections_by_names (const ch
-       { "trace_abbrev", & do_trace_abbrevs, 1 },
-       { "trace_aranges", & do_trace_aranges, 1 },
-       { "trace_info", & do_trace_info, 1 },
-+#ifdef HAVE_LIBDEBUGINFOD
-+      { "use-debuginfod", & use_debuginfod, 1 },
-+#endif
-       { NULL, NULL, 0 }
-     };
- 
-@@ -11783,6 +11795,10 @@ dwarf_select_sections_by_letters (const
-       case 'A':	do_debug_addr = 1; break;
-       case 'a':	do_debug_abbrevs = 1; break;
-       case 'c':	do_debug_cu_index = 1; break;
-+#ifdef HAVE_LIBDEBUGINFOD
-+      case 'D': use_debuginfod = 1; break;
-+      case 'E': use_debuginfod = 0; break;
-+#endif
-       case 'F':	do_debug_frames_interp = 1; /* Fall through.  */
-       case 'f':	do_debug_frames = 1; break;
-       case 'g':	do_gdb_index = 1; break;
-diff -rup binutils.orig/binutils/dwarf.h binutils-2.38/binutils/dwarf.h
--- binutils.orig/binutils/dwarf.h	2022-03-10 09:13:18.284641005 +0000
-+++ binutils-2.38/binutils/dwarf.h	2022-03-10 09:13:26.010586331 +0000
-@@ -224,6 +224,9 @@ extern int do_debug_cu_index;
- extern int do_wide;
- extern int do_debug_links;
- extern int do_follow_links;
-+#ifdef HAVE_LIBDEBUGINFOD
-+extern int use_debuginfod;
-+#endif
- extern bool do_checks;
- 
- extern int dwarf_cutoff_level;
-diff -rup binutils.orig/binutils/objdump.c binutils-2.38/binutils/objdump.c
--- binutils.orig/binutils/objdump.c	2022-03-10 09:13:18.283641012 +0000
-+++ binutils-2.38/binutils/objdump.c	2022-03-10 09:13:26.011586324 +0000
-@@ -281,6 +281,14 @@ usage (FILE *stream, int status)
-                            Do not follow links to separate debug info files\n\
-                             (default)\n"));
- #endif
-+#if HAVE_LIBDEBUGINFOD
-+  fprintf (stream, _("\
-+  -WD --dwarf=use-debuginfod\n\
-+                           When following links, also query debuginfod servers (default)\n"));
-+  fprintf (stream, _("\
-+  -WE --dwarf=do-not-use-debuginfod\n\
-+                           When following links, do not query debuginfod servers\n"));
-+#endif
-   fprintf (stream, _("\
-   -L, --process-links      Display the contents of non-debug sections in\n\
-                             separate debuginfo files.  (Implies -WK)\n"));
-Only in binutils-2.38/binutils/: objdump.c.orig
-diff -rup binutils.orig/binutils/readelf.c binutils-2.38/binutils/readelf.c
--- binutils.orig/binutils/readelf.c	2022-03-10 09:13:18.302640878 +0000
-+++ binutils-2.38/binutils/readelf.c	2022-03-10 09:13:26.012586316 +0000
-@@ -5126,6 +5126,14 @@ usage (FILE * stream)
-                          Do not follow links to separate debug info files\n\
-                           (default)\n"));
- #endif
-+#if HAVE_LIBDEBUGINFOD
-+  fprintf (stream, _("\
-+  -wD --debug-dump=use-debuginfod\n\
-+                         When following links, also query debuginfod servers (default)\n"));
-+  fprintf (stream, _("\
-+  -wE --debug-dump=do-not-use-debuginfod\n\
-+                         When following links, do not query debuginfod servers\n"));
-+#endif
-   fprintf (stream, _("\
-   --dwarf-depth=N        Do not display DIEs at depth N or greater\n"));
-   fprintf (stream, _("\
-Only in binutils-2.38/binutils/: readelf.c.orig
-diff -rup binutils.orig/binutils/testsuite/binutils-all/debuginfod.exp binutils-2.38/binutils/testsuite/binutils-all/debuginfod.exp
--- binutils.orig/binutils/testsuite/binutils-all/debuginfod.exp	2022-03-10 09:13:18.291640956 +0000
-+++ binutils-2.38/binutils/testsuite/binutils-all/debuginfod.exp	2022-03-10 09:13:26.012586316 +0000
-@@ -185,8 +185,14 @@ proc test_fetch_debugaltlink { prog prog
- }
- 
- if { [regexp ".*DEBUGINFOD.*" $conf_objdump] } {
-    test_fetch_debuglink $OBJDUMP "-W"
-+    test_fetch_debuglink $OBJDUMP "-W -WD"
-     test_fetch_debugaltlink $OBJDUMP "-Wk"
-+
-+    set test "disabling debuginfod access"
-+    setup_xfail *-*-*
-+    test_fetch_debuglink $OBJDUMP "-W -WE"
-+    set test "debuginfod"
-+
- } else {
-     untested "$test (objdump not configured with debuginfod)"
- }
-@@ -194,6 +200,12 @@ if { [regexp ".*DEBUGINFOD.*" $conf_objd
- if { [regexp ".*DEBUGINFOD.*" $conf_readelf] } {
-     test_fetch_debuglink $READELF "-w"
-     test_fetch_debugaltlink $READELF "-wk"
-+
-+    set test "disabling debuginfod access"
-+    setup_xfail *-*-*
-+    test_fetch_debuglink $READELF "-w -wE"
-+    set test "debuginfod"
-+
- } else {
-     untested "$test (readelf not configured with debuginfod)"
- }
--- a/binutils-filename-in-error-messages.patch
+++ b/binutils-filename-in-error-messages.patch
@ -1,134 +0,0 @@
--- binutils.orig/binutils/readelf.c	2021-07-19 12:39:14.206556025 +0100
-+++ binutils-2.37/binutils/readelf.c	2021-07-19 12:44:37.712728732 +0100
-@@ -21873,45 +21873,52 @@ process_file (char * file_name)
-   struct stat statbuf;
-   char armag[SARMAG];
-   bool ret = true;
-+  char * name;
-+  char * saved_program_name;
-+
-+  /* Overload program_name to include file_name.  Doing this means
-+     that warning/error messages will positively identify the file
-+     concerned even when multiple instances of readelf are running.  */
-+  name = xmalloc (strlen (program_name) + strlen (file_name) + 3);
-+  sprintf (name, "%s: %s", program_name, file_name);
-+  saved_program_name = program_name;
-+  program_name = name;
- 
-   if (stat (file_name, &statbuf) < 0)
-     {
-       if (errno == ENOENT)
-	error (_("'%s': No such file\n"), file_name);
-+	error (_("No such file\n"));
-       else
-	error (_("Could not locate '%s'.  System error message: %s\n"),
-	       file_name, strerror (errno));
-      return false;
-+	error (_("Could not locate file.  System error message: %s\n"),
-+	       strerror (errno));
-+      goto done;
-     }
- 
-   if (! S_ISREG (statbuf.st_mode))
-     {
-      error (_("'%s' is not an ordinary file\n"), file_name);
-      return false;
-+      error (_("Not an ordinary file\n"));
-+      goto done;
-     }
- 
-   filedata = calloc (1, sizeof * filedata);
-   if (filedata == NULL)
-     {
-       error (_("Out of memory allocating file data structure\n"));
-      return false;
-+      goto done;
-     }
- 
-   filedata->file_name = file_name;
-   filedata->handle = fopen (file_name, "rb");
-   if (filedata->handle == NULL)
-     {
-      error (_("Input file '%s' is not readable.\n"), file_name);
-      free (filedata);
-      return false;
-+      error (_("Not readable\n"));
-+      goto done;
-     }
- 
-   if (fread (armag, SARMAG, 1, filedata->handle) != 1)
-     {
-      error (_("%s: Failed to read file's magic number\n"), file_name);
-      fclose (filedata->handle);
-      free (filedata);
-      return false;
-+      error (_("Failed to read file's magic number\n"));
-+      goto done;
-     }
- 
-   filedata->file_size = (bfd_size_type) statbuf.st_size;
-@@ -21919,33 +21926,39 @@ process_file (char * file_name)
- 
-   if (memcmp (armag, ARMAG, SARMAG) == 0)
-     {
-      if (! process_archive (filedata, false))
-	ret = false;
-+      if (process_archive (filedata, false))
-+	ret = true;
-     }
-   else if (memcmp (armag, ARMAGT, SARMAG) == 0)
-     {
-      if ( ! process_archive (filedata, true))
-	ret = false;
-+      if (process_archive (filedata, true))
-+	ret = true;
-     }
-   else
-     {
-       if (do_archive_index && !check_all)
-	error (_("File %s is not an archive so its index cannot be displayed.\n"),
-	       file_name);
-+	error (_("Not an archive so its index cannot be displayed.\n"));
- 
-       rewind (filedata->handle);
-       filedata->archive_file_size = filedata->archive_file_offset = 0;
- 
-      if (! process_object (filedata))
-	ret = false;
-+      if (process_object (filedata))
-+	ret = true;
-     }
- 
-  fclose (filedata->handle);
-  free (filedata->section_headers);
-  free (filedata->program_headers);
-  free (filedata->string_table);
-  free (filedata->dump.dump_sects);
-  free (filedata);
-+ done:
-+  if (filedata)
-+    {
-+      if (filedata->handle != NULL)
-+	fclose (filedata->handle);
-+      free (filedata->section_headers);
-+      free (filedata->program_headers);
-+      free (filedata->string_table);
-+      free (filedata->dump.dump_sects);
-+      free (filedata);
-+    }
-+  free (program_name);
-+  program_name = saved_program_name;
- 
-   free (ba_cache.strtab);
-   ba_cache.strtab = NULL;
--- binutils.orig/binutils/readelf.c	2021-08-10 10:15:22.088016072 +0100
-+++ binutils-2.37/binutils/readelf.c	2021-08-10 10:15:55.567907891 +0100
-@@ -21884,7 +21884,7 @@ process_file (char * file_name)
-   Filedata * filedata = NULL;
-   struct stat statbuf;
-   char armag[SARMAG];
-  bool ret = true;
-+  bool ret = false;
-   char * name;
-   char * saved_program_name;
- 
--- a/binutils-fix-ar-test.patch
+++ b/binutils-fix-ar-test.patch
@ -0,0 +1,11 @@
+--- binutils.orig/binutils/testsuite/binutils-all/ar.exp	2024-02-07 13:02:23.490031197 +0000
+++ binutils-2.42/binutils/testsuite/binutils-all/ar.exp	2024-02-07 13:03:10.285034069 +0000
+@@ -1017,7 +1017,7 @@ symbol_table
+ argument_parsing
+ deterministic_archive
+ replacing_deterministic_member
+-replacing_non_deterministic_member
+# replacing_non_deterministic_member
+ replacing_sde_deterministic_member
+ delete_an_element
+ move_an_element
--- a/binutils-fix-testsuite-failures.patch
+++ b/binutils-fix-testsuite-failures.patch
@ -1,330 +0,0 @@
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 13:33:21.979627285 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 13:40:26.911199033 +0000
-@@ -34,5 +34,6 @@ hook called: claim_file tmpdir/libtext.a
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-13.d binutils-2.32/ld/testsuite/ld-plugin/plugin-13.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-13.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-13.d	2019-02-15 13:41:30.189692800 +0000
-@@ -23,5 +23,3 @@ hook called: claim_file tmpdir/main.o \[
- hook called: claim_file .*/ld/testsuite/ld-plugin/func.c \[@0/.* CLAIMED
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
-.*main.c.*: undefined reference to `\.?func'
-#...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-14.d binutils-2.32/ld/testsuite/ld-plugin/plugin-14.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-14.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-14.d	2019-02-15 13:42:03.598430960 +0000
-@@ -27,7 +27,6 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-15.d binutils-2.32/ld/testsuite/ld-plugin/plugin-15.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-15.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-15.d	2019-02-15 13:42:28.014239600 +0000
-@@ -28,7 +28,6 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.32/ld/testsuite/ld-plugin/plugin-16.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-16.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-16.d	2019-02-15 13:43:21.309821910 +0000
-@@ -30,9 +30,8 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.32/ld/testsuite/ld-plugin/plugin-17.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-17.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-17.d	2019-02-15 13:43:54.925558451 +0000
-@@ -31,7 +31,8 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-20.d binutils-2.32/ld/testsuite/ld-plugin/plugin-20.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-20.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-20.d	2019-02-15 13:49:20.091010016 +0000
-@@ -2,6 +2,5 @@ hook called: all symbols read.
- Input: func.c \(tmpdir/libfunc.a\)
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-21.d binutils-2.32/ld/testsuite/ld-plugin/plugin-21.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-21.d	2019-02-15 13:33:21.978627293 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-21.d	2019-02-15 13:49:34.506897033 +0000
-@@ -2,6 +2,5 @@ hook called: all symbols read.
- Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\)
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-22.d binutils-2.32/ld/testsuite/ld-plugin/plugin-22.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-22.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-22.d	2019-02-15 13:50:00.409694022 +0000
-@@ -2,6 +2,5 @@ Claimed: tmpdir/libfunc.a \[@.*
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-23.d binutils-2.32/ld/testsuite/ld-plugin/plugin-23.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-23.d	2019-02-15 13:33:21.979627285 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-23.d	2019-02-15 13:50:14.938580156 +0000
-@@ -2,6 +2,5 @@ Claimed: .*/ld/testsuite/ld-plugin/func.
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-24.d binutils-2.32/ld/testsuite/ld-plugin/plugin-24.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-24.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-24.d	2019-02-15 13:49:46.346804240 +0000
-@@ -2,4 +2,5 @@ hook called: all symbols read.
- Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\)
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-25.d binutils-2.32/ld/testsuite/ld-plugin/plugin-25.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-25.d	2019-02-15 13:33:21.978627293 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-25.d	2019-02-15 13:50:29.322467422 +0000
-@@ -2,4 +2,5 @@ Claimed: .*/ld/testsuite/ld-plugin/func.
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 13:45:05.343006557 +0000
-@@ -1 +1,3 @@
- .*: error: Error
-+#...
-+
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-29.d binutils-2.32/ld/testsuite/ld-plugin/plugin-29.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-29.d	2019-02-15 13:33:21.978627293 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-29.d	2019-02-15 13:45:22.764870016 +0000
-@@ -1 +1,2 @@
- .*: warning: Warning
-+#...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-30.d binutils-2.32/ld/testsuite/ld-plugin/plugin-30.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-30.d	2019-02-15 13:33:21.976627309 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-30.d	2019-02-15 13:48:57.067190464 +0000
-@@ -24,3 +24,4 @@ hook called: claim_file tmpdir/main.o \[
- hook called: claim_file tmpdir/func.o \[@0/.* not claimed
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- hook called: claim_file tmpdir/libempty.a \[@.* not claimed
-+#pass
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-6.d binutils-2.32/ld/testsuite/ld-plugin/plugin-6.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-6.d	2019-02-15 13:33:21.979627285 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-6.d	2019-02-15 13:37:14.672749977 +0000
-@@ -27,7 +27,6 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-7.d binutils-2.32/ld/testsuite/ld-plugin/plugin-7.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-7.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-7.d	2019-02-15 13:37:58.000400421 +0000
-@@ -28,7 +28,6 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 13:38:34.096109209 +0000
-@@ -32,7 +32,6 @@ hook called: claim_file tmpdir/text.o \[
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.32/ld/testsuite/ld-plugin/plugin-9.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-9.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-9.d	2019-02-15 13:39:52.655475403 +0000
-@@ -31,7 +31,8 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/pr20070.d binutils-2.32/ld/testsuite/ld-plugin/pr20070.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/pr20070.d	2019-02-15 13:33:21.976627309 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/pr20070.d	2019-02-15 13:50:56.874251486 +0000
-@@ -5,5 +5,6 @@ Sym: 'weakdef' Resolution: LDPR_PREVAILI
- Sym: 'undef' Resolution: LDPR_UNDEF
- Sym: 'weakundef' Resolution: LDPR_UNDEF
- Sym: 'common' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-srec/srec.exp binutils-2.32/ld/testsuite/ld-srec/srec.exp
--- binutils-2.32.orig/ld/testsuite/ld-srec/srec.exp	2019-02-15 13:33:21.938627615 +0000
-+++ binutils-2.32/ld/testsuite/ld-srec/srec.exp	2019-02-15 13:53:58.744814006 +0000
-@@ -21,6 +21,8 @@
- 
- # Get the offset from an S-record line to the start of the data.
- 
-+return
-+
- proc srec_off { l } {
-     if [string match "S1*" $l] {
- 	return 8
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 14:10:59.038709514 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 14:13:53.532300721 +0000
-@@ -32,7 +32,7 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/libtext.a \[@.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
- #...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-11.d binutils-2.32/ld/testsuite/ld-plugin/plugin-11.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-11.d	2019-02-15 14:10:59.041709490 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-11.d	2019-02-15 14:14:50.061844322 +0000
-@@ -35,8 +35,9 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-18.d binutils-2.32/ld/testsuite/ld-plugin/plugin-18.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-18.d	2019-02-15 14:10:58.942710289 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-18.d	2019-02-15 14:15:20.030602369 +0000
-@@ -32,7 +32,8 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/libtext.a \[@.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-19.d binutils-2.32/ld/testsuite/ld-plugin/plugin-19.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-19.d	2019-02-15 14:10:59.024709627 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-19.d	2019-02-15 14:15:54.926320633 +0000
-@@ -35,8 +35,9 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 14:10:58.998709837 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 14:12:19.856057024 +0000
-@@ -1,3 +1,2 @@
- .*: error: Error
- #...
-
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 14:10:59.074709224 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 14:11:48.144313048 +0000
-@@ -30,7 +30,7 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
- #...
- hook called: cleanup.
-diff -rup binutils.orig/ld/testsuite/ld-elfvers/vers24.rd binutils-2.30/ld/testsuite/ld-elfvers/vers24.rd
--- binutils.orig/ld/testsuite/ld-elfvers/vers24.rd	2018-09-05 09:45:44.013108697 +0100
-+++ binutils-2.30/ld/testsuite/ld-elfvers/vers24.rd	2018-09-05 12:06:17.287425232 +0100
-@@ -7,9 +7,9 @@ Symbol table '.dynsym' contains [0-9]+ e
- # And ensure the dynamic symbol table contains at least x@VERS.0
- # and foo@@VERS.0 symbols
- #...
- +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0
-+ +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0.*
- #...
- +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0
-+ +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0.*
- #...
- Symbol table '.symtab' contains [0-9]+ entries:
- #pass
-diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin.exp binutils-2.30/ld/testsuite/ld-plugin/plugin.exp
--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp	2018-09-05 09:45:44.023108605 +0100
-+++ binutils-2.30/ld/testsuite/ld-plugin/plugin.exp	2018-09-05 11:18:53.997202105 +0100
-@@ -118,6 +118,12 @@ if { $can_compile && !$failed_compile }
-     }
- }
- 
-+# I do not know why, but the underscore prefix test is going
-+# wrong on ppc64le targets.  So override it here.
-+if { [istarget powerpc*-*-linux*] || [istarget x86_64*-*-linux*] } {
-+    set _ ""
-+}
-+
- set testobjfiles "tmpdir/main.o tmpdir/func.o tmpdir/text.o"
- set testobjfiles_notext "tmpdir/main.o tmpdir/func.o"
- set testsrcfiles "tmpdir/main.o $srcdir/$subdir/func.c tmpdir/text.o"
--- a/binutils-gas-loc-view.patch
+++ b/binutils-gas-loc-view.patch
@ -1,91 +0,0 @@
-diff -rup binutils.orig/gas/symbols.c binutils-2.38/gas/symbols.c
--- binutils.orig/gas/symbols.c	2022-03-09 11:43:34.706610216 +0000
-+++ binutils-2.38/gas/symbols.c	2022-03-09 11:45:57.540686508 +0000
-@@ -61,8 +61,10 @@ struct symbol_flags
-   /* Whether the symbol can be re-defined.  */
-   unsigned int volatil : 1;
- 
-  /* Whether the symbol is a forward reference.  */
-+  /* Whether the symbol is a forward reference, and whether such has
-+     been determined.  */
-   unsigned int forward_ref : 1;
-+  unsigned int forward_resolved : 1;
- 
-   /* This is set if the symbol is defined in an MRI common section.
-      We handle such sections as single common symbols, so symbols
-@@ -202,7 +204,7 @@ static void *
- symbol_entry_find (htab_t table, const char *name)
- {
-   hashval_t hash = htab_hash_string (name);
-  symbol_entry_t needle = { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-+  symbol_entry_t needle = { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
- 			      hash, name, 0, 0, 0 } };
-   return htab_find_with_hash (table, &needle, hash);
- }
-@@ -784,7 +786,9 @@ symbol_clone (symbolS *orgsymP, int repl
- symbolS *
- symbol_clone_if_forward_ref (symbolS *symbolP, int is_forward)
- {
-  if (symbolP && !symbolP->flags.local_symbol)
-+  if (symbolP
-+      && !symbolP->flags.local_symbol
-+      && !symbolP->flags.forward_resolved)
-     {
-       symbolS *orig_add_symbol = symbolP->x->value.X_add_symbol;
-       symbolS *orig_op_symbol = symbolP->x->value.X_op_symbol;
-@@ -837,6 +841,7 @@ symbol_clone_if_forward_ref (symbolS *sy
- 
-       symbolP->x->value.X_add_symbol = add_symbol;
-       symbolP->x->value.X_op_symbol = op_symbol;
-+      symbolP->flags.forward_resolved = 1;
-     }
- 
-   return symbolP;
-diff -rup binutils.orig/gas/testsuite/gas/elf/dwarf2-18.d binutils-2.38/gas/testsuite/gas/elf/dwarf2-18.d
--- binutils.orig/gas/testsuite/gas/elf/dwarf2-18.d	2022-03-09 11:43:34.487611632 +0000
-+++ binutils-2.38/gas/testsuite/gas/elf/dwarf2-18.d	2022-03-09 11:48:03.298873228 +0000
-@@ -2,9 +2,8 @@
- #readelf: -x.rodata -wL
- #name: DWARF2 18
- # The am33 cr16 crx ft32 mn10 msp430 nds32 and rl78 targets do not evaluate the subtraction of symbols at assembly time.
-# The mep targets turns some view computations into complex relocations.
- # The riscv targets do not support the subtraction of symbols.
-#xfail: am3*-* cr16-* crx-* ft32*-* mep-* mn10*-* msp430-* nds32*-* riscv*-* rl78-*
-+#xfail: am3*-* cr16-* crx-* ft32*-* mn10*-* msp430-* nds32*-* riscv*-* rl78-*
- 
- Hex dump of section '\.rodata':
-   0x00000000 0100 *.*
--- binutils.orig/gas/dwarf2dbg.c	2022-03-10 09:13:18.516639363 +0000
-+++ binutils-2.38/gas/dwarf2dbg.c	2022-03-10 12:45:25.191933733 +0000
-@@ -402,18 +402,27 @@ set_or_check_view (struct line_entry *e,
-   if (viewx.X_op != O_constant || viewx.X_add_number)
-     {
-       expressionS incv;
-+      expressionS *p_view;
- 
-       if (!p->loc.u.view)
-	{
-	  p->loc.u.view = symbol_temp_make ();
-	  gas_assert (!S_IS_DEFINED (p->loc.u.view));
-	}
-+	p->loc.u.view = symbol_temp_make ();
- 
-       memset (&incv, 0, sizeof (incv));
-       incv.X_unsigned = 1;
-       incv.X_op = O_symbol;
-       incv.X_add_symbol = p->loc.u.view;
-       incv.X_add_number = 1;
-+      p_view = symbol_get_value_expression (p->loc.u.view);
-+      if (p_view->X_op == O_constant || p_view->X_op == O_symbol)
-+	{
-+	  /* If we can, constant fold increments so that a chain of
-+	     expressions v + 1 + 1 ... + 1 is not created.
-+	     resolve_expression isn't ideal for this purpose.  The
-+	     base v might not be resolvable until later.  */
-+	  incv.X_op = p_view->X_op;
-+	  incv.X_add_symbol = p_view->X_add_symbol;
-+	  incv.X_add_number = p_view->X_add_number + 1;
-+	}
- 
-       if (viewx.X_op == O_constant)
- 	{
--- a/binutils-gold-empty-dwp.patch
+++ b/binutils-gold-empty-dwp.patch
@ -0,0 +1,11 @@
+--- binutils.orig/gold/dwp.cc	2023-05-02 13:26:44.075148082 +0100
+++ binutils-2.40/gold/dwp.cc	2023-05-02 13:27:16.189130127 +0100
+@@ -2418,6 +2418,8 @@ main(int argc, char** argv)
+     {
+       Dwo_file exe_file(exe_filename);
+       exe_file.read_executable(&files);
+      if (files.empty())
+        gold_fatal(_("Could not find any dwo links in specified EXE"));
+     }
+ 
+   // Add any additional files listed on command line.
--- a/binutils-gold-ignore-execstack-error.patch
+++ b/binutils-gold-ignore-execstack-error.patch
@ -0,0 +1,16 @@
+diff -rup binutils.orig/gold/options.h binutils-2.41/gold/options.h
+--- binutils.orig/gold/options.h	2024-01-04 09:52:09.282002253 +0000
+++ binutils-2.41/gold/options.h	2024-01-04 09:52:51.890972630 +0000
+@@ -855,6 +855,12 @@ class General_options
+ 	      N_("(ARM only) Do not warn about objects with incompatible "
+ 		 "enum sizes"));
+ 
+  DEFINE_bool_ignore(error_execstack, options::TWO_DASHES, '\0',
+		     N_("Ignored"), N_("Ignored"));
+
+  DEFINE_bool_ignore(error_rwx_segments, options::TWO_DASHES, '\0',
+		     N_("Ignored"), N_("Ignored"));
+
+   DEFINE_special(exclude_libs, options::TWO_DASHES, '\0',
+ 		 N_("Exclude libraries from automatic export"),
+ 		 N_(("lib,lib ...")));
--- a/binutils-gold-pack-relative-relocs.patch
+++ b/binutils-gold-pack-relative-relocs.patch
@ -0,0 +1,27 @@
+diff --git a/gold/options.cc b/gold/options.cc
+index c9834b66159..91d7802fffe 100644
+--- a/gold/options.cc
+++ b/gold/options.cc
+@@ -989,7 +989,7 @@ parse_short_option(int argc, const char** argv, int pos_in_argv_i,
+     }
+ 
+   // If we're a -z option, we need to parse our argument as a
+-  // long-option, e.g. "-z stacksize=8192".
+  // long-option, e.g. "-z stack-size=8192".
+   if (retval == &dash_z)
+     {
+       int dummy_i = 0;
+diff --git a/gold/options.h b/gold/options.h
+index 46f658f23ea..d16e38066da 100644
+--- a/gold/options.h
+++ b/gold/options.h
+@@ -1110,6 +1110,9 @@ class General_options
+ 			 N_("Generate package metadata note"),
+ 			 N_("[=JSON]"));
+ 
+  DEFINE_bool_ignore(pack_relative_relocs, options::DASH_Z, '\0',
+		     N_("Ignored"), N_("Ignored"));
+
+   DEFINE_bool(pie, options::ONE_DASH, '\0', false,
+ 	      N_("Create a position independent executable"),
+ 	      N_("Do not create a position independent executable"));
--- a/binutils-gold-s390-configure.patch
+++ b/binutils-gold-s390-configure.patch
@ -0,0 +1,40 @@
+# The gold linker does not build if the target list includes s390x-linux
+# but does not include s390-linux.  ie it needs the 32-bit target to be
+# enabled in order for the 64-bit target to work.  On the other hand the
+# BFD library does not support the 32-bit s390 target.  So this patch
+# "enhances" the gold configure script so that if s390x is listed, the
+# s390 target will automatically be added to the list as well.
+
+diff -upr orig/gold/configure binutils-2.47/gold/configure
+--- orig/gold/configure	2026-07-27 09:38:54.907192013 +0100
+++ binutils-2.47/gold/configure	2026-07-27 10:12:02.759629540 +0100
+@@ -5223,7 +5223,12 @@ if test -n "$enable_targets"; then
+   for targ in `echo $enable_targets | sed -e 's/,/ /g'`; do
+     result=`$ac_config_sub $targ 2>/dev/null`
+     if test -n "$result"; then
+-      canon_targets="$canon_targets $result"
+      canon_targets="$canon_targets $result" ;
+      case "$result" in
+      s390x-*)
+            canon_targets="$canon_targets s390-gnu-linux"
+	    ;;
+      esac
+     else
+       # Permit unrecognized target names, like "all".
+       canon_targets="$canon_targets $targ"
+diff -upr orig/gold/configure.ac binutils-2.47/gold/configure.ac
+--- orig/gold/configure.ac	2026-07-27 09:38:54.907192013 +0100
+++ binutils-2.47/gold/configure.ac	2026-07-27 10:18:18.480766140 +0100
+@@ -133,6 +133,12 @@ if test -n "$enable_targets"; then
+     result=`$ac_config_sub $targ 2>/dev/null`
+     if test -n "$result"; then
+       canon_targets="$canon_targets $result"
+      # Hack: Enable the s390-linux target if s390x-linux is enabled.
+      case "$result" in
+      s390x-*)
+            canon_targets="$canon_targets s390-gnu-linux"
+	    ;;
+      esac
+     else
+       # Permit unrecognized target names, like "all".
+       canon_targets="$canon_targets $targ"
--- a/binutils-gold-warn-unsupported.patch
+++ b/binutils-gold-warn-unsupported.patch
@ -24,26 +24,6 @@ diff -rup binutils.orig/gold/configure.ac binutils-2.34/gold/configure.ac
     else
       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
       if test "$targ_extra_obj" != ""; then
--- binutils.orig/ld/configure.tgt	2020-04-20 12:35:12.465301359 +0100
-+++ binutils-2.34/ld/configure.tgt	2020-04-20 14:17:52.123066333 +0100
-@@ -220,7 +220,7 @@ bfin-*-linux-uclibc*)	targ_emul=elf32bfi
- 			targ_extra_emuls="elf32bfin"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
-bpf-*-*)		targ_emul=elf64bpf
-+bpf-* | bpf-*-*)	targ_emul=elf64bpf
- 			;;
- cr16-*-elf*)		targ_emul=elf32cr16
- 			;;
-@@ -1026,7 +1026,7 @@ z8k-*-coff)		targ_emul=z8002
- 			targ_extra_ofiles=
- 			;;
- *)
-  echo 2>&1 "*** ld does not support target ${targ}"
-+  echo 2>&1 "*** ld does not support target '${targ}' NO REALLY"
-   echo 2>&1 "*** see ld/configure.tgt for supported targets"
-   exit 1
- 
 --- binutils.orig/bfd/config.bfd	2020-04-20 12:35:13.038297375 +0100
 +++ binutils-2.34/bfd/config.bfd	2020-04-20 14:25:26.452869193 +0100
@@ -473,7 +473,7 @@ case "${targ}" in
@ -55,12 +35,14 @@ diff -rup binutils.orig/gold/configure.ac binutils-2.34/gold/configure.ac
     targ_defvec=bpf_elf64_le_vec
     targ_selvecs=bpf_elf64_be_vec
     targ_underscore=yes
-@@ -1427,7 +1427,7 @@ case "${targ}" in
-     ;;
- 
-   *)
-    echo 1>&2 "*** BFD does not support target ${targ}."
-+    echo 1>&2 "*** BFD does not support target '${targ}'.  Honest."
-     echo 1>&2 "*** Look in bfd/config.bfd for supported targets."
-     exit 1
-     ;;
+--- binutils.orig/ld/configure.tgt	2026-01-05 08:51:02.908224792 +0000
+++ binutils-with-gold-2.45.50-be970c68891/ld/configure.tgt	2026-01-05 08:51:55.852677409 +0000
+@@ -255,7 +255,7 @@ bfin-*-uclinux*)	targ_emul=elf32bfin;
+ bfin-*-linux-uclibc*)	targ_emul=elf32bfinfd;
+ 			targ_extra_libpath=elf32bfin
+ 			;;
+-bpf-*-*)		targ_emul=elf64bpf
+bpf-* | bpf-*-*)	targ_emul=elf64bpf
+ 			;;
+ cr16-*-elf*)		targ_emul=elf32cr16
+ 			;;
--- a/binutils-indirect-symbols.patch
+++ b/binutils-indirect-symbols.patch
@ -1,14 +0,0 @@
--- binutils.orig/bfd/elflink.c	2022-03-30 11:44:05.686040593 +0100
-+++ binutils-2.38/bfd/elflink.c	2022-03-30 11:45:18.066541463 +0100
-@@ -1294,9 +1294,8 @@ _bfd_elf_merge_symbol (bfd *abfd,
- 	  h->root.non_ir_ref_dynamic = true;
- 	  hi->root.non_ir_ref_dynamic = true;
- 	}
-
-      if ((oldbfd->flags & BFD_PLUGIN) != 0
-	  && hi->root.type == bfd_link_hash_indirect)
-+      else if ((oldbfd->flags & BFD_PLUGIN) != 0
-+	       && hi->root.type == bfd_link_hash_indirect)
- 	{
- 	  /* Change indirect symbol from IR to undefined.  */
- 	  hi->root.type = bfd_link_hash_undefined;
--- a/binutils-ld-default-z-text.patch
+++ b/binutils-ld-default-z-text.patch
@ -0,0 +1,52 @@
+diff -rup binutils.orig/bfd/elflink.c binutils-with-gold-2.45.50-be970c68891/bfd/elflink.c
+--- binutils.orig/bfd/elflink.c	2026-01-14 09:21:14.835847967 +0000
+++ binutils-with-gold-2.45.50-be970c68891/bfd/elflink.c	2026-01-14 09:23:48.780495205 +0000
+@@ -13786,7 +13786,7 @@ _bfd_elf_final_link (bfd *abfd, struct b
+ 		{
+ 		  if (info->textrel_check == textrel_check_error)
+ 		    info->callbacks->einfo
+-		      (_("%P%X: read-only segment has dynamic relocations\n"));
+		      (_("%P%X: error: read-only segment has dynamic relocations\n"));
+ 		  else if (bfd_link_dll (info))
+ 		    info->callbacks->einfo
+ 		      (_("%P: warning: creating DT_TEXTREL in a shared object\n"));
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-mode.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-mode.d
+--- binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-mode.d	2026-01-14 09:21:15.248851537 +0000
+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-mode.d	2026-01-14 09:22:24.603416270 +0000
+@@ -1,5 +1,5 @@
+ #source: dt-memtag.s
+-#ld: -shared -z memtag-mode=async
+#ld: -shared -z memtag-mode=async -z notext
+ #readelf: -d
+ 
+ #...
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-stack.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-stack.d
+--- binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-stack.d	2026-01-14 09:21:15.248851537 +0000
+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-stack.d	2026-01-14 09:24:19.594780414 +0000
+@@ -1,5 +1,5 @@
+ #source: dt-memtag.s
+-#ld: -shared -z memtag-stack
+#ld: -shared -z memtag-stack -z notext
+ #readelf: -d
+ 
+ #...
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/relr-text-pie.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-pie.d
+--- binutils.orig/ld/testsuite/ld-aarch64/relr-text-pie.d	2026-01-14 09:21:15.246851520 +0000
+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-pie.d	2026-01-14 09:24:45.363485698 +0000
+@@ -1,5 +1,5 @@
+ #source: relr-text.s
+-#ld: -pie -z pack-relative-relocs -T relocs.ld
+#ld: -pie -z pack-relative-relocs -T relocs.ld -z notext
+ #readelf: -drW
+ 
+ #...
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/relr-text-shared.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-shared.d
+--- binutils.orig/ld/testsuite/ld-aarch64/relr-text-shared.d	2026-01-14 09:21:15.246851520 +0000
+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-shared.d	2026-01-14 09:25:06.651664713 +0000
+@@ -1,5 +1,5 @@
+ #source: relr-text.s
+-#ld: -shared -z pack-relative-relocs -T relocs.ld
+#ld: -shared -z pack-relative-relocs -T relocs.ld -z notext
+ #readelf: -drW
+ 
+ #...
--- a/binutils-ld-read-only-script.patch
+++ b/binutils-ld-read-only-script.patch
@ -1,158 +0,0 @@
-From a0b911576eb49e06a457ebf757b42543d2c7e548 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <luca.boccassi@microsoft.com>
-Date: Wed, 21 Jul 2021 14:32:03 +0100
-Subject: [PATCH] Allows linker scripts to set the SEC_READONLY flag.
-
-* ld.texi: Document new output section type.
-* ldgram.y: Add new token.
-* ldlang.c: Handle the new flag.
-* ldlang.h: Add readonly_section to list of section types.
-* ldlex.l: Add a new identifier.
-* testsuite/ld-scripts/output-section-types.t: New example linker script.
-* testsuite/ld-scripts/output-section-types.d: Test driver.
-* testsyute/ld-scripts/script.exp: Run the new test.
-
-(cherry picked from commit 6b86da53d5ee2022b9065f445d23356190380746)
---
- ld/ld.texi                                     |  2 ++
- ld/ldgram.y                                    |  2 ++
- ld/ldlang.c                                    |  6 ++++++
- ld/ldlang.h                                    |  3 ++-
- ld/ldlex.l                                     |  1 +
- ld/testsuite/ld-scripts/output-section-types.d | 13 +++++++++++++
- ld/testsuite/ld-scripts/output-section-types.t |  7 +++++++
- ld/testsuite/ld-scripts/script.exp             |  1 +
- 8 files changed, 34 insertions(+), 1 deletion(-)
- create mode 100644 ld/testsuite/ld-scripts/output-section-types.d
- create mode 100644 ld/testsuite/ld-scripts/output-section-types.t
-
-diff --git a/ld/ld.texi b/ld/ld.texi
-index dd8f571d4e4..cf1e637adbf 100644
--- a/ld/ld.texi
-+++ b/ld/ld.texi
-@@ -5456,6 +5456,8 @@ parentheses.  The following types are defined:
- @item NOLOAD
- The section should be marked as not loadable, so that it will not be
- loaded into memory when the program is run.
-+@item READONLY
-+The section should be marked as read-only.
- @item DSECT
- @itemx COPY
- @itemx INFO
-diff --git a/ld/ldgram.y b/ld/ldgram.y
-index dd911f46169..31e0071c6fc 100644
--- a/ld/ldgram.y
-+++ b/ld/ldgram.y
-@@ -139,6 +139,7 @@ static int error_index;
- %token REGION_ALIAS
- %token LD_FEATURE
- %token NOLOAD DSECT COPY INFO OVERLAY
-+%token READONLY
- %token DEFINED TARGET_K SEARCH_DIR MAP ENTRY
- %token <integer> NEXT
- %token SIZEOF ALIGNOF ADDR LOADADDR MAX_K MIN_K
-@@ -1123,6 +1124,7 @@ type:
- 	|  COPY    { sectype = noalloc_section; }
- 	|  INFO    { sectype = noalloc_section; }
- 	|  OVERLAY { sectype = noalloc_section; }
-+	|  READONLY { sectype = readonly_section; }
- 	;
- 
- atype:
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..2610be995ca 100644
--- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -2639,6 +2639,9 @@ lang_add_section (lang_statement_list_type *ptr,
-     case noalloc_section:
-       flags &= ~SEC_ALLOC;
-       break;
-+    case readonly_section:
-+      flags |= SEC_READONLY;
-+      break;
-     case noload_section:
-       flags &= ~SEC_LOAD;
-       flags |= SEC_NEVER_LOAD;
-@@ -4232,6 +4235,9 @@ map_input_to_output_sections
- 	    case noalloc_section:
- 	      flags = SEC_HAS_CONTENTS;
- 	      break;
-+	    case readonly_section:
-+	      flags |= SEC_READONLY;
-+	      break;
- 	    case noload_section:
- 	      if (bfd_get_flavour (link_info.output_bfd)
- 		  == bfd_target_elf_flavour)
-diff --git a/ld/ldlang.h b/ld/ldlang.h
-index 6fbe16d97d9..f68ae27b409 100644
--- a/ld/ldlang.h
-+++ b/ld/ldlang.h
-@@ -121,7 +121,8 @@ enum section_type
-   first_overlay_section,
-   overlay_section,
-   noload_section,
-  noalloc_section
-+  noalloc_section,
-+  readonly_section
- };
- 
- /* This structure holds a list of program headers describing
-diff --git a/ld/ldlex.l b/ld/ldlex.l
-index c1b15263587..25b4bcaae01 100644
--- a/ld/ldlex.l
-+++ b/ld/ldlex.l
-@@ -294,6 +294,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
- <BOTH,SCRIPT>"SORT_BY_INIT_PRIORITY"	{ RTOKEN(SORT_BY_INIT_PRIORITY); }
- <BOTH,SCRIPT>"SORT_NONE"		{ RTOKEN(SORT_NONE); }
- <EXPRESSION,BOTH,SCRIPT>"NOLOAD"	{ RTOKEN(NOLOAD);}
-+<EXPRESSION,BOTH,SCRIPT>"READONLY"	{ RTOKEN(READONLY);}
- <EXPRESSION,BOTH,SCRIPT>"DSECT"		{ RTOKEN(DSECT);}
- <EXPRESSION,BOTH,SCRIPT>"COPY"		{ RTOKEN(COPY);}
- <EXPRESSION,BOTH,SCRIPT>"INFO"		{ RTOKEN(INFO);}
-diff --git a/ld/testsuite/ld-scripts/output-section-types.d b/ld/testsuite/ld-scripts/output-section-types.d
-new file mode 100644
-index 00000000000..ab124fa4dd7
--- /dev/null
-+++ b/ld/testsuite/ld-scripts/output-section-types.d
-@@ -0,0 +1,13 @@
-+#ld: -Toutput-section-types.t
-+#source: align2a.s
-+#objdump: -h
-+#target: [is_elf_format]
-+
-+#...
-+  . \.rom.*
-+[ 	]+ALLOC, READONLY
-+  . \.ro.*
-+[ 	]+CONTENTS, ALLOC, LOAD, READONLY, DATA
-+  . \.over.*
-+[ 	]+CONTENTS, READONLY
-+#pass
-diff --git a/ld/testsuite/ld-scripts/output-section-types.t b/ld/testsuite/ld-scripts/output-section-types.t
-new file mode 100644
-index 00000000000..d8fdfda1a03
--- /dev/null
-+++ b/ld/testsuite/ld-scripts/output-section-types.t
-@@ -0,0 +1,7 @@
-+SECTIONS {
-+  .rom  (NOLOAD)   : { LONG(1234); }
-+  .ro   (READONLY) : { LONG(5678); }
-+  .over (OVERLAY)  : { LONG(0123); }
-+  /DISCARD/        : { *(*) }
-+
-+}
-diff --git a/ld/testsuite/ld-scripts/script.exp b/ld/testsuite/ld-scripts/script.exp
-index 961cd08c4b1..ff50199b3ae 100644
--- a/ld/testsuite/ld-scripts/script.exp
-+++ b/ld/testsuite/ld-scripts/script.exp
-@@ -229,6 +229,7 @@ foreach test_script $test_script_list {
- 
- run_dump_test "align-with-input"
- run_dump_test "pr20302"
-+run_dump_test "output-section-types"
- 
- run_dump_test "segment-start" {{name (default)}}
- run_dump_test "segment-start" {{name (overridden)} \
-- 
-2.30.2
-
--- a/binutils-link-following.patch
+++ b/binutils-link-following.patch
@ -1,358 +0,0 @@
-diff -rup binutils.orig/binutils/dwarf.c binutils-2.38/binutils/dwarf.c
--- binutils.orig/binutils/dwarf.c	2022-05-20 16:57:16.563961379 +0100
-+++ binutils-2.38/binutils/dwarf.c	2022-05-20 16:57:32.880853694 +0100
-@@ -11693,7 +11693,11 @@ free_debug_memory (void)
-   free_dwo_info ();
- }
- 
-void
-+/* Enable display of specific DWARF sections as determined by the comma
-+   separated strings in NAMES.  Returns non-zero if any displaying was
-+   enabled.  */
-+
-+int
- dwarf_select_sections_by_names (const char *names)
- {
-   typedef struct
-@@ -11746,6 +11750,7 @@ dwarf_select_sections_by_names (const ch
-     };
- 
-   const char *p;
-+  int result = 0;
- 
-   p = names;
-   while (*p)
-@@ -11760,6 +11765,7 @@ dwarf_select_sections_by_names (const ch
- 	      && (p[len] == ',' || p[len] == '\0'))
- 	    {
- 	      * entry->variable = entry->val;
-+	      result |= entry->val;
- 
- 	      /* The --debug-dump=frames-interp option also
- 		 enables the --debug-dump=frames option.  */
-@@ -11782,48 +11788,82 @@ dwarf_select_sections_by_names (const ch
-       if (*p == ',')
- 	p++;
-     }
-+
-+  return result;
- }
- 
-void
-+/* Enable display of specific DWARF sections as determined by the characters
-+   in LETTERS.  Returns non-zero if any displaying was enabled.  */
-+
-+int
- dwarf_select_sections_by_letters (const char *letters)
- {
-  unsigned int lindex = 0;
-+  typedef struct
-+  {
-+    const char   letter;
-+    int *        variable;
-+    int          val;
-+    bool         cont;
-+  }
-+  debug_dump_letter_opts;
- 
-  while (letters[lindex])
-    switch (letters[lindex++])
-      {
-      case 'A':	do_debug_addr = 1; break;
-      case 'a':	do_debug_abbrevs = 1; break;
-      case 'c':	do_debug_cu_index = 1; break;
-+  static const debug_dump_letter_opts letter_table [] =
-+    {
-+      { 'A', & do_debug_addr, 1, false},
-+      { 'a', & do_debug_abbrevs, 1, false },
-+      { 'c', & do_debug_cu_index, 1, false },
- #ifdef HAVE_LIBDEBUGINFOD
-      case 'D': use_debuginfod = 1; break;
-      case 'E': use_debuginfod = 0; break;
-+      { 'D', & use_debuginfod, 1, false },
-+      { 'E', & use_debuginfod, 0, false },
- #endif
-      case 'F':	do_debug_frames_interp = 1; /* Fall through.  */
-      case 'f':	do_debug_frames = 1; break;
-      case 'g':	do_gdb_index = 1; break;
-      case 'i':	do_debug_info = 1; break;
-      case 'K': do_follow_links = 1; break;
-      case 'N': do_follow_links = 0; break;
-      case 'k':	do_debug_links = 1; break;
-      case 'l':	do_debug_lines |= FLAG_DEBUG_LINES_RAW;	break;
-      case 'L':	do_debug_lines |= FLAG_DEBUG_LINES_DECODED; break;
-      case 'm': do_debug_macinfo = 1; break;
-      case 'O':	do_debug_str_offsets = 1; break;
-      case 'o':	do_debug_loc = 1; break;
-      case 'p':	do_debug_pubnames = 1; break;
-      case 'R':	do_debug_ranges = 1; break;
-      case 'r':	do_debug_aranges = 1; break;
-      case 's':	do_debug_str = 1; break;
-      case 'T': do_trace_aranges = 1; break;
-      case 't': do_debug_pubtypes = 1; break;
-      case 'U': do_trace_info = 1; break;
-      case 'u': do_trace_abbrevs = 1; break;
-
-      default:
-	warn (_("Unrecognized debug option '%s'\n"), letters);
-	break;
-      }
-+      { 'F', & do_debug_frames_interp, 1, true }, /* Note the fall through.  */
-+      { 'f', & do_debug_frames, 1, false },
-+      { 'g', & do_gdb_index, 1, false },
-+      { 'i', & do_debug_info, 1, false },
-+      { 'K', & do_follow_links, 1, false },
-+      { 'k', & do_debug_links, 1, false },
-+      { 'L', & do_debug_lines, FLAG_DEBUG_LINES_DECODED, false },
-+      { 'l', & do_debug_lines, FLAG_DEBUG_LINES_RAW, false },
-+      { 'm', & do_debug_macinfo, 1, false },
-+      { 'N', & do_follow_links, 0, false },
-+      { 'O', & do_debug_str_offsets, 1, false },
-+      { 'o', & do_debug_loc, 1, false },
-+      { 'p', & do_debug_pubnames, 1, false },
-+      { 'R', & do_debug_ranges, 1, false },
-+      { 'r', & do_debug_aranges, 1, false },
-+      { 's', & do_debug_str, 1, false },
-+      { 'T', & do_trace_aranges, 1, false },
-+      { 't', & do_debug_pubtypes, 1, false },
-+      { 'U', & do_trace_info, 1, false },
-+      { 'u', & do_trace_abbrevs, 1, false },
-+      { 0, NULL, 0, false }
-+    };
-+
-+  int result = 0;
-+
-+  while (* letters)
-+    {
-+      const debug_dump_letter_opts * entry;
-+
-+      for (entry = letter_table; entry->letter; entry++)
-+	{
-+	  if (entry->letter == * letters)
-+	    {
-+	      * entry->variable |= entry->val;
-+	      result |= entry->val;
-+
-+	      if (! entry->cont)
-+		break;
-+	    }
-+	}
-+
-+      if (entry->letter == 0)
-+	warn (_("Unrecognized debug letter option '%c'\n"), * letters);
-+
-+      letters ++;
-+    }
-+
-+  return result;
- }
- 
- void
-Only in binutils-2.38/binutils: dwarf.c.orig
-diff -rup binutils.orig/binutils/dwarf.h binutils-2.38/binutils/dwarf.h
--- binutils.orig/binutils/dwarf.h	2022-05-20 16:57:16.565961366 +0100
-+++ binutils-2.38/binutils/dwarf.h	2022-05-20 16:57:32.880853694 +0100
-@@ -246,8 +246,8 @@ extern void *open_debug_file (const char
- 
- extern void free_debug_memory (void);
- 
-extern void dwarf_select_sections_by_names (const char *);
-extern void dwarf_select_sections_by_letters (const char *);
-+extern int dwarf_select_sections_by_names (const char *);
-+extern int dwarf_select_sections_by_letters (const char *);
- extern void dwarf_select_sections_all (void);
- 
- extern unsigned int * find_cu_tu_set (void *, unsigned int);
-Only in binutils-2.38/binutils: dwarf.h.orig
-diff -rup binutils.orig/binutils/objdump.c binutils-2.38/binutils/objdump.c
--- binutils.orig/binutils/objdump.c	2022-05-20 16:57:16.566961359 +0100
-+++ binutils-2.38/binutils/objdump.c	2022-05-20 16:57:32.881853688 +0100
-@@ -5008,6 +5008,26 @@ sign_extend_address (bfd *abfd ATTRIBUTE
-   return (((vma & ((mask << 1) - 1)) ^ mask) - mask);
- }
- 
-+static bool
-+might_need_separate_debug_info (bool is_mainfile)
-+{
-+  /* We do not follow links from debug info files.  */
-+  if (! is_mainfile)
-+    return false;
-+
-+  /* Since do_follow_links might be enabled by default, only treat it as an
-+     indication that separate files should be loaded if setting it was a
-+     deliberate user action.  */
-+  if (DEFAULT_FOR_FOLLOW_LINKS == 0 && do_follow_links)
-+    return true;
-+  
-+  if (process_links || dump_symtab || dump_debugging
-+      || dump_dwarf_section_info)
-+    return true;
-+
-+  return false;  
-+}
-+
- /* Dump selected contents of ABFD.  */
- 
- static void
-@@ -5022,16 +5042,8 @@ dump_bfd (bfd *abfd, bool is_mainfile)
-   else
-     byte_get = NULL;
- 
-  /* Load any separate debug information files.
-     We do this now and without checking do_follow_links because separate
-     debug info files may contain symbol tables that we will need when
-     displaying information about the main file.  Any memory allocated by
-     load_separate_debug_files will be released when we call
-     free_debug_memory below.
-
-     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.  */
-  if (byte_get != NULL && is_mainfile)
-+  /* Load any separate debug information files.  */
-+  if (byte_get != NULL && might_need_separate_debug_info (is_mainfile))
-     {
-       load_separate_debug_files (abfd, bfd_get_filename (abfd));
- 
-@@ -5593,20 +5605,30 @@ main (int argc, char **argv)
- 	  do_follow_links = true;
- 	  break;
- 	case 'W':
-	  dump_dwarf_section_info = true;
- 	  seenflag = true;
- 	  if (optarg)
-	    dwarf_select_sections_by_letters (optarg);
-+	    {
-+	      if (dwarf_select_sections_by_letters (optarg))
-+		dump_dwarf_section_info = true;
-+	    }
- 	  else
-	    dwarf_select_sections_all ();
-+	    {
-+	      dump_dwarf_section_info = true;
-+	      dwarf_select_sections_all ();
-+	    }
- 	  break;
- 	case OPTION_DWARF:
-	  dump_dwarf_section_info = true;
- 	  seenflag = true;
- 	  if (optarg)
-	    dwarf_select_sections_by_names (optarg);
-+	    {
-+	      if (dwarf_select_sections_by_names (optarg))
-+		dump_dwarf_section_info = true;
-+	    }
- 	  else
-	    dwarf_select_sections_all ();
-+	    {
-+	      dwarf_select_sections_all ();
-+	      dump_dwarf_section_info = true;
-+	    }
- 	  break;
- 	case OPTION_DWARF_DEPTH:
- 	  {
-Only in binutils-2.38/binutils: objdump.c.orig
-diff -rup binutils.orig/binutils/readelf.c binutils-2.38/binutils/readelf.c
--- binutils.orig/binutils/readelf.c	2022-05-20 16:57:16.565961366 +0100
-+++ binutils-2.38/binutils/readelf.c	2022-05-20 16:57:32.883853675 +0100
-@@ -21900,6 +21900,26 @@ initialise_dump_sects (Filedata * fileda
-     }
- }
- 
-+static bool
-+might_need_separate_debug_info (Filedata * filedata)
-+{
-+  /* Debuginfo files do not need further separate file loading.  */
-+  if (filedata->file_header.e_shstrndx == SHN_UNDEF)
-+    return false;
-+
-+  /* Since do_follow_links might be enabled by default, only treat it as an
-+     indication that separate files should be loaded if setting it was a
-+     deliberate user action.  */
-+  if (DEFAULT_FOR_FOLLOW_LINKS == 0 && do_follow_links)
-+    return true;
-+  
-+  if (process_links || do_syms || do_unwind 
-+      || do_dump || do_debugging)
-+    return true;
-+
-+  return false;
-+}
-+
- /* Process one ELF object file according to the command line options.
-    This file may actually be stored in an archive.  The file is
-    positioned at the start of the ELF object.  Returns TRUE if no
-@@ -21983,7 +22003,7 @@ process_object (Filedata * filedata)
-   if (! process_version_sections (filedata))
-     res = false;
- 
-  if (filedata->file_header.e_shstrndx != SHN_UNDEF)
-+  if (might_need_separate_debug_info (filedata))
-     have_separate_files = load_separate_debug_files (filedata, filedata->file_name);
-   else
-     have_separate_files = false;
-Only in binutils-2.38/binutils: readelf.c.orig
-Only in binutils-2.38/binutils: readelf.c.rej
-diff -rup binutils.orig/binutils/testsuite/binutils-all/debuginfod.exp binutils-2.38/binutils/testsuite/binutils-all/debuginfod.exp
--- binutils.orig/binutils/testsuite/binutils-all/debuginfod.exp	2022-05-20 16:57:16.579961273 +0100
-+++ binutils-2.38/binutils/testsuite/binutils-all/debuginfod.exp	2022-05-20 16:57:32.883853675 +0100
-@@ -189,7 +189,7 @@ if { [regexp ".*DEBUGINFOD.*" $conf_objd
-     test_fetch_debugaltlink $OBJDUMP "-Wk"
- 
-     set test "disabling debuginfod access"
-    setup_xfail *-*-*
-+    # setup_xfail *-*-*
-     test_fetch_debuglink $OBJDUMP "-W -WE"
-     set test "debuginfod"
- 
-@@ -202,7 +202,7 @@ if { [regexp ".*DEBUGINFOD.*" $conf_read
-     test_fetch_debugaltlink $READELF "-wk"
- 
-     set test "disabling debuginfod access"
-    setup_xfail *-*-*
-+    # setup_xfail *-*-*
-     test_fetch_debuglink $READELF "-w -wE"
-     set test "debuginfod"
- 
-diff -rup binutils.orig/binutils/testsuite/binutils-all/objdump.Wk binutils-2.38/binutils/testsuite/binutils-all/objdump.Wk
--- binutils.orig/binutils/testsuite/binutils-all/objdump.Wk	2022-05-20 16:57:16.574961306 +0100
-+++ binutils-2.38/binutils/testsuite/binutils-all/objdump.Wk	2022-05-20 16:57:32.883853675 +0100
-@@ -1,8 +1,9 @@
-+#...
- tmpdir/debuglink\.o:     file format .*
-Contents of the \.gnu_debuglink section:
-+Contents of the \.gnu_debuglink section.*
-   Separate debug info file: this_is_a_debuglink\.debug
-   CRC value: 0x12345678
-Contents of the \.gnu_debugaltlink section:
-+Contents of the \.gnu_debugaltlink section.*
-   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
-diff -rup binutils.orig/binutils/testsuite/binutils-all/readelf.k binutils-2.38/binutils/testsuite/binutils-all/readelf.k
--- binutils.orig/binutils/testsuite/binutils-all/readelf.k	2022-05-20 16:57:16.575961300 +0100
-+++ binutils-2.38/binutils/testsuite/binutils-all/readelf.k	2022-05-20 16:57:32.883853675 +0100
-@@ -1,7 +1,8 @@
-Contents of the \.gnu_debuglink section:
-+#...
-+Contents of the \.gnu_debuglink section.*
-   Separate debug info file: this_is_a_debuglink\.debug
-   CRC value: 0x12345678
-Contents of the \.gnu_debugaltlink section:
-+Contents of the \.gnu_debugaltlink section.*
-   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)
--- a/binutils-package-metadata.patch
+++ b/binutils-package-metadata.patch
--- a/binutils-ppc-gas-machine-directive.patch
+++ b/binutils-ppc-gas-machine-directive.patch
@ -1,52 +0,0 @@
-From cebc89b9328eab994f6b0314c263f94e7949a553 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Mon, 21 Feb 2022 10:58:57 +1030
-Subject: [PATCH] binutils 2.38 vs. ppc32 linux kernel
-
-Commit b25f942e18d6 made .machine more strict.  Weaken it again.
-
-	* config/tc-ppc.c (ppc_machine): Treat an early .machine specially,
-	keeping sticky options to work around gcc bugs.
---
- gas/config/tc-ppc.c | 25 ++++++++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
-index 054f9c72161..89bc7d3f9b9 100644
--- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED)
- 	     options do not count as a new machine, instead they add
- 	     to currently selected opcodes.  */
- 	  ppc_cpu_t machine_sticky = 0;
-	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+	  /* Unfortunately, some versions of gcc emit a .machine
-+	     directive very near the start of the compiler's assembly
-+	     output file.  This is bad because it overrides user -Wa
-+	     cpu selection.  Worse, there are versions of gcc that
-+	     emit the *wrong* cpu, not even respecting the -mcpu given
-+	     to gcc.  See gcc pr101393.  And to compound the problem,
-+	     as of 20220222 gcc doesn't pass the correct cpu option to
-+	     gas on the command line.  See gcc pr59828.  Hack around
-+	     this by keeping sticky options for an early .machine.  */
-+	  asection *sec;
-+	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+	    {
-+	      segment_info_type *info = seg_info (sec);
-+	      /* Are the frags for this section perturbed from their
-+		 initial state?  Even .align will count here.  */
-+	      if (info != NULL
-+		  && (info->frchainP->frch_root != info->frchainP->frch_last
-+		      || info->frchainP->frch_root->fr_type != rs_fill
-+		      || info->frchainP->frch_root->fr_fix != 0))
-+		break;
-+	    }
-+	  new_cpu = ppc_parse_cpu (ppc_cpu,
-+				   sec == NULL ? &sticky : &machine_sticky,
-+				   cpu_string);
- 	  if (new_cpu != 0)
- 	    ppc_cpu = new_cpu;
- 	  else
-- 
-2.37.1
-
--- a/binutils-ppc64-DT_RELR-relocs.patch
+++ b/binutils-ppc64-DT_RELR-relocs.patch
@ -1,266 +0,0 @@
--- binutils.orig/bfd/elf64-ppc.c	2022-06-13 12:05:13.325289568 +0100
-+++ binutils-2.38/bfd/elf64-ppc.c	2022-06-13 12:05:36.080143584 +0100
-@@ -3270,10 +3270,14 @@ struct ppc_link_hash_table
-   /* The size of reliplt used by got entry relocs.  */
-   bfd_size_type got_reli_size;
- 
-  /* DT_RELR array of r_offset.  */
-+  /* DT_RELR array of section/r_offset.  */
-   size_t relr_alloc;
-   size_t relr_count;
-  bfd_vma *relr_addr;
-+  struct
-+  {
-+    asection *sec;
-+    bfd_vma off;
-+  } *relr;
- 
-   /* Statistics.  */
-   unsigned long stub_count[ppc_stub_save_res];
-@@ -13419,16 +13423,11 @@ maybe_strip_output (struct bfd_link_info
-     }
- }
- 
-static int
-compare_relr_address (const void *arg1, const void *arg2)
-{
-  bfd_vma a = *(bfd_vma *) arg1;
-  bfd_vma b = *(bfd_vma *) arg2;
-  return a < b ? -1 : a > b ? 1 : 0;
-}
-+/* Stash R_PPC64_RELATIVE reloc at input section SEC, r_offset OFF to
-+   the array of such relocs.  */
- 
- static bool
-append_relr_off (struct ppc_link_hash_table *htab, bfd_vma off)
-+append_relr_off (struct ppc_link_hash_table *htab, asection *sec, bfd_vma off)
- {
-   if (htab->relr_count >= htab->relr_alloc)
-     {
-@@ -13436,16 +13435,51 @@ append_relr_off (struct ppc_link_hash_ta
- 	htab->relr_alloc = 4096;
-       else
- 	htab->relr_alloc *= 2;
-      htab->relr_addr
-	= bfd_realloc (htab->relr_addr,
-		       htab->relr_alloc * sizeof (htab->relr_addr[0]));
-      if (htab->relr_addr == NULL)
-+      htab->relr = bfd_realloc (htab->relr,
-+				htab->relr_alloc * sizeof (*htab->relr));
-+      if (htab->relr == NULL)
- 	return false;
-     }
-  htab->relr_addr[htab->relr_count++] = off;
-+  htab->relr[htab->relr_count].sec = sec;
-+  htab->relr[htab->relr_count].off = off;
-+  htab->relr_count++;
-   return true;
- }
- 
-+/* qsort comparator for bfd_vma args.  */
-+
-+static int
-+compare_relr_address (const void *arg1, const void *arg2)
-+{
-+  bfd_vma a = *(bfd_vma *) arg1;
-+  bfd_vma b = *(bfd_vma *) arg2;
-+  return a < b ? -1 : a > b ? 1 : 0;
-+}
-+
-+/* Produce a malloc'd sorted array of reloc addresses from the info
-+   stored by append_relr_off.  */
-+
-+static bfd_vma *
-+sort_relr (struct ppc_link_hash_table *htab)
-+{
-+  bfd_vma *addr = bfd_malloc (htab->relr_count * sizeof (*addr));
-+  if (addr == NULL)
-+    return NULL;
-+
-+  for (size_t i = 0; i < htab->relr_count; i++)
-+    addr[i] = (htab->relr[i].sec->output_section->vma
-+	       + htab->relr[i].sec->output_offset
-+	       + htab->relr[i].off);
-+
-+  if (htab->relr_count > 1)
-+    qsort (addr, htab->relr_count, sizeof (*addr), compare_relr_address);
-+
-+  return addr;
-+}
-+
-+/* Look over GOT and PLT entries saved on elf_local_got_ents for all
-+   input files, stashing info about needed relative relocs.  */
-+
- static bool
- got_and_plt_relr_for_local_syms (struct bfd_link_info *info)
- {
-@@ -13493,10 +13527,7 @@ got_and_plt_relr_for_local_syms (struct
- 	      && isym->st_shndx != SHN_ABS)
- 	    {
- 	      asection *got = ppc64_elf_tdata (gent->owner)->got;
-	      bfd_vma r_offset = (got->output_section->vma
-				  + got->output_offset
-				  + gent->got.offset);
-	      if (!append_relr_off (htab, r_offset))
-+	      if (!append_relr_off (htab, got, gent->got.offset))
- 		{
- 		  htab->stub_error = true;
- 		  return false;
-@@ -13511,10 +13542,7 @@ got_and_plt_relr_for_local_syms (struct
- 	    if (pent->plt.offset != (bfd_vma) -1
- 		&& ELF_ST_TYPE (isym->st_info) != STT_GNU_IFUNC)
- 	      {
-		bfd_vma r_offset = (pent->plt.offset
-				    + htab->pltlocal->output_offset
-				    + htab->pltlocal->output_section->vma);
-		if (!append_relr_off (htab, r_offset))
-+		if (!append_relr_off (htab, htab->pltlocal, pent->plt.offset))
- 		  {
- 		    if (symtab_hdr->contents != (unsigned char *) local_syms)
- 		      free (local_syms);
-@@ -13534,6 +13562,9 @@ got_and_plt_relr_for_local_syms (struct
-   return true;
- }
- 
-+/* Stash info about needed GOT and PLT entry relative relocs for
-+   global symbol H.  */
-+
- static bool
- got_and_plt_relr (struct elf_link_hash_entry *h, void *inf)
- {
-@@ -13565,10 +13596,7 @@ got_and_plt_relr (struct elf_link_hash_e
- 	      && gent->got.offset != (bfd_vma) -1)
- 	    {
- 	      asection *got = ppc64_elf_tdata (gent->owner)->got;
-	      bfd_vma r_offset = (got->output_section->vma
-				  + got->output_offset
-				  + gent->got.offset);
-	      if (!append_relr_off (htab, r_offset))
-+	      if (!append_relr_off (htab, got, gent->got.offset))
- 		{
- 		  htab->stub_error = true;
- 		  return false;
-@@ -13580,10 +13608,7 @@ got_and_plt_relr (struct elf_link_hash_e
- 	for (pent = h->plt.plist; pent != NULL; pent = pent->next)
- 	  if (pent->plt.offset != (bfd_vma) -1)
- 	    {
-	      bfd_vma r_offset = (htab->pltlocal->output_section->vma
-				  + htab->pltlocal->output_offset
-				  + pent->plt.offset);
-	      if (!append_relr_off (htab, r_offset))
-+	      if (!append_relr_off (htab, htab->pltlocal, pent->plt.offset))
- 		{
- 		  htab->stub_error = true;
- 		  return false;
-@@ -13861,9 +13886,7 @@ ppc64_elf_size_stubs (struct bfd_link_in
- 							  irela->r_offset);
- 		      if (r_offset >= (bfd_vma) -2)
- 			continue;
-		      r_offset += (section->output_section->vma
-				   + section->output_offset);
-		      if (!append_relr_off (htab, r_offset))
-+		      if (!append_relr_off (htab, section, r_offset))
- 			goto error_ret_free_internal;
- 		      continue;
- 		    }
-@@ -14214,9 +14237,7 @@ ppc64_elf_size_stubs (struct bfd_link_in
- 	  bfd_vma r_offset;
- 
- 	  for (r_offset = 0; r_offset < htab->brlt->size; r_offset += 8)
-	    if (!append_relr_off (htab, (r_offset
-					 + htab->brlt->output_section->vma
-					 + htab->brlt->output_offset)))
-+	    if (!append_relr_off (htab, htab->brlt, r_offset))
- 	      return false;
- 
- 	  if (!got_and_plt_relr_for_local_syms (info))
-@@ -14225,28 +14246,28 @@ ppc64_elf_size_stubs (struct bfd_link_in
- 	  if (htab->stub_error)
- 	    return false;
- 
-	  if (htab->relr_count > 1)
-	    qsort (htab->relr_addr, htab->relr_count, sizeof (*htab->relr_addr),
-		   compare_relr_address);
-+	  bfd_vma *relr_addr = sort_relr (htab);
-+	  if (htab->relr_count != 0 && relr_addr == NULL)
-+	    return false;
- 
- 	  size_t i = 0;
- 	  while (i < htab->relr_count)
- 	    {
-	      bfd_vma base = htab->relr_addr[i];
-+	      bfd_vma base = relr_addr[i];
- 	      htab->elf.srelrdyn->size += 8;
- 	      i++;
- 	      /* Handle possible duplicate address.  This can happen
- 		 as sections increase in size when adding stubs.  */
- 	      while (i < htab->relr_count
-		     && htab->relr_addr[i] == base)
-+		     && relr_addr[i] == base)
- 		i++;
- 	      base += 8;
- 	      while (1)
- 		{
- 		  size_t start_i = i;
- 		  while (i < htab->relr_count
-			 && htab->relr_addr[i] - base < 63 * 8
-			 && (htab->relr_addr[i] - base) % 8 == 0)
-+			 && relr_addr[i] - base < 63 * 8
-+			 && (relr_addr[i] - base) % 8 == 0)
- 		    i++;
- 		  if (i == start_i)
- 		    break;
-@@ -14254,6 +14275,7 @@ ppc64_elf_size_stubs (struct bfd_link_in
- 		  base += 63 * 8;
- 		}
- 	    }
-+	  free (relr_addr);
- 	}
- 
-       for (group = htab->group; group != NULL; group = group->next)
-@@ -15193,17 +15215,21 @@ ppc64_elf_build_stubs (struct bfd_link_i
-       if (htab->elf.srelrdyn->contents == NULL)
- 	return false;
- 
-+      bfd_vma *relr_addr = sort_relr (htab);
-+      if (htab->relr_count != 0 && relr_addr == NULL)
-+	return false;
-+
-       size_t i = 0;
-       bfd_byte *loc = htab->elf.srelrdyn->contents;
-       while (i < htab->relr_count)
- 	{
-	  bfd_vma base = htab->relr_addr[i];
-+	  bfd_vma base = relr_addr[i];
- 	  BFD_ASSERT (base % 2 == 0);
- 	  bfd_put_64 (htab->elf.dynobj, base, loc);
- 	  loc += 8;
- 	  i++;
- 	  while (i < htab->relr_count
-		 && htab->relr_addr[i] == base)
-+		 && relr_addr[i] == base)
- 	    {
- 	      htab->stub_error = true;
- 	      i++;
-@@ -15213,10 +15239,10 @@ ppc64_elf_build_stubs (struct bfd_link_i
- 	    {
- 	      bfd_vma bits = 0;
- 	      while (i < htab->relr_count
-		     && htab->relr_addr[i] - base < 63 * 8
-		     && (htab->relr_addr[i] - base) % 8 == 0)
-+		     && relr_addr[i] - base < 63 * 8
-+		     && (relr_addr[i] - base) % 8 == 0)
- 		{
-		  bits |= (bfd_vma) 1 << ((htab->relr_addr[i] - base) / 8);
-+		  bits |= (bfd_vma) 1 << ((relr_addr[i] - base) / 8);
- 		  i++;
- 		}
- 	      if (bits == 0)
-@@ -15226,6 +15252,7 @@ ppc64_elf_build_stubs (struct bfd_link_i
- 	      base += 63 * 8;
- 	    }
- 	}
-+      free (relr_addr);
-       /* Pad any excess with 1's, a do-nothing encoding.  */
-       while ((size_t) (loc - htab->elf.srelrdyn->contents)
- 	     < htab->elf.srelrdyn->size)
--- a/binutils-readelf-other-sym-info.patch
+++ b/binutils-readelf-other-sym-info.patch
@ -1,35 +0,0 @@
--- binutils.orig/binutils/readelf.c	2020-07-24 15:08:30.317597020 +0100
-+++ binutils-2.35/binutils/readelf.c	2020-07-24 15:09:39.029155552 +0100
-@@ -12069,11 +12069,13 @@ print_dynamic_symbol (Filedata *filedata
-       unsigned int vis = ELF_ST_VISIBILITY (psym->st_other);
- 
-       printf (" %-7s", get_symbol_visibility (vis));
-+#if 0
-       /* Check to see if any other bits in the st_other field are set.
- 	 Note - displaying this information disrupts the layout of the
- 	 table being generated, but for the moment this case is very rare.  */
-       if (psym->st_other ^ vis)
- 	printf (" [%s] ", get_symbol_other (filedata, psym->st_other ^ vis));
-+#endif
-     }
-   printf (" %4s ", get_symbol_index_type (filedata, psym->st_shndx));
- 
-@@ -12112,7 +12114,17 @@ print_dynamic_symbol (Filedata *filedata
- 		version_string);
-     }
- 
-  putchar ('\n');
-+#if 1
-+    {
-+      unsigned int vis = ELF_ST_VISIBILITY (psym->st_other);
-+
-+      /* Check to see if any other bits in the st_other field are set.  */
-+      if (psym->st_other ^ vis)
-+	printf (" \t[%s]", get_symbol_other (filedata, psym->st_other ^ vis));
-+    }
-+#endif
-+
-+    putchar ('\n');
- 
-   if (ELF_ST_BIND (psym->st_info) == STB_LOCAL
-       && section != NULL
--- a/binutils-remove-ld-protected-func-2-test.patch
+++ b/binutils-remove-ld-protected-func-2-test.patch
@ -0,0 +1,33 @@
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-with-gold-2.45.50-96b8a8a633a/ld/testsuite/ld-x86-64/x86-64.exp
+--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2025-11-20 12:02:23.738336155 +0000
+++ binutils-with-gold-2.45.50-96b8a8a633a/ld/testsuite/ld-x86-64/x86-64.exp	2025-11-20 12:03:17.894485264 +0000
+@@ -1413,14 +1413,6 @@ if { [isnative] && [check_compiler_avail
+ 	    "libprotected-func-2b.so" \
+ 	] \
+ 	[list \
+-	    "Build protected-func-2 without PIE" \
+-	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libprotected-func-2b.so" \
+-	    "$DIRECT_EXTERN_ACCESS_CFLAGS $NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
+-	    { protected-func-1b.c } \
+-	    {} \
+-	    "protected-func-2" \
+-	] \
+-	[list \
+ 	    "Build libprotected-func-2c.so" \
+ 	    "-shared" \
+ 	    "-fPIC -Wa,-mx86-used-note=yes" \
+@@ -1429,14 +1421,6 @@ if { [isnative] && [check_compiler_avail
+ 	    "libprotected-func-2c.so" \
+ 	] \
+ 	[list \
+-	    "Build protected-func-2a without PIE" \
+-	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libprotected-func-2c.so" \
+-	    "$DIRECT_EXTERN_ACCESS_CFLAGS $NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
+-	    { protected-func-1b.c } \
+-	    {} \
+-	    "protected-func-2a" \
+-	] \
+-	[list \
+ 	    "Build libprotected-data-1a.so" \
+ 	    "-shared -z noindirect-extern-access" \
+ 	    "-fPIC -Wa,-mx86-used-note=yes" \
--- a/binutils-revert-PLT-elision.patch
+++ b/binutils-revert-PLT-elision.patch
@ -123,82 +123,6 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830b-now.d binutils-2.29.1/ld
 0+18 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144
   DW_CFA_nop
   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038a.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038a.d	2017-11-15 13:32:39.408064384 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a.d	2017-11-15 15:19:48.097433680 +0000
-@@ -19,7 +19,8 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-
-+#pass
-+  
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4
-   DW_CFA_nop
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038a-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a-now.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038a-now.d	2017-11-15 13:32:39.401064469 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a-now.d	2017-11-15 15:10:56.077760324 +0000
-@@ -20,7 +20,8 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-
-+#pass
-+  
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4
-   DW_CFA_nop
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038b.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038b.d	2017-11-15 13:32:39.405064420 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b.d	2017-11-15 15:10:42.828916844 +0000
-@@ -19,6 +19,7 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-+#pass
- 
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001d8..00000000000001dd
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038b-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b-now.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038b-now.d	2017-11-15 13:32:39.416064288 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b-now.d	2017-11-15 15:11:11.550577531 +0000
-@@ -20,7 +20,8 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-
-+#pass
-+  
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001d8..00000000000001dd
-   DW_CFA_nop
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038c.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038c.d	2017-11-15 13:32:39.411064348 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c.d	2017-11-15 15:09:52.664509478 +0000
-@@ -19,7 +19,8 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-
-+#pass
-+  
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=0000000000000220..0000000000000231
-   DW_CFA_nop
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038c-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c-now.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038c-now.d	2017-11-15 13:32:39.413064324 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c-now.d	2017-11-15 15:11:22.975442559 +0000
-@@ -20,7 +20,8 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-
-+#pass
-+  
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=0000000000000220..0000000000000231
-   DW_CFA_nop
-   DW_CFA_nop
 diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd
 --- binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd	2017-11-15 13:32:39.417064276 +0000
 +++ binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd	2017-11-15 15:05:02.950932110 +0000
--- a/binutils-riscv-testsuite-fixes.patch
+++ b/binutils-riscv-testsuite-fixes.patch
@ -0,0 +1,269 @@
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/attr-phdr.d binutils-2.40/ld/testsuite/ld-riscv-elf/attr-phdr.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/attr-phdr.d	2023-02-16 10:11:38.656875289 +0000
+++ binutils-2.40/ld/testsuite/ld-riscv-elf/attr-phdr.d	2023-02-16 10:49:26.786573665 +0000
+@@ -12,8 +12,8 @@ Program Headers:
+   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
+   RISCV_ATTRIBUT .*
+   LOAD           .*
+-
+#...
+  Section to Segment mapping:
+   Segment Sections...
+    00     .riscv.attributes 
+-   01     .text 
+#pass
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2023-02-16 10:11:38.659875285 +0000
+++ binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2023-02-16 10:42:54.803431287 +0000
+@@ -8,7 +8,7 @@
+ Disassembly of section \.text:
+ 
+ 0+[0-9a-f]+ <_start>:
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,[0-9]+
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
+ .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	]+ra,[0-9a-f]+ <_start>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2023-02-16 10:11:38.659875285 +0000
+++ binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2023-02-16 10:43:49.540306593 +0000
+@@ -11,5 +11,5 @@ Disassembly of section .text:
+ [0-9a-f]+ <_start>:
+ .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1.*
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,gp.*<data_a>
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1.*<data_b>
+.*:[ 	]+[0-9a-f]+[ 	]+mv[ 	]+a1,a1
+ #pass
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d binutils-2.40/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d	2023-02-16 10:11:38.659875285 +0000
+++ binutils-2.40/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d	2023-02-16 10:46:55.570899994 +0000
+@@ -2,4 +2,5 @@
+ #source: pcrel-lo-addend-2a.s
+ #as: -march=rv32ic
+ #ld: -m[riscv_choose_ilp32_emul] --no-relax
+#skip: *-*-*
+ #error: .*dangerous relocation: %pcrel_lo overflow with an addend, the value of %pcrel_hi is 0x1000 without any addend, but may be 0x2000 after adding the %pcrel_lo addend
+diff -rup binutils.orig/ld/testsuite/ld-elf/dwarf.exp binutils-2.40/ld/testsuite/ld-elf/dwarf.exp
+--- binutils.orig/ld/testsuite/ld-elf/dwarf.exp	2023-02-16 10:11:38.515875516 +0000
+++ binutils-2.40/ld/testsuite/ld-elf/dwarf.exp	2023-02-16 11:08:52.209377332 +0000
+@@ -29,6 +29,10 @@ if ![is_elf_format] {
+     return
+ }
+ 
+if { [istarget riscv*-*-*] } then {
+    return
+}
+
+ # Skip targets where -shared is not supported
+ 
+ if ![check_shared_lib_support] {
+diff -rup binutils.orig/ld/testsuite/ld-elf/tls.exp binutils-2.40/ld/testsuite/ld-elf/tls.exp
+--- binutils.orig/ld/testsuite/ld-elf/tls.exp	2023-02-16 10:11:38.540875476 +0000
+++ binutils-2.40/ld/testsuite/ld-elf/tls.exp	2023-02-16 11:08:56.944369374 +0000
+@@ -28,6 +28,10 @@ if { !([istarget *-*-linux*]
+     return
+ }
+ 
+if { [istarget riscv*-*-*] } then {
+    return
+}
+
+ # Check to see if the C compiler works.
+ if { ![check_compiler_available] } {
+     return
+--- binutils.orig/binutils/testsuite/binutils-all/objcopy.exp	2023-08-24 07:48:30.429195480 +0100
+++ binutils-2.41/binutils/testsuite/binutils-all/objcopy.exp	2023-08-24 07:57:05.535302711 +0100
+@@ -1409,6 +1409,8 @@ proc objcopy_test_without_global_symbol
+ # The AArch64 and ARM targets preserve mapping symbols
+ # in object files, so they will fail this test.
+ setup_xfail aarch64*-*-* arm*-*-*
+# The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
+setup_xfail riscv*-*-* 
+ 
+ objcopy_test_without_global_symbol
+ 
+--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp	2023-08-24 07:48:31.808196076 +0100
+++ binutils-2.41/ld/testsuite/ld-plugin/plugin.exp	2023-08-24 07:59:30.285716568 +0100
+@@ -132,6 +132,10 @@ if [is_pecoff_format] {
+     append libs " --image-base=0x10000000"
+ }
+ 
+if { [istarget riscv*-*-*] } then {
+    return
+}
+
+ set plugin_tests [list \
+     [list "load plugin" "-plugin $plugin_path \
+     $testobjfiles $libs" "" "" "" {{ld plugin-1.d}} "main.x" ] \
+--- binutils.orig/binutils/testsuite/binutils-all/compress.exp	2023-12-11 10:09:16.923374463 +0000
+++ binutils-2.41/binutils/testsuite/binutils-all/compress.exp	2023-12-12 09:00:15.150036675 +0000
+@@ -818,6 +818,10 @@ proc test_gnu_debuglink {} {
+     }
+ }
+ 
+if { [istarget riscv*-*-*] } then {
+    return
+}
+
+ if {[is_elf_format]} then {
+     test_gnu_debuglink
+ }
+--- binutils-2.41/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2023-07-03 00:00:00.000000000 +0100
+++ binutils.new/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2023-12-12 11:52:54.564057931 +0000
+@@ -8,10 +8,10 @@
+ Disassembly of section \.text:
+ 
+ 0+[0-9a-f]+ <_start>:
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,[0-9]+
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
+ .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	        ]+ra,[0-9a-f]+ <_start>
+ .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1,0x[0-9a-f]+
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,[0-9]+ # [0-9a-f]+ <data_g>
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,\-[0-9]+ # [0-9a-f]+ <data_g>
+ .*:[ 	]+[0-9a-f]+[ 	]+lui[ 	        ]+a2,0x[0-9a-f]+
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,a2,[0-9]+ # [0-9a-f]+ <data_g>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a3,tp,0 # 0 <data_t>
+--- binutils.orig/binutils/testsuite/binutils-all/objcopy.exp	2023-12-12 14:21:10.225342926 +0000
+++ binutils-2.41/binutils/testsuite/binutils-all/objcopy.exp	2023-12-12 14:22:12.453421499 +0000
+@@ -1410,7 +1410,7 @@ proc objcopy_test_without_global_symbol
+ # in object files, so they will fail this test.
+ setup_xfail aarch64*-*-* arm*-*-*
+ # The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
+-setup_xfail riscv*-*-* 
+# setup_xfail riscv*-*-* 
+ 
+ objcopy_test_without_global_symbol
+ 
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2024-10-03 15:21:47.926570551 +0100
+++ binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2024-10-03 15:24:26.152502612 +0100
+@@ -8,10 +8,10 @@
+ Disassembly of section \.text:
+ 
+ 0+[0-9a-f]+ <_start>:
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,.*
+ .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	        ]+ra,[0-9a-f]+ <_start>
+ .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1,0x[0-9a-f]+
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,\-[0-9]+ # [0-9a-f]+ <data_g>
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,.*
+ .*:[ 	]+[0-9a-f]+[ 	]+lui[ 	        ]+a2,0x[0-9a-f]+
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,a2,[0-9]+ # [0-9a-f]+ <data_g>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a3,tp,0 # 0 <data_t>
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2024-10-03 15:21:47.926570551 +0100
+++ binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2024-10-03 15:23:54.512530979 +0100
+@@ -8,7 +8,7 @@
+ Disassembly of section \.text:
+ 
+ 0+[0-9a-f]+ <_start>:
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,.*
+ .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	]+ra,[0-9a-f]+ <_start>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2024-10-03 15:21:47.926570551 +0100
+++ binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2024-10-03 15:25:01.687468496 +0100
+@@ -11,5 +11,5 @@ Disassembly of section .text:
+ [0-9a-f]+ <_start>:
+ .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1.*
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,gp.*<data_a>
+-.*:[ 	]+[0-9a-f]+[ 	]+mv[ 	]+a1,a1
+.*:[ 	]+[0-9a-f]+[ 	]+.*
+ #pass
+--- binutils-with-gold-2.45.50-79b2b564fec.orig/ld/testsuite/ld-riscv-elf/zicfilp-unlabeled-plt.d	2025-09-09 15:52:30.684689609 +0100
+++ binutils-with-gold-2.45.50-79b2b564fec/ld/testsuite/ld-riscv-elf/zicfilp-unlabeled-plt.d	2025-09-09 15:53:12.837859447 +0100
+@@ -30,6 +30,6 @@ Disassembly of section \.plt:
+ 
+ [0-9a-f]+ <bar@plt>:
+ .*:[ 	]+[0-9a-f]+[ 	]+lpad[ 	]+0x0
+-.*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+t3,0x1
+.*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+t3,0x[0-9a-f]+
+ .*:[ 	]+[0-9a-f]+[ 	]+ld[ 	]+t3,[0-9]+\(t3\) # [0-9a-f]+ <bar>
+ .*:[ 	]+[0-9a-f]+[ 	]+jalr[ 	]+t1,t3
+diff -rup binutils-with-gold-2.45.50-beab972c07d,orig/binutils/testsuite/binutils-all/objcopy.exp binutils-with-gold-2.45.50-beab972c07d/binutils/testsuite/binutils-all/objcopy.exp
+--- binutils-with-gold-2.45.50-beab972c07d,orig/binutils/testsuite/binutils-all/objcopy.exp	2025-12-02 12:47:19.063123207 +0000
+++ binutils-with-gold-2.45.50-beab972c07d/binutils/testsuite/binutils-all/objcopy.exp	2025-12-04 12:39:26.079989597 +0000
+@@ -602,14 +602,19 @@ proc strip_test { } {
+     set exec_output [binutils_run $STRIP "$STRIPFLAGS $objfile"]
+     set exec_output [prune_warnings $exec_output]
+     if ![string equal "" $exec_output] {
+-	fail $test
+	fail "$test (warnings in linker output)"
+	verbose $exec_output
+ 	return
+     }
+ 
+     set exec_output [binutils_run $NM "-a $NMFLAGS $objfile"]
+     set exec_output [prune_warnings $exec_output]
+     if ![string match "*: no symbols*" $exec_output] {
+-	fail $test
+
+	# The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
+	setup_xfail riscv*-*-* 
+
+	fail "$test (symbols in nm output)"
+ 	return
+     }
+ 
+@@ -659,6 +664,9 @@ proc strip_test_with_saving_a_symbol { }
+     pass $test
+ }
+ 
+# The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
+setup_xfail riscv*-*-* 
+
+ strip_test_with_saving_a_symbol
+ 
+ # Test stripping an archive.
+@@ -1503,7 +1519,7 @@ proc objcopy_test_without_global_symbol
+ # in object files, so they will fail this test.
+ setup_xfail aarch64*-*-* arm*-*-*
+ # The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
+-# setup_xfail riscv*-*-* 
+setup_xfail riscv*-*-* 
+ 
+ objcopy_test_without_global_symbol
+ 
+diff -rup binutils-with-gold-2.45.50-beab972c07d,orig/ld/testsuite/lib/ld-lib.exp binutils-with-gold-2.45.50-beab972c07d/ld/testsuite/lib/ld-lib.exp
+--- binutils-with-gold-2.45.50-beab972c07d,orig/ld/testsuite/lib/ld-lib.exp	2025-12-02 12:47:19.201090894 +0000
+++ binutils-with-gold-2.45.50-beab972c07d/ld/testsuite/lib/ld-lib.exp	2025-12-03 09:30:07.184360005 +0000
+@@ -1633,6 +1633,12 @@ proc compile_one_cc { src output additio
+ proc check_ctf_available { } {
+     global ctf_available_saved
+ 
+    # Skip CTF tests for the Risc-V target for now, as the
+    # tests have not been tweaked to support the riscv format.
+    if { [istarget "riscv*-*-linux*"] } {
+	return 0
+    }
+    
+     if {![info exists ctf_available_saved]} {
+ 	set ctf_available_saved 0
+ 
+--- fred/binutils/testsuite/lib/binutils-common.exp	2026-03-16 09:18:37.205413649 +0000
+++ binutils-with-gold-2.46.50-d712202846b/binutils/testsuite/lib/binutils-common.exp	2026-03-16 09:18:49.559358668 +0000
+@@ -803,6 +803,9 @@ proc prune_warnings_extra { text } {
+     # Ignore warnings about linking objects with an old sframe format
+     regsub -all {(^|\n)([^\n]* unexpected SFrame format version [^\n]*\n[^\n]* SFrame section ignored\n?)+} $text {\1} text
+ 
+    # Skip warnings about the LTO plugin being needed.
+    regsub -all "(^|\n)(\[^\n\]*:\[^\n\]*plugin needed to handle lto object\[^\n\]*\n?)+" $text "\\1" text
+    
+     return $text
+ }
+ 
+--- binutils.orig/ld/testsuite/ld-elf/shared.exp	2026-06-10 15:32:21.012274073 +0100
+++ binutils-with-gold-2.46.50-48997323b0f/ld/testsuite/ld-elf/shared.exp	2026-06-10 15:34:41.397899263 +0100
+@@ -1859,6 +1859,10 @@ run_cc_link_tests [list \
+ 	"pr29655.so" \
+     ] \
+ ]
+
+# FIXME: Find out why the Risc-V fails this test.
+setup_xfail "riscv64-*-*"
+
+ # PR 29655 (cont.): Check that in PIC code linked as PDE taking the address
+ # of a function defined in a DSO results in the function address (from GOT)
+ # and not the "canonical PLT" address from the PDE.
--- a/binutils-s390x-static-PIE.patch
+++ b/binutils-s390x-static-PIE.patch
@ -1,142 +0,0 @@
-diff -rup binutils-2.38/bfd/elf64-s390.c binutils-2.38.new/bfd/elf64-s390.c
--- binutils-2.38/bfd/elf64-s390.c	2022-01-22 12:14:07.000000000 +0000
-+++ binutils-2.38.new/bfd/elf64-s390.c	2022-05-19 11:07:33.353913654 +0100
-@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link
- 			 int r_type,
- 			 int is_local)
- {
-  if (bfd_link_pic (info))
-+  if (bfd_link_dll (info))
-     return r_type;
- 
-   switch (r_type)
-@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	case R_390_TLS_GOTIE20:
- 	case R_390_TLS_GOTIE64:
- 	case R_390_TLS_IEENT:
-	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
- 
-@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
- 	    break;
- 
-	  if (!bfd_link_pic (info))
-+	  if (!bfd_link_dll (info))
- 	    break;
- 	  info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
-@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash
-      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
-      we can save the dynamic TLS relocation.  */
-   if (h->got.refcount > 0
-      && !bfd_link_pic (info)
-+      && !bfd_link_dll (info)
-       && h->dynindx == -1
-       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
-     {
-@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *out
-       else if (startswith (bfd_section_name (s), ".rela"))
- 	{
- 	  if (s->size != 0 && s != htab->elf.srelplt)
-	    relocs = true;
-+	    {
-+	      relocs = true;
-+	      if (s == htab->elf.irelplt)
-+		{
-+		  /* In static-pie case, there are IRELATIVE-relocs in
-+		     .rela.iplt (htab->irelplt), which will later be grouped
-+		     to .rela.plt.  On s390, the IRELATIVE relocations are
-+		     always located in .rela.iplt - even for non-static case.
-+		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-+		     to the dynamic section even if htab->srelplt->size == 0.
-+		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
-+		  htab->elf.dt_jmprel_required = true;
-+		}
-+	    }
- 
- 	  /* We use the reloc_count field as a counter if we need
- 	     to copy relocs into the output file.  */
-@@ -2662,7 +2675,7 @@ elf_s390_relocate_section (bfd *output_b
- 
- 	  /* Relocations for tls literal pool entries.  */
- 	case R_390_TLS_IE64:
-	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    {
- 	      Elf_Internal_Rela outrel;
- 	      asection *sreloc;
-@@ -2690,7 +2703,7 @@ elf_s390_relocate_section (bfd *output_b
- 	  else if (h != NULL)
- 	    {
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
-	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
-+	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
- 		r_type = R_390_TLS_LE64;
- 	    }
- 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
-@@ -2801,14 +2814,14 @@ elf_s390_relocate_section (bfd *output_b
- 	      if (local_got_offsets == NULL)
- 		abort();
- 	      off = local_got_offsets[r_symndx];
-	      if (bfd_link_pic (info))
-+	      if (bfd_link_dll (info))
- 		goto emit_tls_relocs;
- 	    }
- 	  else
- 	    {
- 	      off = h->got.offset;
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
-	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
-+	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
- 		goto emit_tls_relocs;
- 	    }
- 
-@@ -2825,7 +2838,7 @@ elf_s390_relocate_section (bfd *output_b
- 	  break;
- 
- 	case R_390_TLS_LDM64:
-	  if (! bfd_link_pic (info))
-+	  if (! bfd_link_dll (info))
- 	    /* The literal pool entry this relocation refers to gets ignored
- 	       by the optimized code of the local exec model. Do nothing
- 	       and the value will turn out zero.  */
-@@ -2900,7 +2913,7 @@ elf_s390_relocate_section (bfd *output_b
- 	  continue;
- 
- 	case R_390_TLS_LDO64:
-	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
-+	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
- 	    relocation -= dtpoff_base (info);
- 	  else
- 	    /* When converting LDO to LE, we must negate.  */
-@@ -2922,7 +2935,7 @@ elf_s390_relocate_section (bfd *output_b
- 
- 	  if (r_type == R_390_TLS_LOAD)
- 	    {
-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* IE->LE transition. Four valid cases:
- 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
-@@ -2972,7 +2985,7 @@ elf_s390_relocate_section (bfd *output_b
- 		  invalid_tls_insn (input_bfd, input_section, rel);
- 		  return false;
- 		}
-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* GD->LE transition.
- 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
-@@ -2991,7 +3004,7 @@ elf_s390_relocate_section (bfd *output_b
- 	    }
- 	  else if (r_type == R_390_TLS_LDCALL)
- 	    {
-	      if (!bfd_link_pic (info))
-+	      if (!bfd_link_dll (info))
- 		{
- 		  unsigned int insn0, insn1;
- 
-Only in binutils-2.38.new/bfd/: elf64-s390.c.orig
--- a/binutils-section-type.patch
+++ b/binutils-section-type.patch
@ -1,369 +0,0 @@
-diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
-index 3b2a4f49a9b..78a0a1dea42 100644
--- a/bfd/bfd-in2.h
-+++ b/bfd/bfd-in2.h
-@@ -1170,6 +1170,9 @@ typedef struct bfd_section
-     This is used when support for non-contiguous memory regions is enabled.  */
-  struct bfd_section *already_assigned;
- 
-+  /* Explicitly specified section type, if non-zero. */
-+  unsigned int type;
-+
- } asection;
- 
- /* Relax table contains information about instructions which can
-@@ -1352,8 +1355,8 @@ discarded_section (const asection *sec)
-   /* symbol,                    symbol_ptr_ptr,                     */ \
-      (struct bfd_symbol *) SYM, &SEC.symbol,                           \
-                                                                        \
-  /* map_head, map_tail, already_assigned                           */ \
-     { NULL }, { NULL }, NULL                                          \
-+  /* map_head, map_tail, already_assigned, type                     */ \
-+     { NULL }, { NULL }, NULL, 0                                       \
-                                                                        \
-     }
- 
-diff --git a/bfd/elf.c b/bfd/elf.c
-index a67415e76e1..82b53be99f9 100644
--- a/bfd/elf.c
-+++ b/bfd/elf.c
-@@ -3280,7 +3280,9 @@ elf_fake_sections (bfd *abfd, asection *asect, void *fsarg)
- 
-   /* If the section type is unspecified, we set it based on
-      asect->flags.  */
-  if ((asect->flags & SEC_GROUP) != 0)
-+  if (asect->type != 0)
-+    sh_type = asect->type;
-+  else if ((asect->flags & SEC_GROUP) != 0)
-     sh_type = SHT_GROUP;
-   else
-     sh_type = bfd_elf_get_default_section_type (asect->flags);
-diff --git a/bfd/section.c b/bfd/section.c
-index 899438a1c5e..2de7dbf661a 100644
--- a/bfd/section.c
-+++ b/bfd/section.c
-@@ -737,8 +737,8 @@ CODE_FRAGMENT
- .  {* symbol,                    symbol_ptr_ptr,                     *}	\
- .     (struct bfd_symbol *) SYM, &SEC.symbol,				\
- .									\
-.  {* map_head, map_tail, already_assigned                           *}	\
-.     { NULL }, { NULL }, NULL						\
-+.  {* map_head, map_tail, already_assigned, type                     *}	\
-+.     { NULL }, { NULL }, NULL, 0						\
- .									\
- .    }
- .
-diff --git a/ld/NEWS b/ld/NEWS
-index dbb402d1f8a..a498abaf0f9 100644
--- a/ld/NEWS
-+++ b/ld/NEWS
-@@ -1,5 +1,8 @@
- -*- text -*-
- 
-+* TYPE=<type> is now supported in an output section description to set the
-+  section type value.
-+
- Changes in 2.38:
- 
- * Add -z pack-relative-relocs/-z no pack-relative-relocs to x86 ELF
-diff --git a/ld/ld.texi b/ld/ld.texi
-index fc75e9b3625..d57e9221410 100644
--- a/ld/ld.texi
-+++ b/ld/ld.texi
-@@ -5483,13 +5483,23 @@ loaded into memory when the program is run.
- @item READONLY
- The section should be marked as read-only.
- @item DSECT
-@itemx COPY
-@itemx INFO
-@itemx OVERLAY
-+@item COPY
-+@item INFO
-+@item OVERLAY
- These type names are supported for backward compatibility, and are
- rarely used.  They all have the same effect: the section should be
- marked as not allocatable, so that no memory is allocated for the
- section when the program is run.
-+@item TYPE = @var{type}
-+Set the section type to the integer @var{type}. When generating an ELF
-+output file, type names @code{SHT_PROGBITS}, @code{SHT_STRTAB},
-+@code{SHT_NOTE}, @code {SHT_NOBITS}, @code{SHT_INIT_ARRAY},
-+@code{SHT_FINI_ARRAY}, and @code{SHT_PREINIT_ARRAY} are also allowed
-+for @var{type}.  It is the user's responsibility to ensure that any
-+special requirements of the section type are met.
-+@item READONLY ( TYPE = @var{type} )
-+This form of the syntax combines the @var{READONLY} type with the
-+type specified by @var{type}.
- @end table
- 
- @kindex NOLOAD
-diff --git a/ld/ldgram.y b/ld/ldgram.y
-index 11c2f219c05..3a904e39482 100644
--- a/ld/ldgram.y
-+++ b/ld/ldgram.y
-@@ -47,6 +47,7 @@
- #endif
- 
- static enum section_type sectype;
-+static etree_type *sectype_value;
- static lang_memory_region_type *region;
- 
- static bool ldgram_had_keep = false;
-@@ -139,6 +140,7 @@ static int error_index;
- %token LD_FEATURE
- %token NOLOAD DSECT COPY INFO OVERLAY
- %token READONLY
-+%token TYPE
- %token DEFINED TARGET_K SEARCH_DIR MAP ENTRY
- %token <integer> NEXT
- %token SIZEOF ALIGNOF ADDR LOADADDR MAX_K MIN_K
-@@ -1058,9 +1060,8 @@ section:	NAME
- 			{
- 			  ldlex_popstate ();
- 			  ldlex_wild ();
-			  lang_enter_output_section_statement($1, $3, sectype,
-							      $5, $7, $4,
-							      $8, $6);
-+			  lang_enter_output_section_statement ($1, $3, sectype,
-+					sectype_value, $5, $7, $4, $8, $6);
- 			}
- 		'{'
- 		statement_list_opt
-@@ -1130,8 +1131,10 @@ type:
- 	|  COPY    { sectype = noalloc_section; }
- 	|  INFO    { sectype = noalloc_section; }
- 	|  OVERLAY { sectype = noalloc_section; }
-+        |  READONLY '(' TYPE '=' exp ')' { sectype = typed_readonly_section; sectype_value = $5; }
- 	|  READONLY { sectype = readonly_section; }
-	;
-+	|  TYPE '=' exp { sectype = type_section; sectype_value = $3; }
-+        ;
- 
- atype:
- 		'(' type ')'
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 474784c874a..1733f8e65c4 100644
--- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -1891,8 +1891,8 @@ lang_insert_orphan (asection *s,
-     address = exp_intop (0);
- 
-   os_tail = (lang_output_section_statement_type **) lang_os_list.tail;
-  os = lang_enter_output_section_statement (secname, address, normal_section,
-					    NULL, NULL, NULL, constraint, 0);
-+  os = lang_enter_output_section_statement (
-+      secname, address, normal_section, 0, NULL, NULL, NULL, constraint, 0);
- 
-   if (add_child == NULL)
-     add_child = &os->children;
-@@ -2635,10 +2635,12 @@ lang_add_section (lang_statement_list_type *ptr,
-     case normal_section:
-     case overlay_section:
-     case first_overlay_section:
-+    case type_section:
-       break;
-     case noalloc_section:
-       flags &= ~SEC_ALLOC;
-       break;
-+    case typed_readonly_section:
-     case readonly_section:
-       flags |= SEC_READONLY;
-       break;
-@@ -4209,6 +4211,7 @@ map_input_to_output_sections
-     {
-       lang_output_section_statement_type *tos;
-       flagword flags;
-+      unsigned int type = 0;
- 
-       switch (s->header.type)
- 	{
-@@ -4264,6 +4267,42 @@ map_input_to_output_sections
- 	    case readonly_section:
- 	      flags |= SEC_READONLY;
- 	      break;
-+	    case typed_readonly_section:
-+	      flags |= SEC_READONLY;
-+	      /* Fall through.  */
-+	    case type_section:
-+	      if (os->sectype_value->type.node_class == etree_name
-+		  && os->sectype_value->type.node_code == NAME)
-+		{
-+		  const char *name = os->sectype_value->name.name;
-+		  if (strcmp (name, "SHT_PROGBITS") == 0)
-+		    type = SHT_PROGBITS;
-+		  else if (strcmp (name, "SHT_STRTAB") == 0)
-+		    type = SHT_STRTAB;
-+		  else if (strcmp (name, "SHT_NOTE") == 0)
-+		    type = SHT_NOTE;
-+		  else if (strcmp (name, "SHT_NOBITS") == 0)
-+		    type = SHT_NOBITS;
-+		  else if (strcmp (name, "SHT_INIT_ARRAY") == 0)
-+		    type = SHT_INIT_ARRAY;
-+		  else if (strcmp (name, "SHT_FINI_ARRAY") == 0)
-+		    type = SHT_FINI_ARRAY;
-+		  else if (strcmp (name, "SHT_PREINIT_ARRAY") == 0)
-+		    type = SHT_PREINIT_ARRAY;
-+		  else
-+		    einfo (_ ("%F%P: invalid type for output section `%s'\n"),
-+			   os->name);
-+		}
-+	     else
-+	       {
-+		 exp_fold_tree_no_dot (os->sectype_value);
-+		 if (expld.result.valid_p)
-+		   type = expld.result.value;
-+		 else
-+		   einfo (_ ("%F%P: invalid type for output section `%s'\n"),
-+			  os->name);
-+	       }
-+	      break;
- 	    case noload_section:
- 	      if (bfd_get_flavour (link_info.output_bfd)
- 		  == bfd_target_elf_flavour)
-@@ -4276,6 +4315,7 @@ map_input_to_output_sections
- 	    init_os (os, flags | SEC_READONLY);
- 	  else
- 	    os->bfd_section->flags |= flags;
-+	  os->bfd_section->type = type;
- 	  break;
- 	case lang_input_section_enum:
- 	  break;
-@@ -7506,6 +7546,7 @@ lang_output_section_statement_type *
- lang_enter_output_section_statement (const char *output_section_statement_name,
- 				     etree_type *address_exp,
- 				     enum section_type sectype,
-+				     etree_type *sectype_value,
- 				     etree_type *align,
- 				     etree_type *subalign,
- 				     etree_type *ebase,
-@@ -7523,10 +7564,12 @@ lang_enter_output_section_statement (const char *output_section_statement_name,
-       os->addr_tree = address_exp;
-     }
-   os->sectype = sectype;
-  if (sectype != noload_section)
-    os->flags = SEC_NO_FLAGS;
-  else
-+  if (sectype == type_section || sectype == typed_readonly_section)
-+    os->sectype_value = sectype_value;
-+  else if (sectype == noload_section)
-     os->flags = SEC_NEVER_LOAD;
-+  else
-+    os->flags = SEC_NO_FLAGS;
-   os->block_value = 1;
- 
-   /* Make next things chain into subchain of this.  */
-@@ -8842,7 +8885,7 @@ lang_enter_overlay_section (const char *name)
-   etree_type *size;
- 
-   lang_enter_output_section_statement (name, overlay_vma, overlay_section,
-				       0, overlay_subalign, 0, 0, 0);
-+				       0, 0, overlay_subalign, 0, 0, 0);
- 
-   /* If this is the first section, then base the VMA of future
-      sections on this one.  This will work correctly even if `.' is
-diff --git a/ld/ldlang.h b/ld/ldlang.h
-index 0d057c9bee9..95f6e468b30 100644
--- a/ld/ldlang.h
-+++ b/ld/ldlang.h
-@@ -122,7 +122,9 @@ enum section_type
-   overlay_section,
-   noload_section,
-   noalloc_section,
-  readonly_section
-+  type_section,
-+  readonly_section,
-+  typed_readonly_section
- };
- 
- /* This structure holds a list of program headers describing
-@@ -166,6 +168,7 @@ typedef struct lang_output_section_statement_struct
-   int constraint;
-   flagword flags;
-   enum section_type sectype;
-+  etree_type *sectype_value;
-   unsigned int processed_vma : 1;
-   unsigned int processed_lma : 1;
-   unsigned int all_input_readonly : 1;
-@@ -545,7 +548,7 @@ extern void lang_add_output
-   (const char *, int from_script);
- extern lang_output_section_statement_type *lang_enter_output_section_statement
-   (const char *, etree_type *, enum section_type, etree_type *, etree_type *,
-   etree_type *, int, int);
-+   etree_type *, etree_type *, int, int);
- extern void lang_final
-   (void);
- extern void lang_relax_sections
-diff --git a/ld/ldlex.l b/ld/ldlex.l
-index 78db16e3a48..c38b46b9336 100644
--- a/ld/ldlex.l
-+++ b/ld/ldlex.l
-@@ -323,6 +323,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
- <EXPRESSION>"DSECT"			{ RTOKEN(DSECT); }
- <EXPRESSION>"COPY"			{ RTOKEN(COPY); }
- <EXPRESSION>"INFO"			{ RTOKEN(INFO); }
-+<EXPRESSION>"TYPE"			{ RTOKEN(TYPE); }
- <SCRIPT,EXPRESSION>"ONLY_IF_RO"		{ RTOKEN(ONLY_IF_RO); }
- <SCRIPT,EXPRESSION>"ONLY_IF_RW"		{ RTOKEN(ONLY_IF_RW); }
- <SCRIPT,EXPRESSION>"SPECIAL"		{ RTOKEN(SPECIAL); }
-diff --git a/ld/mri.c b/ld/mri.c
-index b428ab0d0bf..5749870ef1e 100644
--- a/ld/mri.c
-+++ b/ld/mri.c
-@@ -210,8 +210,8 @@ mri_draw_tree (void)
- 	    base = p->vma ? p->vma : exp_nameop (NAME, ".");
- 
- 	  lang_enter_output_section_statement (p->name, base,
-					       p->ok_to_load ? normal_section : noload_section,
-					       align, subalign, NULL, 0, 0);
-+	    p->ok_to_load ? normal_section : noload_section, 0,
-+	    align, subalign, NULL, 0, 0);
- 	  base = 0;
- 	  tmp = (struct wildcard_list *) xmalloc (sizeof *tmp);
- 	  tmp->next = NULL;
-diff --git a/ld/testsuite/ld-scripts/output-section-types.d b/ld/testsuite/ld-scripts/output-section-types.d
-index ab124fa4dd7..2ecacaba57d 100644
--- a/ld/testsuite/ld-scripts/output-section-types.d
-+++ b/ld/testsuite/ld-scripts/output-section-types.d
-@@ -1,13 +1,17 @@
- #ld: -Toutput-section-types.t
- #source: align2a.s
-#objdump: -h
-+#readelf: -S --wide
- #target: [is_elf_format]
- 
- #...
-  . \.rom.*
-[ 	]+ALLOC, READONLY
-  . \.ro.*
-[ 	]+CONTENTS, ALLOC, LOAD, READONLY, DATA
-  . \.over.*
-[ 	]+CONTENTS, READONLY
-+.* .rom          +NOBITS        +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +00 +A +0 +0 +[1248]
-+.* .ro           +PROGBITS      +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +00 +A +0 +0 +[1248]
-+.* .over         +PROGBITS      +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +00  + +0 +0 +[1248]
-+.* progbits      +PROGBITS      +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +00 +A +0 +0 +[1248]
-+.* strtab        +STRTAB        +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +00 +A +0 +0 +[1248]
-+.* note          +NOTE          +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +00 +A +0 +0 +[1248]
-+.* init_array    +INIT_ARRAY    +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +0[48] +A +0 +0 +[1248]
-+.* fini_array    +FINI_ARRAY    +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +0[48] +A +0 +0 +[1248]
-+.* preinit_array +PREINIT_ARRAY +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +0[48] +A +0 +0 +[1248]
-+.* .ro.note      +NOTE          +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +00 +A +0 +0 +[1248]
- #pass
-diff --git a/ld/testsuite/ld-scripts/output-section-types.t b/ld/testsuite/ld-scripts/output-section-types.t
-index d8fdfda1a03..18fc5c11980 100644
--- a/ld/testsuite/ld-scripts/output-section-types.t
-+++ b/ld/testsuite/ld-scripts/output-section-types.t
-@@ -2,6 +2,13 @@ SECTIONS {
-   .rom  (NOLOAD)   : { LONG(1234); }
-   .ro   (READONLY) : { LONG(5678); }
-   .over (OVERLAY)  : { LONG(0123); }
-+  progbits (TYPE=SHT_PROGBITS) : { BYTE(1) }
-+  strtab (TYPE = SHT_STRTAB) : { BYTE(0) }
-+  note (TYPE =SHT_NOTE) : { BYTE(8) }
-+  init_array (TYPE= 14) : { QUAD(14) }
-+  fini_array ( TYPE=SHT_FINI_ARRAY) : { QUAD(15) }
-+  preinit_array (TYPE=SHT_PREINIT_ARRAY ) : { QUAD(16) }
-+  .ro.note   (READONLY (TYPE=SHT_NOTE)) : { LONG(5678); }
-   /DISCARD/        : { *(*) }
- 
- }
--- a/binutils-special-sections-in-groups.patch
+++ b/binutils-special-sections-in-groups.patch
@ -1,27 +0,0 @@
--- binutils.orig/bfd/elf.c	2018-10-19 11:42:10.107277490 +0100
-+++ binutils-2.31.1/bfd/elf.c	2018-10-19 11:44:33.607105801 +0100
-@@ -830,7 +830,13 @@ setup_group (bfd *abfd, Elf_Internal_Shd
- 	}
-     }
- 
-  if (elf_group_name (newsect) == NULL)
-+  if (elf_group_name (newsect) == NULL
-+      /* OS specific sections might be in a group (eg ARM's ARM_EXIDX section)
-+	 but they will not have been added to the group because they do not
-+	 have contents that the ELF code in the BFD library knows how to
-+	 process.  This is OK though - we rely upon the target backends to
-+	 handle these sections for us.  */
-+      && hdr->sh_type < SHT_LOOS)
-     {
-       /* xgettext:c-format */
-       _bfd_error_handler (_("%pB: no group info for section '%pA'"),
-@@ -936,7 +942,8 @@ _bfd_elf_setup_sections (bfd *abfd)
- 	  else if (idx->shdr->bfd_section)
- 	    elf_sec_group (idx->shdr->bfd_section) = shdr->bfd_section;
- 	  else if (idx->shdr->sh_type != SHT_RELA
-		   && idx->shdr->sh_type != SHT_REL)
-+		   && idx->shdr->sh_type != SHT_REL
-+		   && idx->shdr->sh_type < SHT_LOOS)
- 	    {
- 	      /* There are some unknown sections in the group.  */
- 	      _bfd_error_handler
--- a/binutils-suppress-ld-align-tests.patch
+++ b/binutils-suppress-ld-align-tests.patch
@ -0,0 +1,13 @@
+--- binutils.orig/ld/testsuite/ld-elf/linux-x86.exp	2024-01-24 11:52:35.288014542 +0000
+++ binutils-2.41/ld/testsuite/ld-elf/linux-x86.exp	2024-01-24 17:31:39.356167357 +0000
+@@ -225,6 +225,10 @@ if { [check_ifunc_attribute_available] }
+ # Old gcc silently ignores __attribute__ ((aligned())) with too big alignment.
+ proc compiler_honours_aligned { } {
+     global CC_FOR_TARGET READELF srcdir subdir
+
+    # Temporary fix for CentOS-10 kernel issue.  (RHEL-22466)
+    return 0 
+    
+     ld_compile $CC_FOR_TARGET $srcdir/$subdir/p_align-1.c tmpdir/p_align-1.o
+     set output [run_host_cmd "$READELF" "-SW tmpdir/p_align-1.o"]
+     if { [regexp { [.]data *PROGBITS .* 8388608[\n]} $output] } {
--- a/binutils-testsuite-fixes.patch
+++ b/binutils-testsuite-fixes.patch
--- a/binutils-update-linker-manual.patch
+++ b/binutils-update-linker-manual.patch
@ -1,36 +0,0 @@
-diff -rup binutils.orig/ld/ld.1 binutils-2.38/ld/ld.1
--- binutils.orig/ld/ld.1	2022-05-27 10:56:44.937044892 +0100
-+++ binutils-2.38/ld/ld.1	2022-05-27 11:10:50.311802310 +0100
-@@ -2595,7 +2595,7 @@ systems may not understand them. If you
- \&\fB\-\-enable\-new\-dtags\fR, the new dynamic tags will be created as needed
- and older dynamic tags will be omitted.
- If you specify \fB\-\-disable\-new\-dtags\fR, no new dynamic tags will be
-created. By default, the new dynamic tags are not created. Note that
-+created. By default, the new dynamic tags are created. Note that
- those options are only available for \s-1ELF\s0 systems.
- .IP "\fB\-\-hash\-size=\fR\fInumber\fR" 4
- .IX Item "--hash-size=number"
-diff -rup binutils.orig/ld/ld.info binutils-2.38/ld/ld.info
--- binutils.orig/ld/ld.info	2022-05-27 11:01:12.286346357 +0100
-+++ binutils-2.38/ld/ld.info	2022-05-27 11:11:24.585709176 +0100
-@@ -2236,7 +2236,7 @@ GNU linker:
-      '--enable-new-dtags', the new dynamic tags will be created as
-      needed and older dynamic tags will be omitted.  If you specify
-      '--disable-new-dtags', no new dynamic tags will be created.  By
-     default, the new dynamic tags are not created.  Note that those
-+     default, the new dynamic tags are created.  Note that those
-      options are only available for ELF systems.
- 
- '--hash-size=NUMBER'
-diff -rup binutils.orig/ld/ld.texi binutils-2.38/ld/ld.texi
--- binutils.orig/ld/ld.texi	2022-05-27 11:01:24.081314960 +0100
-+++ binutils-2.38/ld/ld.texi	2022-05-27 11:10:05.608923798 +0100
-@@ -2796,7 +2796,7 @@ systems may not understand them. If you
- @option{--enable-new-dtags}, the new dynamic tags will be created as needed
- and older dynamic tags will be omitted.
- If you specify @option{--disable-new-dtags}, no new dynamic tags will be
-created. By default, the new dynamic tags are not created. Note that
-+created. By default, the new dynamic tags are created. Note that
- those options are only available for ELF systems.
- 
- @kindex --hash-size=@var{number}
--- a/binutils-use-long-long.patch
+++ b/binutils-use-long-long.patch
@ -1,38 +0,0 @@
-diff -up binutils-2.25.orig/bfd/configure.ac binutils-2.25/bfd/configure.ac
--- binutils-2.25.orig/bfd/configure.ac	2014-12-24 10:34:45.590491143 +0000
-+++ binutils-2.25/bfd/configure.ac	2014-12-24 10:36:12.997981992 +0000
-@@ -183,11 +183,13 @@ if test "x${ac_cv_sizeof_long}" = "x8";
-   BFD_HOST_64BIT_LONG=1
-   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
-   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
-+fi
-+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
-   BFD_HOST_64BIT_LONG_LONG=1
-   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
-   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
-+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
-+          -a "x${ac_cv_sizeof_long}" != "x8"; then
-     BFD_HOSTPTR_T="unsigned long long"
-   fi
- fi
-diff -up ../binutils-2.20.51.0.7.original/bfd/configure ./bfd/configure
--- a/bfd/configure	2010-04-08 15:23:58.000000000 +0100
-+++ b/bfd/configure	2010-04-08 15:24:06.000000000 +0100
-@@ -12819,11 +12819,13 @@
-   BFD_HOST_64BIT_LONG=1
-   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
-   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
-+fi
-+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
-   BFD_HOST_64BIT_LONG_LONG=1
-   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
-   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
-+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
-+          -a "x${ac_cv_sizeof_long}" != "x8"; then
-     BFD_HOSTPTR_T="unsigned long long"
-   fi
- fi
--- a/binutils-x86-non-canonical-references.patch
+++ b/binutils-x86-non-canonical-references.patch
@ -1,92 +0,0 @@
-diff -rup binutils.orig/bfd/elf32-i386.c binutils-2.38/bfd/elf32-i386.c
--- binutils.orig/bfd/elf32-i386.c	2022-05-24 12:01:20.307998318 +0100
-+++ binutils-2.38/bfd/elf32-i386.c	2022-05-24 12:04:48.789688224 +0100
-@@ -1772,11 +1772,14 @@ elf_i386_scan_relocs (bfd *abfd,
- 		}
- 	      else
- 		{
-		  h->pointer_equality_needed = 1;
-		  /* R_386_32 can be resolved at run-time.  */
-+		  /* R_386_32 can be resolved at run-time.  Function
-+		     pointer reference doesn't need PLT for pointer
-+		     equality.  */
- 		  if (r_type == R_386_32
- 		      && (sec->flags & SEC_READONLY) == 0)
- 		    func_pointer_ref = true;
-+		  else
-+		    h->pointer_equality_needed = 1;
- 		}
- 
- 	      if (!func_pointer_ref)
-@@ -1798,6 +1801,23 @@ elf_i386_scan_relocs (bfd *abfd,
- 		  if (!h->def_regular
- 		      || (sec->flags & (SEC_CODE | SEC_READONLY)) != 0)
- 		    h->plt.refcount = 1;
-+
-+		  if (h->pointer_equality_needed
-+		      && h->type == STT_FUNC
-+		      && eh->def_protected
-+		      && elf_has_indirect_extern_access (h->root.u.def.section->owner))
-+		    {
-+		      /* Disallow non-canonical reference to canonical
-+			 protected function.  */
-+		      _bfd_error_handler
-+			/* xgettext:c-format */
-+			(_("%pB: non-canonical reference to canonical "
-+			   "protected function `%s' in %pB"),
-+			 abfd, h->root.root.string,
-+			 h->root.u.def.section->owner);
-+		      bfd_set_error (bfd_error_bad_value);
-+		      goto error_return;
-+		    }
- 		}
- 	    }
- 
-diff -rup binutils.orig/bfd/elf64-x86-64.c binutils-2.38/bfd/elf64-x86-64.c
--- binutils.orig/bfd/elf64-x86-64.c	2022-05-24 12:01:20.296998387 +0100
-+++ binutils-2.38/bfd/elf64-x86-64.c	2022-05-24 12:06:07.720192208 +0100
-@@ -2211,16 +2211,18 @@ elf_x86_64_scan_relocs (bfd *abfd, struc
- 	      else if (r_type != R_X86_64_PC32_BND
- 		       && r_type != R_X86_64_PC64)
- 		{
-		  h->pointer_equality_needed = 1;
- 		  /* At run-time, R_X86_64_64 can be resolved for both
- 		     x86-64 and x32. But R_X86_64_32 and R_X86_64_32S
-		     can only be resolved for x32.  */
-+		     can only be resolved for x32.  Function pointer
-+		     reference doesn't need PLT for pointer equality.  */
- 		  if ((sec->flags & SEC_READONLY) == 0
- 		      && (r_type == R_X86_64_64
- 			  || (!ABI_64_P (abfd)
- 			      && (r_type == R_X86_64_32
- 				  || r_type == R_X86_64_32S))))
- 		    func_pointer_ref = true;
-+		  else
-+		    h->pointer_equality_needed = 1;
- 		}
- 
- 	      if (!func_pointer_ref)
-@@ -2242,6 +2244,23 @@ elf_x86_64_scan_relocs (bfd *abfd, struc
- 		  if (!h->def_regular
- 		      || (sec->flags & (SEC_CODE | SEC_READONLY)) != 0)
- 		    h->plt.refcount = 1;
-+
-+		  if (h->pointer_equality_needed
-+		      && h->type == STT_FUNC
-+		      && eh->def_protected
-+		      && elf_has_indirect_extern_access (h->root.u.def.section->owner))
-+		    {
-+		      /* Disallow non-canonical reference to canonical
-+			 protected function.  */
-+		      _bfd_error_handler
-+			/* xgettext:c-format */
-+			(_("%pB: non-canonical reference to canonical "
-+			   "protected function `%s' in %pB"),
-+			 abfd, h->root.root.string,
-+			 h->root.u.def.section->owner);
-+		      bfd_set_error (bfd_error_bad_value);
-+		      goto error_return;
-+		    }
- 		}
- 	    }
-
--- a/binutils.spec
+++ b/binutils.spec
--- a/gating.yaml
+++ b/gating.yaml
@ -11,5 +11,5 @@ product_versions:
  - rhel-9
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-slow-lane.functional}
--- a/plans/build-gating.fmf
+++ b/plans/build-gating.fmf
@ -0,0 +1,26 @@
+#
+# Build/PR gating tests for binutils
+#
+
+/common:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/binutils.git
+      ref: main
+      name: /plans/build-gating/common
+
+/kernel-rebuild:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/binutils.git
+      ref: main
+      name: /plans/build-gating/kernel-rebuild
+
+adjust+:
+  - because: "Plan to be ran when executed locally, or executed by CI system to gate a build or PR."
+    # `commit` is used by Fedora CI, CentOS Stream CI, `build` by BaseOS CI
+    when: >-
+      trigger is defined
+      and trigger != commit
+      and trigger != build
+    enabled: false
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@ -1,6 +0,0 @@
-summary: CI Gating Plan
-discover:
-    how: fmf
-    directory: tests
-execute:
-    how: beakerlib
--- a/plans/regression.fmf
+++ b/plans/regression.fmf
@ -0,0 +1,18 @@
+#
+# Build/PR gating tests for binutils
+#
+
+/common:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/binutils.git
+      ref: main
+      name: /plans/regression
+
+adjust+:
+  - because: "Plan to be ran when executed locally, or executed by CI system after updating an erratum/bodhi update."
+    # `build` is used by Bodhi
+    when: >-
+      trigger is defined
+      and trigger != build
+    enabled: false
--- a/2
+++ b/2
@ -1,2 +1,2 @@
-SHA512 (binutils-2.38.tar.xz) = 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d
+SHA512 (binutils-with-gold-2.47.50-48c933a69a8.tar.xz) = c4300e4881227c431c0bbbb949a5ee5bc113701f993766418b152df7d46d9df378ebace9efffcb6e1f0b7e72ad716bbcccf5b6aa55851dc28216555b242d18a0
 SHA512 (binutils-2.19.50.0.1-output-format.sed) = 2f8686b0c8af13c98cda056824c2820416f6e2d003f70b78ccf5314525b9ee3684d421dfa83e638a2d42d06ea4d4bdaf5226b64d6ec26f7ff59c44ffb2a23dd2
--- a/spec.binutils.cross
+++ b/spec.binutils.cross
@ -1,67 +0,0 @@
-
-# Note - this is an rpm spec file, but it has been renamed in order to avoid
-# conflict with the real binutils.spec file.
-#
-# Its only use is to build a set of cross-binutils rpms by putting it into
-# the SPECS directory of an rpmbuild tree, installing the binutils source
-# rpm into the SOURCES directory and then running:
-#
-#    rpmbuild -bb spec.binutils.cross
-
-Summary: A meta collection of GNU binutils executables for cross builds
-Name: cross-binutils
-License: GPLv3+
-URL: https://sourceware.org/binutils
-
-#----------------------------------------------------------------------------
-#
-# Configurable settings - adjust to match your needs:
-#
-
-Version: 2.30
-Release: 89.el8
-
-# The list of cross architectures to build.
-# Note: this list assumes that we are building on an x86_64-linux-gnu host.
-
-%define arch_list  aarch64-linux-gnu  ppc64le-linux-gnu  s390x-linux-gnu
-
-#----------------------------------------------------------------------------
-
-%define binutils_source_rpm   binutils-%{version}-%{release}.src.rpm
-
-Source: %{binutils_source_rpm}
-
-# Provides: bundled(libiberty)
-
-BuildRequires: autoconf automake
-BuildRequires: perl, sed, coreutils
-BuildRequires: gcc, bison
-BuildRequires: gettext, flex, zlib-devel
-BuildRequires: findutils, texinfo
-BuildRequires: dejagnu, zlib-static, glibc-static, sharutils, bc
-# BuildRequires: elfutils-debuginfod-client-devel
-BuildRequires: rpm-build
-
-#----------------------------------------------------------------------------
-
-%description
-Provides a collection of cross built binutils for the targets
-supported by RHEL (aarch64, ppc64le, s390x).
-
-#----------------------------------------------------------------------------
-
-%build
-
-# Install the binutils sources.
-rpm -ivh %{_sourcedir}/%{binutils_source_rpm}
-
-# Build each set of cross binutils individually.
-for f in %{arch_list}; do
-  rpmbuild -bb --define "binutils_target $f" %{_specdir}/binutils.spec --without testsuite --without gold
-done
-
-#----------------------------------------------------------------------------
-%changelog
-* Wed Nov 11 2020 Nick Clifton  <nickc@redhat.com> - 2.35.1-14
- First release of cross binutils rpm.
--- a/tests/README
+++ b/tests/README
@ -1,2 +0,0 @@
-The test's Makefiles are not used in Fedora CI infrastructure.  But are kept here
- for backward compatibility with traditional beakerlib test harness in RHEL.
--- a/tests/Regression/241252/Makefile
+++ b/tests/Regression/241252/Makefile
@ -1,62 +0,0 @@
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# Testcases for this bugzilla were provided by Jakub Jelinek <jakub@redhat.com>
-# I've only wrapped them to RHTS
-
-TOPLEVEL_NAMESPACE=/tools
-PACKAGE_NAME=binutils
-RELATIVE_PATH=bugzillas/241252
-
-export TESTVERSION=1.0
-
-export TEST=$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
-
-.PHONY: all install download clean
-
-FILES=$(METADATA) \
-	runtest.sh \
-	Makefile \
-	x.i \
-	y.i
-
-run: $(FILES) #build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x ./runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@touch $(METADATA)
-	@echo "Owner:        Michal Nowak <mnowak@redhat.com>" > $(METADATA)
-	@echo "Name:         $(TEST)" >> $(METADATA)
-	@echo "Path:         $(TEST_DIR)"	>> $(METADATA)
-	@echo "TestVersion:  $(TESTVERSION)"	>> $(METADATA)
-	@echo "Description:  Regression test for bz241252." >> $(METADATA)
-	@echo "TestTime:     3m" >> $(METADATA)
-	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)
-	@echo "Requires:     $(PACKAGE_NAME) gcc" >> $(METADATA)
-	@echo "Priority:	Normal" >> $(METADATA)
-	@echo "Type:		Regression" >> $(METADATA)
-	@echo "Releases:	-RHEL4" >> $(METADATA)
-	@echo "License:		GPLv2" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Regression/241252/main.fmf
+++ b/tests/Regression/241252/main.fmf
@ -1,12 +0,0 @@
-summary: Regression test for bz241252.
-contact: Michal Nowak <mnowak@redhat.com>
-component:
- binutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
- binutils
- gcc
-duration: 3m
-extra-summary: /tools/binutils/bugzillas/241252
-extra-task: /tools/binutils/bugzillas/241252
--- a/tests/Regression/241252/runtest.sh
+++ b/tests/Regression/241252/runtest.sh
@ -1,62 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#   
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#   
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="binutils"
-
-rlJournalStart
-    rlPhaseStartSetup Setup
-        rlAssertRpm $PACKAGE
-        rlShowRunningKernel
-
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        cp x.i y.i $TmpDir
-        rlRun "pushd $TmpDir"
-
-        rlRun "gcc -c -O2 -fpic -o x.o x.i -g" 0 "Compile test case 'x'"
-        rlRun "gcc -c -O2 -fpic -o y.o y.i -g" 0 "Compile test case 'y'"
-        rlRun "gcc -Wl,--unique -o x [xy].o" 0 "Link 'x' and 'y'"
-
-        # Note: debug_ranges replaced by debug_rnglist (since DWARF 5 in Fedora 34)
-        rlLogInfo 'x.o + y.o:'
-        rlLogInfo "$( readelf -WS [xy].o | grep debug_rnglist | grep PROGBITS )"
-        rlLogInfo 'x:'
-        rlLogInfo "$( readelf -WS x | grep debug_rnglist )"
-    rlPhaseEnd
-
-    rlPhaseStartTest Testing
-        if [ $( readelf -WS [xy].o | grep debug_rnglist | grep PROGBITS | wc -l ) -eq 2 ] \
-            && [ $( readelf -WS x | grep debug_rnglist | wc -l ) -eq 1 ]; then
-            rlPass "Debug ranges sections were merged"
-        else
-            rlFail "Debug ranges sections were not merged"
-        fi
-    rlPhaseEnd
-
-    rlPhaseStartCleanup Cleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir $rlRun_LOG" 0 "Removing tmp directory"
-    rlPhaseEnd
-    rlJournalPrintText
-rlJournalEnd
--- a/tests/Regression/241252/x.i
+++ b/tests/Regression/241252/x.i
@ -1,62 +0,0 @@
-extern void __assert_fail (const char *, const char *, unsigned int, const char *)
-     __attribute__ ((__nothrow__, __noreturn__));
-
-struct gst;
-struct gs;
-
-extern void bar (void *) __attribute__ ((__nothrow__));
-
-typedef int (*gf) (struct gst *, struct gs *,
-       const unsigned char **, const unsigned char *,
-       unsigned char **, unsigned long *, int, int);
-
-struct gst
-{
-  gf fct;
-  int min_needed_from;
-};
-
-struct gs
-{
-  unsigned char *outbuf;
-  unsigned char *outbufend;
-  int flags;
-  int invocation_counter;
-  int internal_use;
-};
-
-typedef struct gi
-{
-  unsigned long nsteps;
-  struct gst *steps;
-  struct gs data [10];
-} *gt;
-
-int
-foo (gt cd, const unsigned char **inbuf,
-  const unsigned char *inbufend, unsigned char **outbuf,
-  unsigned char *outbufend, unsigned long *irreversible)
-{
-  unsigned long last_step;
-  int result;
-  last_step = cd->nsteps - 1;
-  *irreversible = 0;
-  cd->data[last_step].outbuf = outbuf != ((void *)0) ? *outbuf : ((void *)0);
-  cd->data[last_step].outbufend = outbufend;
-  gf fct = cd->steps->fct;
-  if (inbuf == ((void *)0) || *inbuf == ((void *)0))
-    result = (bar ((void *) (fct)), (*(fct)) (cd->steps, cd->data, ((void *)0), ((void *)0), ((void *)0), irreversible, cd->data[last_step].outbuf == ((void *)0) ? 2 : 1, 0));
-  else
-    {
-      const unsigned char *last_start;
-      ((outbuf != ((void *)0) && *outbuf != ((void *)0)) ? (void) (0) : __assert_fail ("outbuf != ((void *)0) && *outbuf != ((void *)0)", "gconv.c", 67, "foo"));
-      do
-	{
-	  last_start = *inbuf;
-	  result = (bar ((void *) (fct)), (*(fct)) (cd->steps, cd->data, inbuf, inbufend, ((void *)0), irreversible, 0, 0));
-	}
-      while (result == 4 && last_start != *inbuf
-      && *inbuf + cd->steps->min_needed_from <= inbufend);
-    }
-  return result;
-}
--- a/tests/Regression/241252/y.i
+++ b/tests/Regression/241252/y.i
@ -1,71 +0,0 @@
-extern void __assert_fail (const char *, const char *, unsigned int, const char *)
-     __attribute__ ((__nothrow__, __noreturn__));
-
-struct gst;
-struct gs;
-
-extern void bar (void *) __attribute__ ((__nothrow__));
-
-void bar (void *x)
-{
-}
-
-typedef int (*gf) (struct gst *, struct gs *,
-       const unsigned char **, const unsigned char *,
-       unsigned char **, unsigned long *, int, int);
-
-struct gst
-{
-  gf fct;
-  int min_needed_from;
-};
-
-struct gs
-{
-  unsigned char *outbuf;
-  unsigned char *outbufend;
-  int flags;
-  int invocation_counter;
-  int internal_use;
-};
-
-typedef struct gi
-{
-  unsigned long nsteps;
-  struct gst *steps;
-  struct gs data [10];
-} *gt;
-
-int
-baz (gt cd, const unsigned char **inbuf,
-  const unsigned char *inbufend, unsigned char **outbuf,
-  unsigned char *outbufend, unsigned long *irreversible)
-{
-  unsigned long last_step;
-  int result;
-  last_step = cd->nsteps - 1;
-  *irreversible = 0;
-  cd->data[last_step].outbuf = outbuf != ((void *)0) ? *outbuf : ((void *)0);
-  cd->data[last_step].outbufend = outbufend;
-  gf fct = cd->steps->fct;
-  if (inbuf == ((void *)0) || *inbuf == ((void *)0))
-    result = (bar ((void *) (fct)), (*(fct)) (cd->steps, cd->data, ((void *)0), ((void *)0), ((void *)0), irreversible, cd->data[last_step].outbuf == ((void *)0) ? 2 : 1, 0));
-  else
-    {
-      const unsigned char *last_start;
-      ((outbuf != ((void *)0) && *outbuf != ((void *)0)) ? (void) (0) : __assert_fail ("outbuf != ((void *)0) && *outbuf != ((void *)0)", "gconv.c", 67, "foo"));
-      do
-	{
-	  last_start = *inbuf;
-	  result = (bar ((void *) (fct)), (*(fct)) (cd->steps, cd->data, inbuf, inbufend, ((void *)0), irreversible, 0, 0));
-	}
-      while (result == 4 && last_start != *inbuf
-      && *inbuf + cd->steps->min_needed_from <= inbufend);
-    }
-  return result;
-}
-
-int
-main (void)
-{
-}
--- a/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/Makefile
+++ b/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/Makefile
@ -1,82 +0,0 @@
-#
-# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material
-# is made available to anyone wishing to use, modify, copy, or
-# redistribute it subject to the terms and conditions of the GNU General
-# Public License v.2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Author: Michal Nowak <mnowak@redhat.com>
-
-# The toplevel namespace within which the test lives.
-TOPLEVEL_NAMESPACE=tools
-
-# The name of the package under test:
-PACKAGE_NAME=binutils
-
-# The path of the test below the package:
-RELATIVE_PATH=Sanity/430856-libbfd.a-not-compiled-with-fPIC
-
-# Version of the Test. Used with make tag.
-export TESTVERSION=1.1
-
-# The combined namespace of the test.
-export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
-
-
-# A phony target is one that is not really the name of a file.
-# It is just a name for some commands to be executed when you
-# make an explicit request. There are two reasons to use a
-# phony target: to avoid a conflict with a file of the same
-# name, and to improve performance.
-.PHONY: all install download clean
-
-# executables to be built should be added here, they will be generated on the system under test.
-BUILT_FILES=
-
-# data files, .c files, scripts anything needed to either compile the test and/or run it.
-FILES=$(METADATA) runtest.sh Makefile PURPOSE bz430856.tar.gz
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x ./runtest.sh
-
-clean:
-	rm -f *~ *.rpm $(BUILT_FILES)
-
-# You may need to add other targets e.g. to build executables from source code
-# Add them here:
-
-
-# Include Common Makefile
-include /usr/share/rhts/lib/rhts-make.include
-
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
-	@touch $(METADATA)
-# Change to the test owner's name
-	@echo "Owner:        Michal Nowak <mnowak@redhat.com>" > $(METADATA)
-	@echo "Name:         $(TEST)" >> $(METADATA)
-	@echo "Path:         $(TEST_DIR)"	>> $(METADATA)
-	@echo "License:      GPLv2" >> $(METADATA)
-	@echo "TestVersion:  $(TESTVERSION)"	>> $(METADATA)
-	@echo "Description:  libbfd.a not compiled with -fPIC">> $(METADATA)
-	@echo "TestTime:     5m" >> $(METADATA)
-	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)
-# add any other packages for which your test ought to run here
-	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)
-	@echo "Requires:     $(PACKAGE_NAME)-devel" >> $(METADATA)
-	@echo "Requires:     gcc glibc-headers" >> $(METADATA)
-# add any other requirements for the script to run here
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
-
--- a/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/PURPOSE
+++ b/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/PURPOSE
@ -1,11 +0,0 @@
-Would it be possible to have /usr/lib64/libbfd.a in binutils
-compiled with -fPIC? Otherwise, shared apps can't link against
-libbfd. In binutils.spec, libiberty.a is already recreated 
-with -fPIC, is there some reason the same isn't done for 
-libbfd?
-
-From binutils.spec:
-
- # Rebuild libiberty.a with -fPIC
-  make -C libiberty clean
-  make CFLAGS="-g -fPIC $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" -C libiberty
--- a/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/main.fmf
+++ b/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/main.fmf
@ -1,20 +0,0 @@
-summary: libbfd.a not compiled with -fPIC
-description: "Would it be possible to have /usr/lib64/libbfd.a in binutils\ncompiled\
-    \ with -fPIC? Otherwise, shared apps can't link against\nlibbfd. In binutils.spec,\
-    \ libiberty.a is already recreated \nwith -fPIC, is there some reason the same\
-    \ isn't done for \nlibbfd?\n\nFrom binutils.spec:\n\n # Rebuild libiberty.a with\
-    \ -fPIC\n  make -C libiberty clean\n  make CFLAGS=\"-g -fPIC $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64\"\
-    \ -C libiberty\n"
-contact: Michal Nowak <mnowak@redhat.com>
-component:
- binutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
- binutils
- binutils-devel
- gcc
- glibc-headers
-duration: 5m
-extra-summary: /tools/binutils/Sanity/430856-libbfd.a-not-compiled-with-fPIC
-extra-task: /tools/binutils/Sanity/430856-libbfd.a-not-compiled-with-fPIC
--- a/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/reproducer/Makefile
+++ b/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/reproducer/Makefile
@ -1,21 +0,0 @@
-CC=gcc
-CFLAGS=-g -Wall
-
-all: test
-
-libbfdtest.so bfdtest: Makefile
-
-libbfdtest.so: libbfdtest.c libbfdtest.h
-	$(CC) $(CFLAGS) -shared -o $@ -fPIC $< -lbfd -liberty
-
-bfdtest: bfdtest.c libbfdtest.h libbfdtest.so
-	$(CC) -o $@ $< -L. -Wl,-rpath,.  -lbfdtest -ldl
-
-.PHONY: test
-test: bfdtest
-	./$<
-	@echo OK
-
-clean:
-	$(RM) libbfdtest.so bfdtest
-
--- a/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/reproducer/bfdtest.c
+++ b/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/reproducer/bfdtest.c
@ -1,7 +0,0 @@
-#include "libbfdtest.h"
-
-int
-main (void)
-{
-  return libbfdtest () ? 0 : 1;
-}
--- a/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/reproducer/libbfdtest.c
+++ b/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/reproducer/libbfdtest.c
@ -1,10 +0,0 @@
-#include <bfd.h>
-
-#include "libbfdtest.h"
-
-int
-libbfdtest (void)
-{
-  bfd_set_error (bfd_error_no_error);
-  return bfd_get_error () == bfd_error_no_error;
-}
--- a/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/reproducer/libbfdtest.h
+++ b/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/reproducer/libbfdtest.h
@ -1 +0,0 @@
-extern int libbfdtest (void);
--- a/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/runtest.sh
+++ b/tests/Regression/430856-libbfd.a-not-compiled-with-fPIC/runtest.sh
@ -1,49 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#   
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#   
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="binutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlShowPackageVersion $PACKAGE
-        rlShowRunningKernel
-
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        cp reproducer/* $TmpDir
-        rlRun "pushd $TmpDir"
-        rlRun "make clean" 0 "Make clean"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "make" 0 "Build the files"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-    rlJournalPrintText
-rlJournalEnd
--- a/tests/Regression/435078-output-of-strings-0-n-is-incorrect/Makefile
+++ b/tests/Regression/435078-output-of-strings-0-n-is-incorrect/Makefile
@ -1,85 +0,0 @@
-# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material 
-# is made available to anyone wishing to use, modify, copy, or
-# redistribute it subject to the terms and conditions of the GNU General
-# Public License v.2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Author: Michal Nowak <mnowak@redhat.com>
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-# Example Makefile for RHTS                                          #
-# This example is geared towards a test for a specific package       #
-# It does most of the work for you, but may require further coding   #
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-
-# The toplevel namespace within which the test lives.
-TOPLEVEL_NAMESPACE=tools
-
-# The name of the package under test:
-PACKAGE_NAME=binutils
-
-# The path of the test below the package:
-RELATIVE_PATH=Sanity/435078-output-of-strings-0-n-is-incorrect
-
-# Version of the Test. Used with make tag.
-export TESTVERSION=1.1
-
-# The combined namespace of the test.
-export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
-
-
-# A phony target is one that is not really the name of a file.
-# It is just a name for some commands to be executed when you
-# make an explicit request. There are two reasons to use a
-# phony target: to avoid a conflict with a file of the same
-# name, and to improve performance.
-.PHONY: all install download clean
-
-# executables to be built should be added here, they will be generated on the system under test.
-BUILT_FILES= 
-
-# data files, .c files, scripts anything needed to either compile the test and/or run it.
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x ./runtest.sh
-
-clean:
-	rm -f *~ *.rpm $(BUILT_FILES)
-
-# You may need to add other targets e.g. to build executables from source code
-# Add them here:
-
-
-# Include Common Makefile
-include /usr/share/rhts/lib/rhts-make.include
-
-# Generate the testinfo.desc here:
-$(METADATA): Makefile
-	@touch $(METADATA)
-# Change to the test owner's name
-	@echo "Owner:        Michal Nowak <mnowak@redhat.com>" > $(METADATA)
-	@echo "Name:         $(TEST)" >> $(METADATA)
-	@echo "Path:         $(TEST_DIR)"	>> $(METADATA)
-	@echo "License:      GPLv2" >> $(METADATA)
-	@echo "TestVersion:  $(TESTVERSION)"	>> $(METADATA)
-	@echo "Description:  The output of "strings -0 file" is in loop and "-n 0xA" cannot be correctly recognized">> $(METADATA)
-	@echo "TestTime:     5m" >> $(METADATA)
-	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)  
-# add any other packages for which your test ought to run here
-	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)  
-# add any other requirements for the script to run here
-
-# You may need other fields here; see the documentation
-	rhts-lint $(METADATA)
-
--- a/tests/Regression/435078-output-of-strings-0-n-is-incorrect/PURPOSE
+++ b/tests/Regression/435078-output-of-strings-0-n-is-incorrect/PURPOSE
@ -1,2 +0,0 @@
-Use "strings -0 file", the output will be in loop.
-And "strings -n 0xA file" will report error as "invalid number 0xA"
--- a/tests/Regression/435078-output-of-strings-0-n-is-incorrect/main.fmf
+++ b/tests/Regression/435078-output-of-strings-0-n-is-incorrect/main.fmf
@ -1,14 +0,0 @@
-summary: The output of strings -0 file is in loop and -n 0xA cannot be correctly recognized
-description: |
-    Use "strings -0 file", the output will be in loop.
-    And "strings -n 0xA file" will report error as "invalid number 0xA"
-contact: Michal Nowak <mnowak@redhat.com>
-component:
- binutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
- binutils
-duration: 5m
-extra-summary: /tools/binutils/Sanity/435078-output-of-strings-0-n-is-incorrect
-extra-task: /tools/binutils/Sanity/435078-output-of-strings-0-n-is-incorrect
--- a/tests/Regression/435078-output-of-strings-0-n-is-incorrect/runtest.sh
+++ b/tests/Regression/435078-output-of-strings-0-n-is-incorrect/runtest.sh
@ -1,56 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#   
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#   
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="binutils"
-
-rlJournalStart
-    rlPhaseStartSetup Setup
-        rlAssertRpm $PACKAGE
-        rlShowPackageVersion $PACKAGE
-        rlShowRunningKernel
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-	rlRun "echo -e \"asdjkhsd\nsdsdsdssd\n\nsdsd\n\" > tstfile" 0 "Generating test file tstfile"
-    rlPhaseEnd
-
-    rlPhaseStartTest TestingOne
-	rlRun "strings -0 tstfile > errorfile 2>&1 &"
-	rlRun "sleep 5"
-	rlRun "jobs"
-	rlRun "kill -9 %1" 1 "strings in the loop"
-	rlAssertGrep "minim" errorfile
-    rlPhaseEnd
-
-    rlPhaseStartTest TestingTwo
-	rlRun "strings -n 0xA tstfile" 0 "echo \"PASS: tstfile processed.\""
-    rlPhaseEnd
-
-    rlPhaseStartCleanup Cleanup
-        rlBundleLogs "binutils-outputs" errorfile tstfile
-        rlRun "popd"
-        rlRun "rm -r $TmpDir $rlRun_LOG" 0 "Removing tmp directory"
-    rlPhaseEnd
-    rlJournalPrintText
-rlJournalEnd
--- a/tests/Regression/480009-when-mistaking-argument-of-strings/Makefile
+++ b/tests/Regression/480009-when-mistaking-argument-of-strings/Makefile
@ -1,60 +0,0 @@
-# Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-# Author: Michal Nowak <mnowak@redhat.com>
-
-
-TOPLEVEL_NAMESPACE=/tools
-PACKAGE_NAME=binutils
-RELATIVE_PATH=Sanity/480009-when-mistaking-argument-of-strings
-
-export TEST=$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x ./runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-
-$(METADATA): Makefile
-	@touch $(METADATA)
-	@echo "Owner:        Michal Nowak <mnowak@redhat.com>" > $(METADATA)
-	@echo "Name:         $(TEST)" >> $(METADATA)
-	@echo "Path:         $(TEST_DIR)"       >> $(METADATA)
-	@echo "TestVersion:  $(TESTVERSION)"    >> $(METADATA)
-	@echo "Description:  When mistaking the argument of strings command , the same error message is output." >> $(METADATA)
-	@echo "Bug:          480009" >> $(METADATA)
-	@echo "Type:         Sanity" >> $(METADATA)
-	@echo "TestTime:     5m" >> $(METADATA)
-	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)
-	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)
-	@echo "License:      GPLv3+" >> $(METADATA)
-	@echo "Releases:     -RHEL4 -RHEL5" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Regression/480009-when-mistaking-argument-of-strings/PURPOSE
+++ b/tests/Regression/480009-when-mistaking-argument-of-strings/PURPOSE
@ -1,27 +0,0 @@
-[RHEL5.2]
-# strings -n file1
-strings: invalid integer argument file1
-
-# strings --bytes file1
-strings: invalid integer argument file1
-
-# strings -n 0
-strings: invalid number 0
-
-# strings --bytes 0
-strings: invalid number 0
-
-
-[RHEL5.3]
-# strings -n file1
-strings: invalid minimum string length 0
-
-# strings --bytes file1
-strings: invalid minimum string length 0
-
-# strings -n 0
-strings: invalid minimum string length 0
-
-# strings --bytes 0
-strings: invalid minimum string length 0
-
--- a/tests/Regression/480009-when-mistaking-argument-of-strings/main.fmf
+++ b/tests/Regression/480009-when-mistaking-argument-of-strings/main.fmf
@ -1,42 +0,0 @@
-summary: When mistaking the argument of strings command , the same error message is
-    output.
-description: |+
-    [RHEL5.2]
-    # strings -n file1
-    strings: invalid integer argument file1
-
-    # strings --bytes file1
-    strings: invalid integer argument file1
-
-    # strings -n 0
-    strings: invalid number 0
-
-    # strings --bytes 0
-    strings: invalid number 0
-
-
-    [RHEL5.3]
-    # strings -n file1
-    strings: invalid minimum string length 0
-
-    # strings --bytes file1
-    strings: invalid minimum string length 0
-
-    # strings -n 0
-    strings: invalid minimum string length 0
-
-    # strings --bytes 0
-    strings: invalid minimum string length 0
-
-contact: Michal Nowak <mnowak@redhat.com>
-component:
- binutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
- binutils
-duration: 5m
-link:
-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=480009
-extra-summary: /tools/binutils/Sanity/480009-when-mistaking-argument-of-strings
-extra-task: /tools/binutils/Sanity/480009-when-mistaking-argument-of-strings
--- a/tests/Regression/480009-when-mistaking-argument-of-strings/runtest.sh
+++ b/tests/Regression/480009-when-mistaking-argument-of-strings/runtest.sh
@ -1,49 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-#
-# Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-# Author: Michal Nowak <mnowak@redhat.com>
-
-# source the test script helpers
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE=binutils
-
-rlJournalStart
-	rlPhaseStartSetup
-		rlShowPackageVersion $PACKAGE
-		rlShowRunningKernel
-	rlPhaseEnd
-
-	rlPhaseStartTest "#1: strings -n file1"
-		rlRun "strings -n file1 2>&1 | grep 'invalid integer argument file1'" 0 "Produced expected error msg: 'strings: invalid integer argument file1'"
-	rlPhaseEnd
-
-	rlPhaseStartTest "#2: strings --bytes file1"
-		rlRun "strings --bytes file1 2>&1 | grep 'invalid integer argument file1'" 0 "Produced expected error msg: 'strings: invalid integer argument file1'"
-	rlPhaseEnd
-
-	rlPhaseStartTest "#3: strings -n 0"
-		rlRun "strings -n 0 2>&1 | grep 'invalid minimum string length 0'" 0 "Produced expected error msg: 'strings: invalid minimum string length 0'"
-	rlPhaseEnd
-
-	rlPhaseStartTest "#4: strings --bytes 0"
-		rlRun "strings --bytes 0 2>&1 | grep 'invalid minimum string length 0'" 0 "Produced expected error msg: 'strings: invalid minimum string length 0'"
-	rlPhaseEnd
-
-	rlJournalPrintText
-rlJournalEnd
--- a/tests/Regression/509124-holes-in-debuginfo/Makefile
+++ b/tests/Regression/509124-holes-in-debuginfo/Makefile
@ -1,59 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#   
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#   
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/binutils/Regressions/readelf/509124-holes-in-debuginfo
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE ascend.C test.c
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x ./runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Michal Nowak <mnowak@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     holes in debuginfo" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        15m" >> $(METADATA)
-	@echo "RunFor:          binutils" >> $(METADATA)
-	@echo "Requires:        binutils gcc44 gcc gcc44-c++ gcc-c++" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             509124 499164" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHEL5" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Regression/509124-holes-in-debuginfo/PURPOSE
+++ b/tests/Regression/509124-holes-in-debuginfo/PURPOSE
@ -1,14 +0,0 @@
-(1) readelf fix now posted upstream:
-    http://sourceware.org/ml/binutils/2009-07/msg00123.html
-QA: New testcase: binutils-all/testranges.s
-
-(2) gcc has been fixed based on this bugreport by Jakub upstream:
-    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40713
-    gcc44 backport request for RHEL-5.5 is: Bug 510958
-
-(3) Going to be backported for RHEL-5.5 readelf.
-    It has been already fixed by Nick Clifton upstream:
-    http://sourceware.org/ml/binutils/2009-06/msg00418.html
-    http://sourceware.org/ml/binutils-cvs/2009-06/msg00158.html
-QA: RHEL-only new testcase: binutils-all/testloc.S
-    as a part of binutils-all/readelf.exp (not shown when PASSing)    
--- a/tests/Regression/509124-holes-in-debuginfo/ascend.C
+++ b/tests/Regression/509124-holes-in-debuginfo/ascend.C
@ -1,15 +0,0 @@
-class A { 
-public: 
-  A(); 
-  void f(){} 
-};
-
-class C { 
-  C(); 
-};
-
-C::C() {
-  A* p = new A; 
-  p->f();
-}
-
--- a/tests/Regression/509124-holes-in-debuginfo/main.fmf
+++ b/tests/Regression/509124-holes-in-debuginfo/main.fmf
@ -1,25 +0,0 @@
-summary: holes in debuginfo
-description: "(1) readelf fix now posted upstream:\n    http://sourceware.org/ml/binutils/2009-07/msg00123.html\n\
-    QA: New testcase: binutils-all/testranges.s\n\n(2) gcc has been fixed based on\
-    \ this bugreport by Jakub upstream:\n    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40713\n\
-    \    gcc44 backport request for RHEL-5.5 is: Bug 510958\n\n(3) Going to be backported\
-    \ for RHEL-5.5 readelf.\n    It has been already fixed by Nick Clifton upstream:\n\
-    \    http://sourceware.org/ml/binutils/2009-06/msg00418.html\n    http://sourceware.org/ml/binutils-cvs/2009-06/msg00158.html\n\
-    QA: RHEL-only new testcase: binutils-all/testloc.S\n    as a part of binutils-all/readelf.exp\
-    \ (not shown when PASSing)    \n"
-contact: Michal Nowak <mnowak@redhat.com>
-component:
- binutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
- binutils
- gcc44
- gcc
- gcc44-c++
- gcc-c++
-duration: 15m
-link:
-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=509124
-extra-summary: /tools/binutils/Regressions/readelf/509124-holes-in-debuginfo
-extra-task: /tools/binutils/Regressions/readelf/509124-holes-in-debuginfo
--- a/tests/Regression/509124-holes-in-debuginfo/runtest.sh
+++ b/tests/Regression/509124-holes-in-debuginfo/runtest.sh
@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#   
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#   
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# Author: Michal Nowak <mnowak@redhat.com>
-#
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="binutils"
-
-rlJournalStart
-    rlPhaseStartSetup Setup
-        rlAssertRpm $PACKAGE
-	rlShowPackageVersion $PACKAGE
-	rlShowRunningKernel
-
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-	cp ascend.C test.c $TmpDir
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    for gcc in $( ls /usr/bin/gcc{,44} 2> /dev/null ); do
-      for opt in s $( seq 0 3 ); do
-        rlPhaseStartTest "ascend.C: gcc=$gcc opt=$opt"
-            rlRun "$gcc -O${opt} ascend.C -c -g"
-            rlAssertExists "ascend.o"
-            # kinda weird running readelf on .o file, but...
-            rlRun "readelf -a -w -W ./ascend.o > /dev/less 2> readelf.errout.g++" 0 "[gcc] Generating readelf output"
-            rlLog "$( cat readelf.errout.g++ )"
-	    rlAssertNotGrep "readelf" readelf.errout.g++
-            rm -f ./ascend.o
-        rlPhaseEnd
-      done
-    done
-
-    for gcc in $( ls /usr/bin/gcc{,44} 2> /dev/null ); do
-      for opt in s $( seq 0 3 ); do
-        rlPhaseStartTest "test.c: gcc=$gcc opt=$opt"
-            rlRun "$gcc -O${opt} test.c -c -g"
-            rlAssertExists "test.o"
-            # kinda weird running readelf on .o file, but...
-            rlRun "readelf -a -w -W ./test.o > /dev/less 2> readelf.errout.g++" 0 "[gcc] Generating readelf output"
-            rlLog "$( cat readelf.errout.g++ )"
-	    rlAssertNotGrep "readelf" readelf.errout.g++
-            rm -f ./test.o
-        rlPhaseEnd
-      done
-    done
-
-    rlPhaseStartCleanup Cleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-    rlJournalPrintText
-rlJournalEnd
--- a/tests/Regression/509124-holes-in-debuginfo/test.c
+++ b/tests/Regression/509124-holes-in-debuginfo/test.c
@ -1,14 +0,0 @@
-void f(int i) {
-  k(i);
-}
-
-void g(int i) {
-  int j[65537]; 
-  l(i,j);
-}
-
-struct s {
-  void (*m)(int i); 
-  void (*n)(int i);
-} t={f,g};
-
--- a/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/Makefile
+++ b/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/Makefile
@ -1,59 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#   
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#   
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/binutils/Regressions/ld/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE bar.c foo.c
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	chmod a+x ./runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Michal Nowak <mnowak@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     ld fails to merge different visibility for the same symbol in distinct object files" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          binutils binutils220" >> $(METADATA)
-	@echo "Requires:        binutils binutils220 gcc44 gcc" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             531269" >> $(METADATA)
-	@echo "Architectures:   i386 x86_64" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/PURPOSE
+++ b/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/PURPOSE
--- a/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/bar.c
+++ b/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/bar.c
@ -1,19 +0,0 @@
-int foo __attribute__ ((section (".gnu.linkonce.d.1"),
-                       visibility ("hidden"))) = 1;
-int
-__attribute__ ((section (".gnu.linkonce.t.1"), visibility ("hidden")))
-bar ()
-{
- return 1;
-}
-int
-get_foo ()
-{
- return foo;
-}
-int
-get_bar ()
-{
- return bar ();
-}
-
--- a/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/foo.c
+++ b/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/foo.c
@ -1,7 +0,0 @@
-int foo __attribute__ ((section (".gnu.linkonce.d.1"))) = 1;
-int
-__attribute__ ((section (".gnu.linkonce.t.1")))
-bar ()
-{
- return 1;
-}
--- a/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/main.fmf
+++ b/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/main.fmf
@ -1,19 +0,0 @@
-summary: ld fails to merge different visibility for the same symbol in distinct object
-    files
-description: ''
-contact: Michal Nowak <mnowak@redhat.com>
-component:
- binutils
- binutils220
-test: ./runtest.sh
-framework: beakerlib
-recommend:
- binutils
- binutils220
- gcc44
- gcc
-duration: 5m
-link:
-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=531269
-extra-summary: /tools/binutils/Regressions/ld/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol
-extra-task: /tools/binutils/Regressions/ld/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol
--- a/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/runtest.sh
+++ b/tests/Regression/531269-ld-fails-to-merge-different-visibility-for-the-same-symbol/runtest.sh
@ -1,57 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
-#   
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#   
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# Author: Michal Nowak <mnowak@redhat.com>
-#
-# Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="binutils"
-
-# Choose the compiler.
-GCC=${GCC:-gcc}
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-	rlShowPackageVersion $PACKAGE
-	rlShowRunningKernel
-
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-	cp foo.c bar.c $TmpDir
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest "gcc=$GCC Testing"
-        rlRun "$GCC -fPIC -c -o foo.o foo.c" 0 "Compile foo.c => foo.o"
-        rlRun "$GCC -fPIC -c -o bar.o bar.c" 0 "Compile bar.c => bar.o"
-        rlRun "ld -shared -o foobar.so foo.o bar.o" 0 "Link foo.o & bar.o => foobar.so"
-        rlAssertExists foobar.so
-        rm foobar.so foo.o bar.o
-    rlPhaseEnd
-
-    rlPhaseStartCleanup Cleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-    rlJournalPrintText
-rlJournalEnd
--- a/tests/Regression/RELRO-protection-effective/Makefile
+++ b/tests/Regression/RELRO-protection-effective/Makefile
@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /tools/binutils/Regression/RELRO-protection-effective
-#   Description: bz1174826
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2014 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/binutils/Regression/RELRO-protection-effective
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Martin Cermak <mcermak@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     bz1174826" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          binutils" >> $(METADATA)
-	@echo "Requires:        binutils gcc" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             1174826" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Regression/RELRO-protection-effective/PURPOSE
+++ b/tests/Regression/RELRO-protection-effective/PURPOSE
@ -1,34 +0,0 @@
-PURPOSE of /tools/binutils/Regression/RELRO-protection-effective
-Description: bz1174826
-Author: Martin Cermak <mcermak@redhat.com>
-Bug summary: RELRO is not read-only on PowerLE
-Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1174826
-
-/*                                                                                 
- * Test to exercise PIE and RELRO provided by Roland McGrath <roland@redhat.com>.
- *                                                                                 
- * Description:                                                                    
- *   Simple test for RELRO, which happens to be a PIE too, but that's only         
- *   because this kind of example has to be in PIC code to make RELRO relevant, 
- *   and PIE makes it simpler to write a standalone one-file test than writing  
- *   a DSO.                                                                        
- *                                                                                 
- *   The "const" makes "foo" .rodata material, and the init to an external symbol
- *   reference makes it require a data relocation.  Enabling -z relro for this  
- *   link puts that .rodata into a RELRO area.  This program will crash because 
- *   the page containing "foo" has been made read-only when "main" runs.           
- *   Without RELRO, it would let you modify "foo" even though it's supposed to  
- *   be const.                                                                     
- *                                                                                 
- * Test with RELRO should fail:                                                    
- *   $ gcc -pie -fPIE -g  -Wl,-z,relro -o relro relro.c                            
- *   $ ./relro                                                                     
- *   Segmentation fault (core dumped)                                              
- *                                                                                 
- * Test without RELRO should pass:                                                 
- *   $ gcc -pie -fPIE -g  -Wl,-z,norelro -o no-relro relro.c                       
- *   $ ./no-relro                                                                  
- *                                                                                 
-**/
-
-
--- a/tests/Regression/RELRO-protection-effective/main.fmf
+++ b/tests/Regression/RELRO-protection-effective/main.fmf
@ -1,43 +0,0 @@
-summary: bz1174826
-description: "Bug summary: RELRO is not read-only on PowerLE\nBugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1174826\n\
-    \n/*                                                                         \
-    \        \n * Test to exercise PIE and RELRO provided by Roland McGrath <roland@redhat.com>.\n\
-    \ *                                                                          \
-    \       \n * Description:                                                    \
-    \                \n *   Simple test for RELRO, which happens to be a PIE too,\
-    \ but that's only         \n *   because this kind of example has to be in PIC\
-    \ code to make RELRO relevant, \n *   and PIE makes it simpler to write a standalone\
-    \ one-file test than writing  \n *   a DSO.                                  \
-    \                                      \n *                                  \
-    \                                               \n *   The \"const\" makes \"\
-    foo\" .rodata material, and the init to an external symbol\n *   reference makes\
-    \ it require a data relocation.  Enabling -z relro for this  \n *   link puts\
-    \ that .rodata into a RELRO area.  This program will crash because \n *   the\
-    \ page containing \"foo\" has been made read-only when \"main\" runs.        \
-    \   \n *   Without RELRO, it would let you modify \"foo\" even though it's supposed\
-    \ to  \n *   be const.                                                       \
-    \              \n *                                                          \
-    \                       \n * Test with RELRO should fail:                    \
-    \                                \n *   $ gcc -pie -fPIE -g  -Wl,-z,relro -o relro\
-    \ relro.c                            \n *   $ ./relro                        \
-    \                                             \n *   Segmentation fault (core\
-    \ dumped)                                              \n *                  \
-    \                                                               \n * Test without\
-    \ RELRO should pass:                                                 \n *   $\
-    \ gcc -pie -fPIE -g  -Wl,-z,norelro -o no-relro relro.c                      \
-    \ \n *   $ ./no-relro                                                        \
-    \          \n *                                                              \
-    \                   \n**/\n\n\n"
-contact: Martin Cermak <mcermak@redhat.com>
-component:
- binutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
- binutils
- gcc
-duration: 5m
-link:
-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1174826
-extra-summary: /tools/binutils/Regression/RELRO-protection-effective
-extra-task: /tools/binutils/Regression/RELRO-protection-effective
--- a/tests/Regression/RELRO-protection-effective/runtest.sh
+++ b/tests/Regression/RELRO-protection-effective/runtest.sh
@ -1,65 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/binutils/Regression/RELRO-protection-effective
-#   Description: bz1174826
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2014 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="binutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        touch /tmp/disable-qe-abrt
-        rlRun "TMPD=\$(mktemp -d)"
-        rlRun "pushd $TMPD"
-        cat > relro.c <<-EOF
-#include <stdio.h>
-
-void *const foo = &stdout;
-
-int main (void)
-{
-  *(void **) &foo = &stderr;
-  return 0;
-}
-EOF
-        rlRun "gcc -pie -fPIE -g  -Wl,-z,relro -o relro relro.c"
-        rlRun "gcc -pie -fPIE -g  -Wl,-z,norelro -o no-relro relro.c"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "./relro" 139
-        rlRun "./no-relro"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TMPD"
-        rm -f /tmp/disable-qe-abrt
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
--- a/tests/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot/Makefile
+++ b/tests/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot/Makefile
@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /tools/binutils/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot
-#   Description: Test for BZ#1080077 ([RFE] - Please configure ld.bfd to allow --sysroot)
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2014 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/binutils/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Martin Cermak <mcermak@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for BZ#1080077 ([RFE] - Please configure ld.bfd to allow --sysroot)" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          binutils" >> $(METADATA)
-	@echo "Requires:        binutils" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             1080077" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot/PURPOSE
+++ b/tests/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot/PURPOSE
@ -1,5 +0,0 @@
-PURPOSE of /tools/binutils/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot
-Description: Test for BZ#1080077 ([RFE] - Please configure ld.bfd to allow --sysroot)
-Author: Martin Cermak <mcermak@redhat.com>
-Bug summary: [RFE] - Please configure ld.bfd to allow --sysroot
-Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1080077
--- a/tests/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot/main.fmf
+++ b/tests/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot/main.fmf
@ -1,16 +0,0 @@
-summary: Test for BZ#1080077 ([RFE] - Please configure ld.bfd to allow --sysroot)
-description: |
-    Bug summary: [RFE] - Please configure ld.bfd to allow --sysroot
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1080077
-contact: Martin Cermak <mcermak@redhat.com>
-component:
- binutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
- binutils
-duration: 5m
-link:
-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1080077
-extra-summary: /tools/binutils/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot
-extra-task: /tools/binutils/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot
--- a/tests/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot/runtest.sh
+++ b/tests/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot/runtest.sh
@ -1,39 +0,0 @@
-#!/bin/bash
-# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/binutils/Regression/bz1080077-RFE-Please-configure-ld-bfd-to-allow-sysroot
-#   Description: Test for BZ#1080077 ([RFE] - Please configure ld.bfd to allow --sysroot)
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2014 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-rlJournalStart
-    rlPhaseStartTest
-        LD_BDF=$(which ld.bfd)
-        RPM=$(rpm -qf $LD_BDF)
-        rlLogInfo "ld.bfd is $LD_BDF of $RPM"
-        rlRun "ld.bfd --sysroot=/tmp |& grep 'not configured to use sysroots'" 1
-        rlRun "ld.bfd --sysroot=/tmp |& grep 'no input files'"
-    rlPhaseEnd
-rlJournalEnd
--- a/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/Makefile
+++ b/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/Makefile
@ -1,65 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /tools/binutils/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED
-#   Description: Test for BZ#1117458 (ld from devtoolset copies SONAME to DT_NEEDED)
-#   Author: Milos Prchlik <mprchlik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2014 Red Hat, Inc.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/binutils/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE libtest.tar.gz
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Prchlik <mprchlik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for BZ#1117458 (ld from devtoolset copies SONAME to DT_NEEDED)" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          binutils" >> $(METADATA)
-	@echo "Requires:        binutils" >> $(METADATA)
-	@echo "Requires:        devtoolset-3.0-tools-devtoolset-3.0-Install-latest" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    yes" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             1117458" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/PURPOSE
+++ b/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/PURPOSE
@ -1,5 +0,0 @@
-PURPOSE of /tools/binutils/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED
-Description: Test for BZ#1117458 (ld from devtoolset copies SONAME to DT_NEEDED)
-Author: Milos Prchlik <mprchlik@redhat.com>
-Bug summary: ld from devtoolset copies SONAME to DT_NEEDED without checking if it’s empty
-Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1117458
--- a/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/libfoo.c
+++ b/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/libfoo.c
@ -1,3 +0,0 @@
-int foo(void) {
-	return 10;
-}
--- a/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/main.fmf
+++ b/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/main.fmf
@ -1,17 +0,0 @@
-summary: Test for BZ#1117458 (ld from devtoolset copies SONAME to DT_NEEDED)
-description: |
-    Bug summary: ld from devtoolset copies SONAME to DT_NEEDED without checking if it’s empty
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1117458
-contact: Milos Prchlik <mprchlik@redhat.com>
-component:
- binutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
- binutils
- gcc
-duration: 5m
-link:
-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1117458
-extra-summary: /tools/binutils/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED
-extra-task: /tools/binutils/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED
--- a/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/runtest.sh
+++ b/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/runtest.sh
@ -1,63 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/binutils/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED
-#   Description: Test for BZ#1117458 (ld from devtoolset copies SONAME to DT_NEEDED)
-#   Author: Milos Prchlik <mprchlik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2014 Red Hat, Inc.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="binutils"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "cp user.c libfoo.c $TmpDir/" 
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "gcc -fPIC -g -c libfoo.c"
-        rlAssertExists "libfoo.o"
-        rlRun "gcc -shared -Wl,-soname, -o libfoo.so -lc libfoo.o 2>&1 | tee out" 0
-        rlAssertExists "libfoo.so"
-        rlLogInfo "gcc output:"
-        rlLogInfo "$(cat out)"
-        rlAssertGrep "SONAME must not be empty string; ignored" out
-        rlRun "objdump -p libfoo.so | grep SONAME | awk '{print \$2}' > soname"
-        if [ "`stat -c '%s' soname`" != "0" ]; then
-            rlLogInfo "SONAME='$(cat soname)'"
-            rlFail "Detected SONAME is empty"
-        fi
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd" # $TmpDir
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
--- a/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/user.c
+++ b/tests/Regression/bz1117458-ld-from-devtoolset-copies-SONAME-to-DT-NEEDED/user.c
@ -1,9 +0,0 @@
-#include <stdio.h>
-
-extern int foo(void);
-
-int main(void) {
-	int a = foo();
-	printf("a is %d\n", a);
-	return 0;
-}
--- a/tests/Regression/bz1172766-ppc64-segv-in-libbfd/Makefile
+++ b/tests/Regression/bz1172766-ppc64-segv-in-libbfd/Makefile
@ -1,65 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /tools/binutils/Regression/bz1172766-ppc64-segv-in-libbfd
-#   Description: Test for BZ#1172766 (ppc64 segv in libbfd)
-#   Author: Milos Prchlik <mprchlik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2015 Red Hat, Inc.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/binutils/Regression/bz1172766-ppc64-segv-in-libbfd
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Prchlik <mprchlik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for BZ#1172766 (ppc64 segv in libbfd)" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        30m" >> $(METADATA)
-	@echo "RunFor:          binutils" >> $(METADATA)
-	@echo "Requires:        binutils kernel-debuginfo xz" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    yes" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             1172766" >> $(METADATA)
-	@echo "Releases:        RHEL7" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Regression/bz1172766-ppc64-segv-in-libbfd/PURPOSE
+++ b/tests/Regression/bz1172766-ppc64-segv-in-libbfd/PURPOSE
@ -1,5 +0,0 @@
-PURPOSE of /tools/binutils/Regression/bz1172766-ppc64-segv-in-libbfd
-Description: Test for BZ#1172766 (ppc64 segv in libbfd)
-Author: Milos Prchlik <mprchlik@redhat.com>
-Bug summary: ppc64: segv in libbfd
-Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1172766
--- a/tests/Regression/bz1172766-ppc64-segv-in-libbfd/main.fmf
+++ b/tests/Regression/bz1172766-ppc64-segv-in-libbfd/main.fmf
@ -1,20 +0,0 @@
-summary: Test for BZ#1172766 (ppc64 segv in libbfd)
-description: |
-    Bug summary: ppc64: segv in libbfd
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1172766
-contact: Milos Prchlik <mprchlik@redhat.com>
-component:
- binutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
- binutils
- elfutils
- koji
- kernel-debuginfo
- xz
-duration: 30m
-link:
-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1172766
-extra-summary: /tools/binutils/Regression/bz1172766-ppc64-segv-in-libbfd
-extra-task: /tools/binutils/Regression/bz1172766-ppc64-segv-in-libbfd
--- a/tests/Regression/bz1172766-ppc64-segv-in-libbfd/runtest.sh
+++ b/tests/Regression/bz1172766-ppc64-segv-in-libbfd/runtest.sh
@ -1,85 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/binutils/Regression/bz1172766-ppc64-segv-in-libbfd
-#   Description: Test for BZ#1172766 (ppc64 segv in libbfd)
-#   Author: Milos Prchlik <mprchlik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2015 Red Hat, Inc.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGES="binutils"
-REQUIRES="${REQUIRES:-kernel-debuginfo}"
-
-__have_kernel_debuginfo () {
-    local RELEASE ARCH TEMPDIR
-    rlRun "RELEASE=$(uname -r)"
-    rlRun "ARCH=$(uname -i)"
-    if ! rpm -q kernel-debuginfo-$RELEASE &>/dev/null; then
-        rlLogInfo 'kernel-debuginfo not present, trying to install it'
-        rlRun "TEMPDIR=$(mktemp -d -p $HOME)" # $HOME to avoid "small" tmpfs
-        rlRun "pushd '$TEMPDIR'"
-        rlRun "koji download-build -q --debuginfo kernel-$RELEASE --arch $ARCH"
-        rlRun "dnf -y install ./kernel-debuginfo-*.rpm"
-        rlRun 'popd'
-        rlRun "rm -rf '$TEMPDIR'"
-    fi
-    rlAssertRpm kernel-debuginfo-$RELEASE
-}
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlLogInfo "PACKAGES=$PACKAGES"
-        rlLogInfo "REQUIRES=$REQUIRES"
-        rlLogInfo "COLLECTIONS=$COLLECTIONS"
-        rlLogInfo "KERNEL=$(uname -a)"
-
-        __have_kernel_debuginfo
-
-        rlAssertRpm --all
-
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-
-        rlRun "KERNEL_RELEASE=$(uname -r)"
-        rlRun "KMOD=/usr/lib/modules/$KERNEL_RELEASE/kernel/fs/nfsd/nfsd.ko"
-        rlRun "KMOD_XZ=$KMOD.xz"
-        rlRun "KMOD_DEBUG=/usr/lib/debug/$KMOD.debug"
-        rlAssertExists "$KMOD_DEBUG"
-        rlAssertExists "$KMOD_XZ"
-        [[ -e "$KMOD" ]] || rlRun "unxz -k $KMOD_XZ"
-        rlAssertExists "$KMOD"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "eu-unstrip $KMOD $KMOD_DEBUG --output=$TmpDir/unstripped.ko"
-        rlRun "objdump -drS $TmpDir/unstripped.ko &> /dev/null"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
--- a/tests/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat/Makefile
+++ b/tests/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat/Makefile
@ -1,66 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /tools/binutils/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat
-#   Description: Test for BZ#1226864 (ld crashes on ppc64 when being used with --oformat)
-#   Author: Milos Prchlik <mprchlik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2015 Red Hat, Inc.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/binutils/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE ldtest.S
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Prchlik <mprchlik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for BZ#1226864 (ld crashes on ppc64 when being used with --oformat)" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        15m" >> $(METADATA)
-	@echo "RunFor:          binutils" >> $(METADATA)
-	@echo "Requires:        binutils" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    yes" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             1226864" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
-	@echo "Architectures:   x86_64 ppc64 ppc64le s390x" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat/PURPOSE
+++ b/tests/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat/PURPOSE
@ -1,5 +0,0 @@
-PURPOSE of /tools/binutils/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat
-Description: Test for BZ#1226864 (ld crashes on ppc64 when being used with --oformat)
-Author: Milos Prchlik <mprchlik@redhat.com>
-Bug summary: ld crashes on ppc64 when being used with --oformat binary
-Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1226864
--- a/tests/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat/ldtest.S
+++ b/tests/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat/ldtest.S
@ -1,3 +0,0 @@
-.org 0x100
-  nop
-
--- a/tests/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat/main.fmf
+++ b/tests/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat/main.fmf
@ -1,17 +0,0 @@
-summary: Test for BZ#1226864 (ld crashes on ppc64 when being used with --oformat)
-description: |
-    Bug summary: ld crashes on ppc64 when being used with --oformat binary
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1226864
-contact: Milos Prchlik <mprchlik@redhat.com>
-component:
- binutils
-test: ./runtest.sh
-framework: beakerlib
-recommend:
- binutils
- gcc
-duration: 15m
-link:
-   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1226864
-extra-summary: /tools/binutils/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat
-extra-task: /tools/binutils/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat
--- a/tests/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat/runtest.sh
+++ b/tests/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat/runtest.sh
@ -1,79 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/binutils/Regression/bz1226864-ld-crashes-on-ppc64-when-being-used-with-oformat
-#   Description: Test for BZ#1226864 (ld crashes on ppc64 when being used with --oformat)
-#   Author: Milos Prchlik <mprchlik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2015 Red Hat, Inc.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-LD="${LD:-$(which ld)}"
-GCC="${GCC:-$(which gcc)}"
-PACKAGE=$(rpm --qf '%{name}\n' -qf $(which $LD) | head -1)
-REQUIRES="${REQUIRES:-$(rpm --qf '%{name}\n' -qf $(which $GCC) | head -1)}"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlLogInfo "PACKAGES=$PACKAGES"
-        rlLogInfo "REQUIRES=$REQUIRES"
-        rlLogInfo "COLLECTIONS=$COLLECTIONS"
-        rlLogInfo "GCC=$GCC"
-        rlLogInfo "LD=$LD"
-
-        rlLogInfo "SKIP_COLLECTION_METAPACKAGE_CHECK=$SKIP_COLLECTION_METAPACKAGE_CHECK"
-
-        # We optionally need to skip checking for the presence of the metapackage
-        # because that would pull in all the dependent toolset subrpms.  We do not
-        # always want that, especially in CI.
-        _COLLECTIONS="$COLLECTIONS"
-        if ! test -z $SKIP_COLLECTION_METAPACKAGE_CHECK; then
-            for c in $SKIP_COLLECTION_METAPACKAGE_CHECK; do
-                rlLogInfo "ignoring metapackage check for collection $c"
-                export COLLECTIONS=$(shopt -s extglob && echo ${COLLECTIONS//$c/})
-            done
-        fi
-
-        rlLogInfo "(without skipped) COLLECTIONS=$COLLECTIONS"
-
-        rlAssertRpm --all
-
-        export COLLECTIONS="$_COLLECTIONS"
-
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "cp ldtest.S $TmpDir/"
-        rlRun "pushd $TmpDir"
-        rlRun "gcc -c -o ldtest.o ldtest.S"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "ld --oformat=binary -o ldtest.bin ldtest.o"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
--- a/tests/Regression/bz1243559-aarch64-binutils-relocation-truncated-to-fit/Makefile
+++ b/tests/Regression/bz1243559-aarch64-binutils-relocation-truncated-to-fit/Makefile
@ -1,64 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /tools/binutils/Regression/bz1243559-aarch64-binutils-relocation-truncated-to-fit
-#   Description: Test for BZ#1243559 ([aarch64][binutils] relocation truncated to fit)
-#   Author: Milos Prchlik <mprchlik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2016 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/binutils/Regression/bz1243559-aarch64-binutils-relocation-truncated-to-fit
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE reproducer.c
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Milos Prchlik <mprchlik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test for BZ#1243559 ([aarch64][binutils] relocation truncated to fit)" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        15m" >> $(METADATA)
-	@echo "RunFor:          binutils" >> $(METADATA)
-	@echo "Requires:        binutils gcc" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Bug:             1243559" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
-
-	rhts-lint $(METADATA)
--- a/tests/Regression/bz1243559-aarch64-binutils-relocation-truncated-to-fit/PURPOSE
+++ b/tests/Regression/bz1243559-aarch64-binutils-relocation-truncated-to-fit/PURPOSE
@ -1,5 +0,0 @@
-PURPOSE of /tools/binutils/Regression/bz1243559-aarch64-binutils-relocation-truncated-to-fit
-Description: Test for BZ#1243559 ([aarch64][binutils] relocation truncated to fit)
-Author: Milos Prchlik <mprchlik@redhat.com>
-Bug summary: [aarch64][binutils] relocation truncated to fit: R_AARCH64_CALL26 (veneers not inserted)
-Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1243559
--- a/Show more
+++ b/Show more