binutils-testsuite-fixes.patch

@@ -1081,101 +1081,6 @@ diff -rup bin.orig/ld/testsuite/ld-x86-64/sframe-pltgot-2.d binutils-2.43.50-55e
      ]
  }
  
---- binutils.orig/binutils/testsuite/binutils-all/compress.exp	2026-06-08 13:41:05.074493887 +0100
-+++ binutils-with-gold-2.46/binutils/testsuite/binutils-all/compress.exp	2026-06-08 13:50:07.569033260 +0100
-@@ -140,10 +140,10 @@ if ![string match "" $got] then {
- }
- 
- # Xfail this test if there are no compressed sections.
--setup_xfail "$compression_used$target_triplet"
- set testname "objcopy compress debug sections in archive with zlib-gnu"
- set got [binutils_run $OBJCOPY "--compress-debug-sections=zlib-gnu ${copyfile}.a ${compressedcopyfile}.a"]
- if ![string match "" $got] then {
-+    setup_xfail "$compression_used$target_triplet"
-     fail "objcopy ($testname)"
- } else {
-     set got [remote_exec host "$OBJDUMP -s -j .zdebug_line ${compressedcopyfile}.a" "" "/dev/null" "tmpdir/libdw2-compressed.out"]
-@@ -154,8 +154,8 @@ if ![string match "" $got] then {
- 	send_log "\n"
-     }
- 
--    setup_xfail "$compression_used$target_triplet"
-     if { [regexp_diff tmpdir/libdw2-compressed.out $srcdir/$subdir/libdw2-compressed.out] } then {
-+	setup_xfail "$compression_used$target_triplet"
- 	fail "$testname"
-     } else {
- 	pass "$testname"
-@@ -380,44 +380,18 @@ if ![string match "" $exec_output] then
- set testname "objcopy zlib-gabi compress debug sections with zlib-gnu"
- set got [binutils_run $OBJCOPY "--compress-debug-sections=zlib-gnu ${compressedfile}gabi.o ${copyfile}gnu.o"]
- if ![string match "" $got] then {
--    fail "objcopy ($testname)"
-+    fail "objcopy ($testname) (unexpected output)"
-     return
- }
--send_log "cmp ${compressedfile}gnu.o ${copyfile}gnu.o\n"
--verbose "cmp ${compressedfile}gnu.o ${copyfile}gnu.o"
--set src1 ${compressedfile}gnu.o
--set src2 ${copyfile}gnu.o
--set status [remote_exec build cmp "${src1} ${src2}"]
--set exec_output [lindex $status 1]
--set exec_output [prune_warnings $exec_output]
--if ![string match "" $exec_output] then {
--    send_log "$exec_output\n"
--    verbose "$exec_output" 1
--    fail "objcopy ($testname)"
--} else {
--    pass "objcopy ($testname)"
--}
-+pass "objcopy ($testname)"
- 
- set testname "objcopy compress debug sections 3 with zlib-gabi"
- set got [binutils_run $OBJCOPY "--compress-debug-sections=zlib-gabi ${testfile3}.o ${copyfile}gabi.o"]
- if ![string match "" $got] then {
--    fail "objcopy ($testname)"
-+    fail "objcopy ($testname) (unexpected output)"
-     return
- }
--send_log "cmp ${compressedfile3}gabi.o ${copyfile}gabi.o\n"
--verbose "cmp ${compressedfile3}gabi.o ${copyfile}gabi.o"
--set src1 ${compressedfile3}gabi.o
--set src2 ${copyfile}gabi.o
--set status [remote_exec build cmp "${src1} ${src2}"]
--set exec_output [lindex $status 1]
--set exec_output [prune_warnings $exec_output]
--if ![string match "" $exec_output] then {
--    send_log "$exec_output\n"
--    verbose "$exec_output" 1
--    fail "objcopy ($testname)"
--} else {
--    pass "objcopy ($testname)"
--}
-+pass "objcopy ($testname)"
- 
- set testname "objcopy decompress compressed debug sections 3 with zlib-gabi"
- set got [binutils_run $OBJCOPY "--decompress-debug-sections ${compressedfile3}gabi.o ${copyfile}gabi.o"]
-@@ -467,20 +441,7 @@ if ![string match "" $got] then {
-     fail "objcopy ($testname)"
-     return
- }
--send_log "cmp ${compressedfile3}gnu.o ${copyfile}gnu.o\n"
--verbose "cmp ${compressedfile3}gnu.o ${copyfile}gnu.o"
--set src1 ${compressedfile3}gnu.o
--set src2 ${copyfile}gnu.o
--set status [remote_exec build cmp "${src1} ${src2}"]
--set exec_output [lindex $status 1]
--set exec_output [prune_warnings $exec_output]
--if ![string match "" $exec_output] then {
--    send_log "$exec_output\n"
--    verbose "$exec_output" 1
--    fail "objcopy ($testname)"
--} else {
--    pass "objcopy ($testname)"
--}
-+pass "objcopy ($testname)"
- 
- set testname "objcopy zlib-gnu compress debug sections 3"
- set got [binutils_run $OBJCOPY "${compressedfile3}gnu.o ${copyfile}gnu.o"]
 --- binutils.orig/ld/testsuite/ld-vsb/vsb.exp	2026-06-08 13:41:08.963591902 +0100
 +++ binutils-with-gold-2.46/ld/testsuite/ld-vsb/vsb.exp	2026-06-08 13:51:38.305503190 +0100
 @@ -402,12 +402,6 @@ proc visibility_run {visibility} {
@@ -1191,16 +1096,6 @@ diff -rup bin.orig/ld/testsuite/ld-x86-64/sframe-pltgot-2.d binutils-2.43.50-55e
  	}
  
  	# Now compile the code using -fpic.
---- binutils.orig/ld/testsuite/ld-srec/srec.exp	2026-06-08 14:48:04.448866943 +0100
-+++ binutils-with-gold-2.46/ld/testsuite/ld-srec/srec.exp	2026-06-08 14:49:27.240507723 +0100
-@@ -489,6 +489,7 @@ setup_xfail "bfin-*-linux-uclibc"
- setup_xfail "tile*-*-*"
- setup_xfail "csky*-*-*"
- setup_xfail "bpf-*-*"
-+setup_xfail "i686-*-*"
- 
- run_srec_test $test2 "tmpdir/sr3.o"
- 
 --- binutils.orig/ld/testsuite/ld-vsb/vsb.exp	2026-06-08 14:48:04.461311027 +0100
 +++ binutils-with-gold-2.46/ld/testsuite/ld-vsb/vsb.exp	2026-06-08 16:14:22.446290582 +0100
 @@ -384,9 +384,7 @@ proc visibility_run {visibility} {

binutils.spec

@@ -10,12 +10,6 @@
 %{?scl_package:%global scl gcc-toolset-%{gts_ver}}
 %global scl_prefix gcc-toolset-%{gts_ver}-
 
-%if %have_scl_utils
-BuildRequires: scl-utils-build
-%else
-BuildRequires: gcc-toolset-%{gts_ver}-devel
-%endif
-
 %global __python /usr/bin/python3
 %{?scl:%scl_package binutils}
 
@@ -27,7 +21,7 @@ Name: %{?scl_prefix}binutils
 # The variable %%{source} (see below) should be set to indicate which of these
 # origins is being used.
 Version: 2.46
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL-3.0-or-later AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND BSD-3-Clause AND GFDL-1.3-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later
 URL: https://sourceware.org/binutils
 
@@ -162,7 +156,7 @@ URL: https://sourceware.org/binutils
 # Bootstrapping: Set this to 1 to build the binutils with the system gcc.
 # Then once GTS-gcc is built and in the buildroot, reset this variable
 # to 0, bump the NVR and rebuild GTS-binutils.
-%define bootstrapping 1
+%define bootstrapping 0
 
 #----End of Configure Options------------------------------------------------
 
@@ -390,6 +384,19 @@ BuildRequires: autoconf, automake, perl, sed, coreutils, make
 # Bison is used to generate gold/yyscript.c and ld/ldgram.c.
 BuildRequires: bison
 
+%if ! %{bootstrapping}
+# Libatomic is automatically added to the link command line by GTS-gcc.
+BuildRequires: %{?scl_prefix}libatomic-devel
+%endif
+
+%if %have_scl_utils
+BuildRequires: scl-utils-build
+%else
+%if ! %{bootstrapping}
+BuildRequires: gcc-toolset-%{gts_ver}-devel
+%endif
+%endif
+
 %if %{with clang}
 
 BuildRequires: clang compiler-rt
@@ -518,8 +525,13 @@ BuildRequires: libzstd-devel
 Requires:  (%{?scl_prefix}runtime >= %{gts_ver} with %{?scl_prefix}runtime < %{gts_next})
 %endif
 
+%if %{bootstrapping}
+%define alternatives_cmd     /usr/sbin/alternatives
+%define alternatives_cmdline %{alternatives_cmd}
+%else
 %define alternatives_cmd     %{!?scl:%{_sbindir}}%{?scl:%{_root_sbindir}}/alternatives
 %define alternatives_cmdline %{alternatives_cmd}%{?scl: --altdir %{_sysconfdir}/alternatives --admindir %{_scl_root}/var/lib/alternatives}
+%endif
 
 Requires(post):  %{alternatives_cmd}
 Requires(preun): %{alternatives_cmd}
@@ -1382,8 +1394,10 @@ done
 export QA_RPATHS=0x0003
 
 %if %have_scl_utils == 0
+%if ! %{bootstrapping}
 mkdir -p %{buildroot}%{_scl_root}/etc/alternatives %{buildroot}%{_scl_root}/var/lib/alternatives
 %endif
+%endif
 
 #----------------------------------------------------------------------------
 
@@ -1511,7 +1525,6 @@ exit 0
 
 %if %{with docs}
 %{_mandir}/man1/
-%exclude %{_mandir}/man1/gp-*
 %exclude %{_mandir}/man1/gprofng*
 %{_infodir}/as.info.*
 %{_infodir}/binutils.info.*
@@ -1548,9 +1561,11 @@ exit 0
 %endif
 
 %if %have_scl_utils == 0
+%if ! %{bootstrapping}
 %dir %{_scl_root}/etc/alternatives
 %dir %{_scl_root}/var/lib/alternatives
 %endif
+%endif
 
 #------------------------------------
 
@@ -1585,7 +1600,11 @@ exit 0
 %{_bindir}/gprofng-*
 %dir %{_libdir}/gprofng
 %{_libdir}/gprofng/*
+%if %{bootstrapping}
+/etc/gprofng.rc
+%else
 %{_scl_root}/etc/gprofng.rc
+%endif
 
 %if %{enable_shared}
 %{_libdir}/libgprofng.*
@@ -1632,6 +1651,12 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Thu Aug 06 2026 Nick Clifton  <nickc@redhat.com> - 2.46-3
+- Disable bootstrapping mode.  Add build requirement for libatomic-devel.  (RHEL-208907)
+
+* Mon Jul 06 2026 Siddhesh Poyarekar  <siddhesh@redhat.com> - 2.46-2
+- Fix alternatives path when bootstrapping (RHEL-191862)
+
 * Mon Jun 08 2026 Nick Clifton  <nickc@redhat.com> - 2.46-1
-- Initial commit on c9s.  (RHELMISC-34713)
--    Resolves: RHELMISC-34713
+- Initial commit on c10s.  (RHELMISC-34705)
+-    Resolves: RHELMISC-34705

gating.yaml

@@ -7,7 +7,7 @@ rules:
   - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation}
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-10
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional}