From 3379a356ac28e4edece03cff8b013db9974d081c42dea46d92f3d44196fa94fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 14 Jun 2024 17:14:22 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main gcc13 revision 3773381ba65cc0b739118623262d54d1 --- cross-aarch64-gcc13-bootstrap.spec | 50 ++-- cross-aarch64-gcc13.spec | 50 ++-- cross-amdgcn-gcc13.spec | 50 ++-- cross-arm-gcc13.spec | 50 ++-- cross-arm-none-gcc13-bootstrap.spec | 50 ++-- cross-arm-none-gcc13.spec | 50 ++-- cross-avr-gcc13-bootstrap.spec | 50 ++-- cross-avr-gcc13.spec | 50 ++-- cross-bpf-gcc13.spec | 50 ++-- cross-epiphany-gcc13-bootstrap.spec | 50 ++-- cross-epiphany-gcc13.spec | 50 ++-- cross-hppa-gcc13-bootstrap.spec | 50 ++-- cross-hppa-gcc13.spec | 50 ++-- cross-m68k-gcc13.spec | 50 ++-- cross-mips-gcc13.spec | 50 ++-- cross-nvptx-gcc13.spec | 50 ++-- cross-ppc64-gcc13.spec | 50 ++-- cross-ppc64le-gcc13-bootstrap.spec | 50 ++-- cross-ppc64le-gcc13.spec | 50 ++-- cross-pru-gcc13-bootstrap.spec | 50 ++-- cross-pru-gcc13.spec | 50 ++-- cross-riscv64-elf-gcc13-bootstrap.spec | 50 ++-- cross-riscv64-elf-gcc13.spec | 50 ++-- cross-riscv64-gcc13-bootstrap.spec | 50 ++-- cross-riscv64-gcc13.spec | 50 ++-- cross-rx-gcc13-bootstrap.spec | 50 ++-- cross-rx-gcc13.spec | 50 ++-- cross-s390x-gcc13-bootstrap.spec | 50 ++-- cross-s390x-gcc13.spec | 50 ++-- cross-sparc-gcc13.spec | 50 ++-- cross-sparc64-gcc13.spec | 50 ++-- cross-x86_64-gcc13.spec | 50 ++-- cross.spec.in | 6 +- gcc-13.2.1+git8285.tar.xz | 3 - gcc-13.3.0+git8781.tar.xz | 3 + gcc.spec.in | 52 +++-- gcc13-amdgcn-remove-fiji.patch | 310 +++++++++++++++++++++++++ gcc13-pr101523.patch | 46 ++++ gcc13-testresults.spec | 44 ++-- gcc13.changes | 52 +++++ gcc13.spec | 50 ++-- 41 files changed, 1361 insertions(+), 805 deletions(-) delete mode 100644 gcc-13.2.1+git8285.tar.xz create mode 100644 gcc-13.3.0+git8781.tar.xz create mode 100644 gcc13-amdgcn-remove-fiji.patch create mode 100644 gcc13-pr101523.patch diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec index 2c1f767..f1dcc56 100644 --- a/cross-aarch64-gcc13-bootstrap.spec +++ b/cross-aarch64-gcc13-bootstrap.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec index b10f812..2712b1b 100644 --- a/cross-aarch64-gcc13.spec +++ b/cross-aarch64-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec index 076da5c..7e3dd18 100644 --- a/cross-amdgcn-gcc13.spec +++ b/cross-amdgcn-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec index 17dcbf8..9a580c3 100644 --- a/cross-arm-gcc13.spec +++ b/cross-arm-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec index 7d7a48a..154503b 100644 --- a/cross-arm-none-gcc13-bootstrap.spec +++ b/cross-arm-none-gcc13-bootstrap.spec @@ -108,7 +108,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -137,6 +137,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -255,14 +257,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -344,30 +346,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -469,7 +473,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -893,7 +897,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec index d389dc9..82649b8 100644 --- a/cross-arm-none-gcc13.spec +++ b/cross-arm-none-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec index d7a2a70..8241584 100644 --- a/cross-avr-gcc13-bootstrap.spec +++ b/cross-avr-gcc13-bootstrap.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec index 8f4d60f..d503de4 100644 --- a/cross-avr-gcc13.spec +++ b/cross-avr-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec index f25802a..4f90ce2 100644 --- a/cross-bpf-gcc13.spec +++ b/cross-bpf-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec index 80f8428..54ccd99 100644 --- a/cross-epiphany-gcc13-bootstrap.spec +++ b/cross-epiphany-gcc13-bootstrap.spec @@ -108,7 +108,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -137,6 +137,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -255,14 +257,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -344,30 +346,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -469,7 +473,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -893,7 +897,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec index 393fde7..1ef20e1 100644 --- a/cross-epiphany-gcc13.spec +++ b/cross-epiphany-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec index 6244f9b..66b3147 100644 --- a/cross-hppa-gcc13-bootstrap.spec +++ b/cross-hppa-gcc13-bootstrap.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec index 95a44eb..b9d1c51 100644 --- a/cross-hppa-gcc13.spec +++ b/cross-hppa-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec index e21cd4b..de6399b 100644 --- a/cross-m68k-gcc13.spec +++ b/cross-m68k-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec index 372f9f0..3aa75e7 100644 --- a/cross-mips-gcc13.spec +++ b/cross-mips-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec index a07189b..b0c1f75 100644 --- a/cross-nvptx-gcc13.spec +++ b/cross-nvptx-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec index af2b955..428f587 100644 --- a/cross-ppc64-gcc13.spec +++ b/cross-ppc64-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-ppc64le-gcc13-bootstrap.spec b/cross-ppc64le-gcc13-bootstrap.spec index ba407f5..379cc3a 100644 --- a/cross-ppc64le-gcc13-bootstrap.spec +++ b/cross-ppc64le-gcc13-bootstrap.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec index 7b551ff..ecde70c 100644 --- a/cross-ppc64le-gcc13.spec +++ b/cross-ppc64le-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec index e82aeb1..6ce9dab 100644 --- a/cross-pru-gcc13-bootstrap.spec +++ b/cross-pru-gcc13-bootstrap.spec @@ -108,7 +108,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -137,6 +137,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -255,14 +257,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -344,30 +346,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -469,7 +473,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -893,7 +897,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec index 5164d34..16694d6 100644 --- a/cross-pru-gcc13.spec +++ b/cross-pru-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec index 7c43b87..5469c27 100644 --- a/cross-riscv64-elf-gcc13-bootstrap.spec +++ b/cross-riscv64-elf-gcc13-bootstrap.spec @@ -108,7 +108,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -137,6 +137,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -255,14 +257,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -344,30 +346,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -469,7 +473,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -893,7 +897,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec index 5f73eff..2dcb168 100644 --- a/cross-riscv64-elf-gcc13.spec +++ b/cross-riscv64-elf-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec index 2c38aa1..5c1f783 100644 --- a/cross-riscv64-gcc13-bootstrap.spec +++ b/cross-riscv64-gcc13-bootstrap.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec index cc7cd3c..7175f79 100644 --- a/cross-riscv64-gcc13.spec +++ b/cross-riscv64-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec index 564368d..1f9aae2 100644 --- a/cross-rx-gcc13-bootstrap.spec +++ b/cross-rx-gcc13-bootstrap.spec @@ -108,7 +108,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -137,6 +137,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -255,14 +257,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -344,30 +346,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -469,7 +473,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -893,7 +897,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec index 9e08d31..f27fb02 100644 --- a/cross-rx-gcc13.spec +++ b/cross-rx-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-s390x-gcc13-bootstrap.spec b/cross-s390x-gcc13-bootstrap.spec index 9531a12..8e77508 100644 --- a/cross-s390x-gcc13-bootstrap.spec +++ b/cross-s390x-gcc13-bootstrap.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec index 1a55ad6..7b3acc3 100644 --- a/cross-s390x-gcc13.spec +++ b/cross-s390x-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec index 0d52125..70816b3 100644 --- a/cross-sparc-gcc13.spec +++ b/cross-sparc-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec index 9a4c644..7c430f8 100644 --- a/cross-sparc64-gcc13.spec +++ b/cross-sparc64-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec index cae319a..1d4f80f 100644 --- a/cross-x86_64-gcc13.spec +++ b/cross-x86_64-gcc13.spec @@ -107,7 +107,7 @@ Name: %{pkgname} %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -136,6 +136,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -254,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -343,30 +345,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -468,7 +472,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -892,7 +896,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross.spec.in b/cross.spec.in index 3883932..0b62ef9 100644 --- a/cross.spec.in +++ b/cross.spec.in @@ -160,13 +160,13 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif -Requires: lld +Requires: lld%{product_libs_llvm_ver} Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -344,7 +344,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/gcc-13.2.1+git8285.tar.xz b/gcc-13.2.1+git8285.tar.xz deleted file mode 100644 index 7a47d9d..0000000 --- a/gcc-13.2.1+git8285.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3ce64d7c0b0608834866b2031164011a833d1c37657994539a5270b9d45941b -size 87270564 diff --git a/gcc-13.3.0+git8781.tar.xz b/gcc-13.3.0+git8781.tar.xz new file mode 100644 index 0000000..c805335 --- /dev/null +++ b/gcc-13.3.0+git8781.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36b7233e20d0098470f4724bd5872892f4a3f2d9c6659356fafb3e787c70b299 +size 87275840 diff --git a/gcc.spec.in b/gcc.spec.in index 5386a5d..289a946 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -204,7 +204,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 1 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -388,6 +388,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1063,7 +1065,11 @@ Provides: libgccjit%{libgccjit_sover} = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions # to co-exist without an overly large list of provides/obsoletes Conflicts: %selfconflict libgccjit%{libgccjit_sover} -Requires: gcc@base_ver@ +# At runtime the JIT needs to be able to invoke the assembler and +# linker and find startfiles and libgcc. The built-in driver knows +# the compilers version install directory only so we require the +# respective compiler libgccjit was built from. +Requires: gcc@base_ver@ %description -n libgccjit%{libgccjit_sover}%{libgccjit_suffix} Support for embedding GCC inside programs and libraries @@ -1080,7 +1086,7 @@ Provides: libgccjit%{libgccjit_sover}-devel = %{version}-%{release} # Only one gccjit package can be installed at the same time since # header files conflict Conflicts: %selfconflict libgccjit%{libgccjit_sover}-devel -Requires: libgccjit%{libgccjit_sover}%{libgccjit_suffix} +Requires: libgccjit%{libgccjit_sover} >= %{version}-%{release} %description -n libgccjit%{libgccjit_sover}-devel%{libdevel_suffix} Package contains header files and documentation for GCC JIT front-end. @@ -1337,30 +1343,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -1462,7 +1470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" diff --git a/gcc13-amdgcn-remove-fiji.patch b/gcc13-amdgcn-remove-fiji.patch new file mode 100644 index 0000000..4412b46 --- /dev/null +++ b/gcc13-amdgcn-remove-fiji.patch @@ -0,0 +1,310 @@ +From 601796b14b5bab6715b0ddff23f6d998a310b507 Mon Sep 17 00:00:00 2001 +From: Andrew Stubbs +Date: Wed, 18 Oct 2023 16:59:42 +0100 +Subject: [PATCH 1/2] amdgcn: deprecate Fiji device and multilib +To: gcc-patches@gcc.gnu.org + +LLVM wants to remove it, which breaks our build. This patch means that +most users won't notice that change, when it comes, and those that do will +have chosen to enable Fiji explicitly. + +I'm selecting gfx900 as the new default as that's the least likely for users +to want, which means most users will specify -march explicitly, which means +we'll be free to change the default again, when we need to, without breaking +anybody's makefiles. + +gcc/ChangeLog: + + * config.gcc (amdgcn): Switch default to --with-arch=gfx900. + Implement support for --with-multilib-list. + * config/gcn/t-gcn-hsa: Likewise. + * doc/install.texi: Likewise. + * doc/invoke.texi: Mark Fiji deprecated. +--- + gcc/config.gcc | 14 +++++++++++++- + gcc/config/gcn/t-gcn-hsa | 8 ++++++-- + gcc/doc/install.texi | 17 ++++++++++++++++- + gcc/doc/invoke.texi | 4 +++- + 4 files changed, 38 insertions(+), 5 deletions(-) + +diff --git a/gcc/config.gcc b/gcc/config.gcc +index c3b73d05eb7..a662cfea03c 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -4475,7 +4475,19 @@ case "${target}" in + ;; + esac + done +- [ "x$with_arch" = x ] && with_arch=fiji ++ [ "x$with_arch" = x ] && with_arch=gfx900 ++ ++ case "x${with_multilib_list}" in ++ x | xno) ++ TM_MULTILIB_CONFIG= ++ ;; ++ xdefault | xyes) ++ TM_MULTILIB_CONFIG=`echo "gfx900,gfx906,gfx908,gfx90a" | sed "s/${with_arch},\?//;s/,$//"` ++ ;; ++ *) ++ TM_MULTILIB_CONFIG="${with_multilib_list}" ++ ;; ++ esac + ;; + + hppa*-*-*) +diff --git a/gcc/config/gcn/t-gcn-hsa b/gcc/config/gcn/t-gcn-hsa +index ea27122e484..18db7075356 100644 +--- a/gcc/config/gcn/t-gcn-hsa ++++ b/gcc/config/gcn/t-gcn-hsa +@@ -42,8 +42,12 @@ ALL_HOST_OBJS += gcn-run.o + gcn-run$(exeext): gcn-run.o + +$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ $< -ldl + +-MULTILIB_OPTIONS = march=gfx900/march=gfx906/march=gfx908/march=gfx90a +-MULTILIB_DIRNAMES = gfx900 gfx906 gfx908 gfx90a ++empty := ++space := $(empty) $(empty) ++comma := , ++multilib_list := $(subst $(comma),$(space),$(TM_MULTILIB_CONFIG)) ++MULTILIB_OPTIONS = $(subst $(space),/,$(addprefix march=,$(multilib_list))) ++MULTILIB_DIRNAMES = $(multilib_list) + + gcn-tree.o: $(srcdir)/config/gcn/gcn-tree.cc + $(COMPILE) $< +diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi +index b30d3691fe6..5f55da89840 100644 +--- a/gcc/doc/install.texi ++++ b/gcc/doc/install.texi +@@ -1218,7 +1218,7 @@ sysv, aix. + @itemx --without-multilib-list + Specify what multilibs to build. @var{list} is a comma separated list of + values, possibly consisting of a single value. Currently only implemented +-for aarch64*-*-*, arm*-*-*, loongarch64-*-*, riscv*-*-*, sh*-*-* and ++for aarch64*-*-*, amdgcn*-*-*, arm*-*-*, loongarch64-*-*, riscv*-*-*, sh*-*-* and + x86-64-*-linux*. The accepted values and meaning for each target is given + below. + +@@ -1232,6 +1232,15 @@ default run-time library will be built. If @var{list} is + default set of libraries is selected based on the value of + @option{--target}. + ++@item amdgcn*-*-* ++@var{list} is a comma separated list of ISA names (allowed values: @code{fiji}, ++@code{gfx900}, @code{gfx906}, @code{gfx908}, @code{gfx90a}). It ought not ++include the name of the default ISA, specified via @option{--with-arch}. If ++@var{list} is empty, then there will be no multilibs and only the default ++run-time library will be built. If @var{list} is @code{default} or ++@option{--with-multilib-list=} is not specified, then the default set of ++libraries is selected. ++ + @item arm*-*-* + @var{list} is a comma separated list of @code{aprofile} and + @code{rmprofile} to build multilibs for A or R and M architecture +@@ -3876,6 +3885,12 @@ To run the binaries, install the HSA Runtime from the + @file{libexec/gcc/amdhsa-amdhsa/@var{version}/gcn-run} to launch them + on the GPU. + ++To enable support for GCN3 Fiji devices (gfx803), GCC has to be configured with ++@option{--with-arch=@code{fiji}} or ++@option{--with-multilib-list=@code{fiji},...}. Note that support for Fiji ++devices has been removed in ROCm 4.0 and support in LLVM is deprecated and will ++be removed in the future. ++ + @html +
+ @end html +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 792ce283bb9..5fd30cf5eae 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -20773,7 +20773,9 @@ are + + @table @samp + @item fiji +-Compile for GCN3 Fiji devices (gfx803). ++Compile for GCN3 Fiji devices (gfx803). Support deprecated; availablility ++depends on how GCC has been configured, see @option{--with-arch} and ++@option{--with-multilib-list}. + + @item gfx900 + Compile for GCN5 Vega 10 devices (gfx900). +-- +2.35.3 + + +From 4217f929357f23a94dec1d3946c84c6194ab385f Mon Sep 17 00:00:00 2001 +From: Tobias Burnus +Date: Mon, 22 Jan 2024 12:17:12 +0100 +Subject: [PATCH 2/2] [gcn] mkoffload: Fix linking with "-g"; fix file + deletion; improve diagnostic [PR111966] +To: gcc-patches@gcc.gnu.org + +With debugging enabled, '*.mkoffload.dbg.o' files are generated. The e_flags +header of all *.o files must be the same - otherwise, the linker complains. +Since r14-4734-g56ed1055b2f40ac162ae8d382280ac07a33f789f the -march= default +is now gfx900. If compiling without any -march= flag, the default value is +used by the compiler but not passed to mkoffload. Hence, mkoffload.cc's uses +its own default for march - unfortunately, it still had gfx803/fiji as default, +leading to the linker error: 'incompatible mach'. Solution: Update the +default to gfx900. + +While debugging it, I saw that /tmp/cc*.mkoffload.dbg.o kept accumulating; +there were a couple of issues with the handling: +* dbgobj was always added to files_to_cleanup +* If copy_early_debug_info returned true, dbgobj was added again + -> pointless and in theory a race if the same file was added in the + faction of a second. +* If copy_early_debug_info returned false, + - In exactly one case, it already deleted the file it self + (same potential race as above) + - The pointer dbgobj was freed - such that files_to_cleanup contained + a dangling pointer - probably the reason that stale files remained. +Solution: Only if copy_early_debug_info returns true, dbgobj is added to +files_to_cleanup. If it returns false, the file is unlinked before freeing +the pointer. + +When compiling, GCC warned about several fatal_error messages as having +no %<...%> or %qs quotes. This patch now silences several of those warnings +by using those quotes. + +gcc/ChangeLog: + + PR other/111966 + * config/gcn/mkoffload.cc (elf_arch): Change default to gfx900 + to match the compiler default. + (simple_object_copy_lto_debug_sections): Never unlink the outfile + on error as the caller does so. + (maybe_unlink, compile_native): Use %<...%> and %qs in fatal_error. + (main): Likewise. Fix 'mkoffload.dbg.o' cleanup. + +Signed-off-by: Tobias Burnus +--- + gcc/config/gcn/mkoffload.cc | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/gcc/config/gcn/mkoffload.cc b/gcc/config/gcn/mkoffload.cc +index 61bc9273077..57bda59d868 100644 +--- a/gcc/config/gcn/mkoffload.cc ++++ b/gcc/config/gcn/mkoffload.cc +@@ -113,7 +113,7 @@ static const char *gcn_dumpbase; + static struct obstack files_to_cleanup; + + enum offload_abi offload_abi = OFFLOAD_ABI_UNSET; +-uint32_t elf_arch = EF_AMDGPU_MACH_AMDGCN_GFX803; // Default GPU architecture. ++uint32_t elf_arch = EF_AMDGPU_MACH_AMDGCN_GFX900; // Default GPU architecture. + uint32_t elf_flags = + (EF_AMDGPU_FEATURE_XNACK_ANY_V4 | EF_AMDGPU_FEATURE_SRAMECC_ANY_V4); + +@@ -144,7 +144,7 @@ maybe_unlink (const char *file) + if (!save_temps) + { + if (unlink_if_ordinary (file) && errno != ENOENT) +- fatal_error (input_location, "deleting file %s: %m", file); ++ fatal_error (input_location, "deleting file %qs: %m", file); + } + else if (verbose) + fprintf (stderr, "[Leaving %s]\n", file); +@@ -310,10 +310,7 @@ copy_early_debug_info (const char *infile, const char *outfile) + + errmsg = simple_object_copy_lto_debug_sections (inobj, outfile, &err, true); + if (errmsg) +- { +- unlink_if_ordinary (outfile); +- return false; +- } ++ return false; + + simple_object_release_read (inobj); + close (infd); +@@ -769,7 +766,7 @@ compile_native (const char *infile, const char *outfile, const char *compiler, + const char *collect_gcc_options = getenv ("COLLECT_GCC_OPTIONS"); + if (!collect_gcc_options) + fatal_error (input_location, +- "environment variable COLLECT_GCC_OPTIONS must be set"); ++ "environment variable % must be set"); + + struct obstack argv_obstack; + obstack_init (&argv_obstack); +@@ -824,11 +821,11 @@ main (int argc, char **argv) + + obstack_init (&files_to_cleanup); + if (atexit (mkoffload_cleanup) != 0) +- fatal_error (input_location, "atexit failed"); ++ fatal_error (input_location, "% failed"); + + char *collect_gcc = getenv ("COLLECT_GCC"); + if (collect_gcc == NULL) +- fatal_error (input_location, "COLLECT_GCC must be set."); ++ fatal_error (input_location, "% must be set"); + const char *gcc_path = dirname (ASTRDUP (collect_gcc)); + const char *gcc_exec = basename (ASTRDUP (collect_gcc)); + +@@ -874,7 +871,7 @@ main (int argc, char **argv) + + if (!found) + fatal_error (input_location, +- "offload compiler %s not found", GCC_INSTALL_NAME); ++ "offload compiler %qs not found", GCC_INSTALL_NAME); + + /* We may be called with all the arguments stored in some file and + passed with @file. Expand them into argv before processing. */ +@@ -896,7 +893,7 @@ main (int argc, char **argv) + offload_abi = OFFLOAD_ABI_ILP32; + else + fatal_error (input_location, +- "unrecognizable argument of option " STR); ++ "unrecognizable argument of option %<" STR "%>"); + } + #undef STR + else if (strcmp (argv[i], "-fopenmp") == 0) +@@ -941,7 +938,8 @@ main (int argc, char **argv) + } + + if (!(fopenacc ^ fopenmp)) +- fatal_error (input_location, "either -fopenacc or -fopenmp must be set"); ++ fatal_error (input_location, ++ "either %<-fopenacc%> or %<-fopenmp%> must be set"); + + const char *abi; + switch (offload_abi) +@@ -993,7 +991,7 @@ main (int argc, char **argv) + + cfile = fopen (gcn_cfile_name, "w"); + if (!cfile) +- fatal_error (input_location, "cannot open '%s'", gcn_cfile_name); ++ fatal_error (input_location, "cannot open %qs", gcn_cfile_name); + + /* Currently, we only support offloading in 64-bit configurations. */ + if (offload_abi == OFFLOAD_ABI_LP64) +@@ -1057,7 +1055,6 @@ main (int argc, char **argv) + } + else + dbgobj = make_temp_file (".mkoffload.dbg.o"); +- obstack_ptr_grow (&files_to_cleanup, dbgobj); + + /* If the copy fails then just ignore it. */ + if (copy_early_debug_info (argv[ix], dbgobj)) +@@ -1066,7 +1063,10 @@ main (int argc, char **argv) + obstack_ptr_grow (&files_to_cleanup, dbgobj); + } + else +- free (dbgobj); ++ { ++ maybe_unlink (dbgobj); ++ free (dbgobj); ++ } + } + } + } +@@ -1140,7 +1140,7 @@ main (int argc, char **argv) + + out = fopen (gcn_s2_name, "w"); + if (!out) +- fatal_error (input_location, "cannot open '%s'", gcn_s2_name); ++ fatal_error (input_location, "cannot open %qs", gcn_s2_name); + + process_asm (in, out, cfile); + +-- +2.35.3 + diff --git a/gcc13-pr101523.patch b/gcc13-pr101523.patch new file mode 100644 index 0000000..48731bd --- /dev/null +++ b/gcc13-pr101523.patch @@ -0,0 +1,46 @@ +From 5729ffad4db78b26f0d1f658a9fd695be5970550 Mon Sep 17 00:00:00 2001 +From: Richard Biener +Date: Wed, 3 Apr 2024 12:58:26 +0200 +Subject: [PATCH] rtl-optimization/101523 - avoid re-combine after noop 2->2 + combination +To: gcc-patches@gcc.gnu.org + +The following avoids re-walking and re-combining the instructions +between i2 and i3 when the pattern of i2 doesn't change. + + PR rtl-optimization/101523 + * combine.cc (try_combine): When the pattern of i2 doesn't + change do not re-start combining at i2 or an earlier insn which + had links or notes added. +--- + gcc/combine.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/gcc/combine.cc b/gcc/combine.cc +index a4479f8d836..ff25752cac4 100644 +--- a/gcc/combine.cc ++++ b/gcc/combine.cc +@@ -4186,6 +4186,10 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, + adjust_for_new_dest (i3); + } + ++ bool i2_unchanged = false; ++ if (rtx_equal_p (newi2pat, PATTERN (i2))) ++ i2_unchanged = true; ++ + /* We now know that we can do this combination. Merge the insns and + update the status of registers and LOG_LINKS. */ + +@@ -4752,6 +4756,9 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, + combine_successes++; + undo_commit (); + ++ if (i2_unchanged) ++ return i3; ++ + rtx_insn *ret = newi2pat ? i2 : i3; + if (added_links_insn && DF_INSN_LUID (added_links_insn) < DF_INSN_LUID (ret)) + ret = added_links_insn; +-- +2.35.3 + diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec index 61231c3..4b82c6f 100644 --- a/gcc13-testresults.spec +++ b/gcc13-testresults.spec @@ -221,7 +221,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -404,6 +404,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -527,30 +529,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -652,7 +656,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" diff --git a/gcc13.changes b/gcc13.changes index 73e94aa..f7c2457 100644 --- a/gcc13.changes +++ b/gcc13.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Tue May 21 08:56:28 UTC 2024 - Richard Biener + +- Update to GCC 13.3 release + +------------------------------------------------------------------- +Fri May 10 12:33:27 UTC 2024 - Richard Biener + +- Update to gcc-13 branch head, b7a2697733d19a093cbdd0e200, git8761 +- Removed gcc13-pr111731.patch now included upstream + +------------------------------------------------------------------- +Thu May 2 08:19:50 UTC 2024 - Richard Biener + +- Add gcc13-amdgcn-remove-fiji.patch removing Fiji support from + the GCN offload compiler as that is requiring Code Object version 3 + which is no longer supported by llvm18. + +------------------------------------------------------------------- +Thu Apr 4 07:43:17 UTC 2024 - Richard Biener + +- Add gcc13-pr101523.patch to avoid combine spending too much + compile-time and memory doing nothing on s390x. [boo#1188441] + +------------------------------------------------------------------- +Wed Mar 27 12:11:03 UTC 2024 - Richard Biener + +- Make requirement to lld version specific to avoid requiring the + meta-package. + +------------------------------------------------------------------- +Wed Mar 20 08:29:09 UTC 2024 - Richard Biener + +- Add gcc13-pr111731.patch to fix unwinding for JIT code. + [bsc#1221239] + +------------------------------------------------------------------- +Wed Mar 13 08:04:27 UTC 2024 - Richard Biener + +- Revert libgccjit dependency change. [boo#1220724] + +------------------------------------------------------------------- +Tue Mar 5 14:35:38 UTC 2024 - Richard Biener + +- Fix libgccjit-devel dependency, a newer shared library is OK. +- Fix libgccjit dependency, the corresponding compiler isn't required. + +------------------------------------------------------------------- +Thu Feb 22 14:50:13 UTC 2024 - Richard Biener + +- Use %patch -P N instead of %patchN. + ------------------------------------------------------------------- Thu Feb 8 08:17:53 UTC 2024 - Richard Biener diff --git a/gcc13.spec b/gcc13.spec index ccbcff4..4a37c31 100644 --- a/gcc13.spec +++ b/gcc13.spec @@ -200,7 +200,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 13.2.1+git8285 +Version: 13.3.0+git8781 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -383,6 +383,8 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch26: gcc13-pr101523.patch +Patch27: gcc13-amdgcn-remove-fiji.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1891,6 +1893,10 @@ Provides: libgccjit%{libgccjit_sover} = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions # to co-exist without an overly large list of provides/obsoletes Conflicts: %selfconflict libgccjit%{libgccjit_sover} +# At runtime the JIT needs to be able to invoke the assembler and +# linker and find startfiles and libgcc. The built-in driver knows +# the compilers version install directory only so we require the +# respective compiler libgccjit was built from. Requires: gcc13 %description -n libgccjit%{libgccjit_sover}%{libgccjit_suffix} @@ -1908,7 +1914,7 @@ Provides: libgccjit%{libgccjit_sover}-devel = %{version}-%{release} # Only one gccjit package can be installed at the same time since # header files conflict Conflicts: %selfconflict libgccjit%{libgccjit_sover}-devel -Requires: libgccjit%{libgccjit_sover}%{libgccjit_suffix} +Requires: libgccjit%{libgccjit_sover} >= %{version}-%{release} %description -n libgccjit%{libgccjit_sover}-devel%{libdevel_suffix} Package contains header files and documentation for GCC JIT front-end. @@ -2347,30 +2353,32 @@ ln -s newlib-4.3.0.20230120/newlib . #test patching start -%patch2 -%patch5 -%patch6 -%patch7 -%patch11 -%patch15 -%patch16 -%patch17 -p1 +%patch -P 2 +%patch -P 5 +%patch -P 6 +%patch -P 7 +%patch -P 11 +%patch -P 15 +%patch -P 16 +%patch -P 17 -p1 # These patches are needed only for llvm11 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550 -%patch18 -p1 -%patch20 -p1 +%patch -P 18 -p1 +%patch -P 20 -p1 %endif # In SLE15 and earlier default to dwarf4, not dwarf5 %if %{suse_version} < 1550 -%patch19 -p1 +%patch -P 19 -p1 %endif -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch51 -%patch60 -p1 -%patch61 -p1 -%patch100 -p1 +%patch -P 21 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 51 +%patch -P 60 -p1 +%patch -P 61 -p1 +%patch -P 100 -p1 #test patching end @@ -2472,7 +2480,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH"