diff --git a/binutils-testsuite-fixes.patch b/binutils-testsuite-fixes.patch index a52b6a9..c0756a0 100644 --- a/binutils-testsuite-fixes.patch +++ b/binutils-testsuite-fixes.patch @@ -1203,3 +1203,21 @@ diff -rup binutils.orig/ld/testsuite/ld-elf/tls.exp binutils-2.40/ld/testsuite/l if [ string match $shared_needs_pic "yes" ] { setup_xfail "arm*-*-linux*" } +--- binutils.orig/ld/testsuite/ld-ctf/slice.d 2023-08-03 10:14:42.141231721 +0100 ++++ binutils-2.40/ld/testsuite/ld-ctf/slice.d 2023-08-03 10:17:52.161503327 +0100 +@@ -24,10 +24,10 @@ Contents of CTF section .ctf: + Types: + #... + 0x[0-9a-f]*: \(kind 6\) struct slices \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) +- *\[0x0\] one: ID 0x[0-9a-f]*: \(kind 1\) int:1 \[slice 0x0:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) +- *\[0x1\] two: ID 0x[0-9a-f]*: \(kind 1\) int:2 \[slice 0x0:0x2\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) +- *\[0x3\] six: ID 0x[0-9a-f]*: \(kind 1\) int:6 \[slice 0x0:0x6\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) +- *\[0x9\] ten: ID 0x[0-9a-f]*: \(kind 1\) int:10 \[slice 0x0:0xa\] \(format 0x1\) \(size 0x2\) \(aligned at 0x2\) +- *\[0x13\] bar: ID 0x[0-9a-f]*: \(kind 8\) enum foo:1 \[slice 0x0:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) ++ *\[0x0\] one: ID 0x[0-9a-f]*: \(kind 1\) int:1 \[slice 0x.:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) ++ *\[0x.\] two: ID 0x[0-9a-f]*: \(kind 1\) int:2 \[slice 0x.:0x2\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) ++ *\[0x.\] six: ID 0x[0-9a-f]*: \(kind 1\) int:6 \[slice 0x.:0x6\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) ++ *\[0x.\] ten: ID 0x[0-9a-f]*: \(kind 1\) int:10 \[slice 0x.:0xa\] \(format 0x1\) \(size 0x2\) \(aligned at 0x2\) ++ *\[0x.*\] bar: ID 0x[0-9a-f]*: \(kind 8\) enum foo:1 \[slice 0x.*:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) + + #... diff --git a/binutils.spec b/binutils.spec index 450b2d8..fa4a8a0 100644 --- a/binutils.spec +++ b/binutils.spec @@ -9,7 +9,7 @@ BuildRequires: scl-utils-build Summary: A GNU collection of binary utilities Name: %{?scl_prefix}binutils Version: 2.40 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -300,15 +300,11 @@ BuildRequires: clang compiler-rt # that will be used by consumers of GTS binutils. # Note - during GTS bootstrap these have to be changed to the systemOS versions. BuildRequires: %{?scl_prefix}gcc +BuildRequires: %{?scl_prefix}annobin-plugin-gcc BuildRequires: %{?scl_prefix}gcc-c++ %define gcc_for_libraries %{?_scl_root}/usr/bin/gcc %define gxx_for_libraries %{?_scl_root}/usr/bin/g++ -BuildRequires: gcc -BuildRequires: gcc-c++ -%define gcc_for_libraries gcc -%define gxx_for_libraries g++ - # Note - during GTS bootstrap it may be necessary to build the binutils without # annobin annotations. # %%undefine _annotated_build @@ -1280,6 +1276,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Thu Aug 03 2023 Nick Clifton - 2.40-13 +- Spec File: Really fix building with GTS-13 gcc. (#2217911) + * Mon Jun 26 2023 Nick Clifton - 2.40-12 - Spec File: Enable building with GTS-13 gcc. (#2217911) - Spec File: Build static libraries with -fno-lto.