diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec index 64d09e9..4200fec 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec index 5dba260..008884c 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec index 4ca9151..4143bdc 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec index f138b3b..29b19c6 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec index 077a6ed..3965df7 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -135,7 +135,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -248,14 +247,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -306,9 +306,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -356,7 +358,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -460,11 +461,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -884,11 +885,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -989,6 +990,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1058,11 +1067,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec index 6d6340f..70661fd 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec index 042e3f4..1a5a0e8 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec index 06276c3..9101778 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec index 30570c8..cb54051 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec index 6b4ede1..f53318b 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -135,7 +135,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -248,14 +247,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -306,9 +306,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -356,7 +358,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -460,11 +461,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -884,11 +885,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -989,6 +990,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1058,11 +1067,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec index 8883e3e..836f993 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec index a761ee9..ca142d9 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec index 893cc2a..6d3e8fd 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec index 0b3ae0e..cd83951 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec index 60ec716..030a3fb 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec index 018aa77..b83e0de 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec index b125012..c974c40 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-ppc64le-gcc13-bootstrap.spec b/cross-ppc64le-gcc13-bootstrap.spec index 6f3f34c..62f45dc 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec index dbf84f2..c290f37 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec index 89865f5..2afe243 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -135,7 +135,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -248,14 +247,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -306,9 +306,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -356,7 +358,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -460,11 +461,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -884,11 +885,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -989,6 +990,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1058,11 +1067,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec index 9b01c1e..b795318 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec index 064465d..fa9d6e2 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -135,7 +135,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -248,14 +247,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -306,9 +306,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -356,7 +358,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -460,11 +461,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -884,11 +885,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -989,6 +990,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1058,11 +1067,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec index d3f9667..85292a7 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec index 58d1e08..d4b7ba2 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec index 0c4a78e..edcc1cb 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec index 10999b8..a5fcb9d 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -135,7 +135,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -248,14 +247,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -306,9 +306,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -356,7 +358,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -460,11 +461,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -884,11 +885,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -989,6 +990,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1058,11 +1067,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec index 50475f6..879241b 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-s390x-gcc13-bootstrap.spec b/cross-s390x-gcc13-bootstrap.spec index 6d3051f..e72060c 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec index 0380a80..3f8abd3 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec index e6c2949..09f747f 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec index 233d3aa..33f1ae0 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec index b4fe805..a71cebb 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -134,7 +134,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -247,14 +246,15 @@ ExclusiveArch: # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} Requires: lld @@ -305,9 +305,11 @@ Conflicts: cross-%{cross_arch}-gcc13 Requires: libstdc++6-devel-gcc13 %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun):update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -355,7 +357,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -459,11 +460,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif @@ -883,11 +884,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -988,6 +989,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -1057,11 +1066,7 @@ fi %files -n cross-amdgcn-newlib13-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog diff --git a/cross.spec.in b/cross.spec.in index 901620b..2d0ad78 100644 --- a/cross.spec.in +++ b/cross.spec.in @@ -155,14 +155,15 @@ ExclusiveArch: x86_64 # amdgcn uses the llvm assembler and linker %if %{suse_version} < 1550 BuildRequires: llvm13 +%define product_libs_llvm_ver 13 %else -BuildRequires: llvm +BuildRequires: llvm%{product_libs_llvm_ver} %endif BuildRequires: lld %if %{suse_version} < 1550 Requires: llvm13 %else -Requires: llvm +Requires: llvm%{product_libs_llvm_ver} %endif Requires: lld Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} @@ -213,9 +214,11 @@ Conflicts: cross-%{cross_arch}-gcc@base_ver@ Requires: libstdc++6-devel-gcc@base_ver@ %endif AutoReqProv: off +%if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives Requires(preun): update-alternatives +%endif Summary: The GNU Compiler Collection targeting %{cross_arch} License: GPL-3.0-or-later @@ -338,11 +341,11 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} # follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s `readlink -f /usr/bin/llvm-ar` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s `readlink -f /usr/bin/llvm-mc` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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 `readlink -f /usr/bin/llvm-nm` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s `readlink -f /usr/bin/llvm-ranlib` $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 ln -s %{_prefix}/amdgcn-amdhsa/bin/as $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-as ln -s %{_prefix}/amdgcn-amdhsa/bin/ld $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ld @@ -443,6 +446,14 @@ fi %dir %{libsubdir} %dir %{libsubdir}/accel %{libsubdir}/accel/%{gcc_target_arch} +%if "%{cross_arch}" == "amdgcn" +%{_prefix}/%{gcc_target_arch}/bin +%{_prefix}/bin/amdgcn-amdhsa-ar +%{_prefix}/bin/amdgcn-amdhsa-as +%{_prefix}/bin/amdgcn-amdhsa-ld +%{_prefix}/bin/amdgcn-amdhsa-nm +%{_prefix}/bin/amdgcn-amdhsa-ranlib +%endif %else %{_prefix}/bin/%{gcc_target_arch}-gcc%{binsuffix} %{_prefix}/bin/%{gcc_target_arch}-cpp%{binsuffix} @@ -512,11 +523,7 @@ fi %files -n cross-amdgcn-newlib@base_ver@-devel %defattr(-,root,root) %{_prefix}/%{gcc_target_arch} -%{_prefix}/bin/amdgcn-amdhsa-ar -%{_prefix}/bin/amdgcn-amdhsa-as -%{_prefix}/bin/amdgcn-amdhsa-ld -%{_prefix}/bin/amdgcn-amdhsa-nm -%{_prefix}/bin/amdgcn-amdhsa-ranlib +%exclude %{_prefix}/%{gcc_target_arch}/bin %endif %changelog -n cross-%{pkgname}-gcc@base_ver@ diff --git a/gcc-13.2.1+git7813.tar.xz b/gcc-13.2.1+git7813.tar.xz deleted file mode 100644 index 1223b22..0000000 --- a/gcc-13.2.1+git7813.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d88599566679c89f6acc49f728f55bff3819c079e39990562b459983839c3998 -size 87217780 diff --git a/gcc-13.2.1+git8109.tar.xz b/gcc-13.2.1+git8109.tar.xz new file mode 100644 index 0000000..b7da226 --- /dev/null +++ b/gcc-13.2.1+git8109.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2eaa9d9bd128fa6483a2fd81406f9dee1db13550854d88dd759dc02087f667ed +size 87258924 diff --git a/gcc.spec.in b/gcc.spec.in index 214ecc8..9583629 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -386,7 +386,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -1352,7 +1351,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -1456,11 +1454,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec index 94d4f0a..149e041 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -402,7 +402,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -543,7 +542,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -647,11 +645,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif diff --git a/gcc13.changes b/gcc13.changes index 8305af2..a4ebddc 100644 --- a/gcc13.changes +++ b/gcc13.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Nov 30 11:43:17 UTC 2023 - Richard Biener + +- Update to gcc-13 branch head, 741743c028dc00f27b9c8b1d5, git8109 + * Includes fix for building mariadb on i686. [bsc#1217667] + * Remove pr111411.patch contained in the update. + +------------------------------------------------------------------- +Fri Nov 24 08:49:50 UTC 2023 - Richard Biener + +- Avoid update-alternatives dependency for accelerator crosses. +- Package tool links to llvm in cross-amdgcn-gcc13 rather than in + cross-amdgcn-newlib13-devel since that also has the dependence. +- Depend on llvmVER instead of llvm with VER equal to + %product_libs_llvm_ver where available and adjust tool discovery + accordingly. This should also properly trigger re-builds when + the patchlevel version of llvmVER changes, possibly changing + the binary names we link to. [bsc#1217450] + ------------------------------------------------------------------- Tue Nov 7 12:57:49 UTC 2023 - Richard Biener diff --git a/gcc13.spec b/gcc13.spec index 633be34..a4fe9ae 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+git7813 +Version: 13.2.1+git8109 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/+/-/') @@ -381,7 +381,6 @@ Patch18: gcc10-amdgcn-llvm-as.patch Patch19: gcc11-gdwarf-4-default.patch Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch -Patch22: pr111411.patch Patch23: gcc13-bsc1216664.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch @@ -2360,7 +2359,6 @@ ln -s newlib-4.3.0.20230120/newlib . %patch19 -p1 %endif %patch21 -p1 -%patch22 -p1 %patch23 -p1 %patch51 %patch60 -p1 @@ -2464,11 +2462,11 @@ export _POSIX2_VERSION=199209 %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p target-tools/bin -ln -s /usr/bin/llvm-ar target-tools/bin/amdgcn-amdhsa-ar -ln -s /usr/bin/llvm-mc target-tools/bin/amdgcn-amdhsa-as +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/llvm-nm target-tools/bin/amdgcn-amdhsa-nm -ln -s /usr/bin/llvm-ranlib target-tools/bin/amdgcn-amdhsa-ranlib +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" %endif diff --git a/pr111411.patch b/pr111411.patch deleted file mode 100644 index 44dc2d5..0000000 --- a/pr111411.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 74f99f1adc696f446115f36974a3f94f66294a53 Mon Sep 17 00:00:00 2001 -From: Richard Sandiford -Date: Wed, 20 Sep 2023 11:13:20 +0100 -Subject: [PATCH] aarch64: Fix loose ldpstp check [PR111411] - -aarch64_operands_ok_for_ldpstp contained the code: - - /* One of the memory accesses must be a mempair operand. - If it is not the first one, they need to be swapped by the - peephole. */ - if (!aarch64_mem_pair_operand (mem_1, GET_MODE (mem_1)) - && !aarch64_mem_pair_operand (mem_2, GET_MODE (mem_2))) - return false; - -But the requirement isn't just that one of the accesses must be a -valid mempair operand. It's that the lower access must be, since -that's the access that will be used for the instruction operand. - -gcc/ - PR target/111411 - * config/aarch64/aarch64.cc (aarch64_operands_ok_for_ldpstp): Require - the lower memory access to a mem-pair operand. - -gcc/testsuite/ - PR target/111411 - * gcc.dg/rtl/aarch64/pr111411.c: New test. - -(cherry picked from commit 2d38f45bcca62ca0c7afef4b579f82c5c2a01610) ---- - gcc/config/aarch64/aarch64.cc | 8 ++- - gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c | 57 +++++++++++++++++++++ - 2 files changed, 60 insertions(+), 5 deletions(-) - create mode 100644 gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c - -diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc -index 96c3f48fdc4..a979accd90a 100644 ---- a/gcc/config/aarch64/aarch64.cc -+++ b/gcc/config/aarch64/aarch64.cc -@@ -26031,11 +26031,9 @@ aarch64_operands_ok_for_ldpstp (rtx *operands, bool load, - gcc_assert (known_eq (GET_MODE_SIZE (GET_MODE (mem_1)), - GET_MODE_SIZE (GET_MODE (mem_2)))); - -- /* One of the memory accesses must be a mempair operand. -- If it is not the first one, they need to be swapped by the -- peephole. */ -- if (!aarch64_mem_pair_operand (mem_1, GET_MODE (mem_1)) -- && !aarch64_mem_pair_operand (mem_2, GET_MODE (mem_2))) -+ /* The lower memory access must be a mem-pair operand. */ -+ rtx lower_mem = reversed ? mem_2 : mem_1; -+ if (!aarch64_mem_pair_operand (lower_mem, GET_MODE (lower_mem))) - return false; - - if (REG_P (reg_1) && FP_REGNUM_P (REGNO (reg_1))) -diff --git a/gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c b/gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c -new file mode 100644 -index 00000000000..ad07e9c6c89 ---- /dev/null -+++ b/gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c -@@ -0,0 +1,57 @@ -+/* { dg-do compile { target aarch64*-*-* } } */ -+/* { dg-require-effective-target lp64 } */ -+/* { dg-options "-O -fdisable-rtl-postreload -fpeephole2 -fno-schedule-fusion" } */ -+ -+extern int data[]; -+ -+void __RTL (startwith ("ira")) foo (void *ptr) -+{ -+ (function "foo" -+ (param "ptr" -+ (DECL_RTL (reg/v:DI <0> [ ptr ])) -+ (DECL_RTL_INCOMING (reg/v:DI x0 [ ptr ])) -+ ) ;; param "ptr" -+ (insn-chain -+ (block 2 -+ (edge-from entry (flags "FALLTHRU")) -+ (cnote 3 [bb 2] NOTE_INSN_BASIC_BLOCK) -+ (insn 4 (set (reg:DI <0>) (reg:DI x0))) -+ (insn 5 (set (reg:DI <1>) -+ (plus:DI (reg:DI <0>) (const_int 768)))) -+ (insn 6 (set (mem:SI (plus:DI (reg:DI <0>) -+ (const_int 508)) [1 &data+508 S4 A4]) -+ (const_int 0))) -+ (insn 7 (set (mem:SI (plus:DI (reg:DI <1>) -+ (const_int -256)) [1 &data+512 S4 A4]) -+ (const_int 0))) -+ (edge-to exit (flags "FALLTHRU")) -+ ) ;; block 2 -+ ) ;; insn-chain -+ ) ;; function -+} -+ -+void __RTL (startwith ("ira")) bar (void *ptr) -+{ -+ (function "bar" -+ (param "ptr" -+ (DECL_RTL (reg/v:DI <0> [ ptr ])) -+ (DECL_RTL_INCOMING (reg/v:DI x0 [ ptr ])) -+ ) ;; param "ptr" -+ (insn-chain -+ (block 2 -+ (edge-from entry (flags "FALLTHRU")) -+ (cnote 3 [bb 2] NOTE_INSN_BASIC_BLOCK) -+ (insn 4 (set (reg:DI <0>) (reg:DI x0))) -+ (insn 5 (set (reg:DI <1>) -+ (plus:DI (reg:DI <0>) (const_int 768)))) -+ (insn 6 (set (mem:SI (plus:DI (reg:DI <1>) -+ (const_int -256)) [1 &data+512 S4 A4]) -+ (const_int 0))) -+ (insn 7 (set (mem:SI (plus:DI (reg:DI <0>) -+ (const_int 508)) [1 &data+508 S4 A4]) -+ (const_int 0))) -+ (edge-to exit (flags "FALLTHRU")) -+ ) ;; block 2 -+ ) ;; insn-chain -+ ) ;; function -+} --- -2.39.3 -