From 13182ade54e36c5ea6cdf3531e42cee5dc49045ae3138a33cfc8a61059febef1 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 22 Apr 2021 14:03:19 +0000 Subject: [PATCH] yet work. Package expanded symlinks so concurrent installs do not pull in another llvm-mc. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc11?expand=0&rev=341 --- cross-aarch64-gcc11.changes | 3 ++- cross-aarch64-gcc11.spec | 17 +++++++++-------- cross-amdgcn-gcc11.changes | 3 ++- cross-amdgcn-gcc11.spec | 17 +++++++++-------- cross-arm-gcc11.changes | 3 ++- cross-arm-gcc11.spec | 17 +++++++++-------- cross-arm-none-gcc11-bootstrap.changes | 3 ++- cross-arm-none-gcc11-bootstrap.spec | 17 +++++++++-------- cross-arm-none-gcc11.changes | 3 ++- cross-arm-none-gcc11.spec | 17 +++++++++-------- cross-avr-gcc11-bootstrap.changes | 3 ++- cross-avr-gcc11-bootstrap.spec | 17 +++++++++-------- cross-avr-gcc11.changes | 3 ++- cross-avr-gcc11.spec | 17 +++++++++-------- cross-epiphany-gcc11-bootstrap.changes | 3 ++- cross-epiphany-gcc11-bootstrap.spec | 17 +++++++++-------- cross-epiphany-gcc11.changes | 3 ++- cross-epiphany-gcc11.spec | 17 +++++++++-------- cross-hppa-gcc11.changes | 3 ++- cross-hppa-gcc11.spec | 17 +++++++++-------- cross-i386-gcc11.changes | 3 ++- cross-i386-gcc11.spec | 17 +++++++++-------- cross-m68k-gcc11.changes | 3 ++- cross-m68k-gcc11.spec | 17 +++++++++-------- cross-mips-gcc11.changes | 3 ++- cross-mips-gcc11.spec | 17 +++++++++-------- cross-nvptx-gcc11.changes | 3 ++- cross-nvptx-gcc11.spec | 17 +++++++++-------- cross-ppc64-gcc11.changes | 3 ++- cross-ppc64-gcc11.spec | 17 +++++++++-------- cross-ppc64le-gcc11.changes | 3 ++- cross-ppc64le-gcc11.spec | 17 +++++++++-------- cross-riscv64-elf-gcc11-bootstrap.changes | 3 ++- cross-riscv64-elf-gcc11-bootstrap.spec | 17 +++++++++-------- cross-riscv64-elf-gcc11.changes | 3 ++- cross-riscv64-elf-gcc11.spec | 17 +++++++++-------- cross-riscv64-gcc11.changes | 3 ++- cross-riscv64-gcc11.spec | 17 +++++++++-------- cross-rx-gcc11-bootstrap.changes | 3 ++- cross-rx-gcc11-bootstrap.spec | 17 +++++++++-------- cross-rx-gcc11.changes | 3 ++- cross-rx-gcc11.spec | 17 +++++++++-------- cross-s390x-gcc11.changes | 3 ++- cross-s390x-gcc11.spec | 17 +++++++++-------- cross-sparc-gcc11.changes | 3 ++- cross-sparc-gcc11.spec | 17 +++++++++-------- cross-sparc64-gcc11.changes | 3 ++- cross-sparc64-gcc11.spec | 17 +++++++++-------- cross-x86_64-gcc11.changes | 3 ++- cross-x86_64-gcc11.spec | 17 +++++++++-------- cross.spec.in | 17 +++++++++-------- gcc11-testresults.changes | 3 ++- gcc11.changes | 3 ++- 53 files changed, 288 insertions(+), 235 deletions(-) diff --git a/cross-aarch64-gcc11.changes b/cross-aarch64-gcc11.changes index 9987db9..941a587 100644 --- a/cross-aarch64-gcc11.changes +++ b/cross-aarch64-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-aarch64-gcc11.spec b/cross-aarch64-gcc11.spec index c0c1525..9a53875 100644 --- a/cross-aarch64-gcc11.spec +++ b/cross-aarch64-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-amdgcn-gcc11.changes b/cross-amdgcn-gcc11.changes index 9987db9..941a587 100644 --- a/cross-amdgcn-gcc11.changes +++ b/cross-amdgcn-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-amdgcn-gcc11.spec b/cross-amdgcn-gcc11.spec index 1b89ce4..75555df 100644 --- a/cross-amdgcn-gcc11.spec +++ b/cross-amdgcn-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-arm-gcc11.changes b/cross-arm-gcc11.changes index 9987db9..941a587 100644 --- a/cross-arm-gcc11.changes +++ b/cross-arm-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-arm-gcc11.spec b/cross-arm-gcc11.spec index 5458fce..c0c2288 100644 --- a/cross-arm-gcc11.spec +++ b/cross-arm-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-arm-none-gcc11-bootstrap.changes b/cross-arm-none-gcc11-bootstrap.changes index 9987db9..941a587 100644 --- a/cross-arm-none-gcc11-bootstrap.changes +++ b/cross-arm-none-gcc11-bootstrap.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-arm-none-gcc11-bootstrap.spec b/cross-arm-none-gcc11-bootstrap.spec index a272133..b91218c 100644 --- a/cross-arm-none-gcc11-bootstrap.spec +++ b/cross-arm-none-gcc11-bootstrap.spec @@ -235,12 +235,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -765,13 +765,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-arm-none-gcc11.changes b/cross-arm-none-gcc11.changes index 9987db9..941a587 100644 --- a/cross-arm-none-gcc11.changes +++ b/cross-arm-none-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-arm-none-gcc11.spec b/cross-arm-none-gcc11.spec index d667a2a..c22ff5a 100644 --- a/cross-arm-none-gcc11.spec +++ b/cross-arm-none-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-avr-gcc11-bootstrap.changes b/cross-avr-gcc11-bootstrap.changes index 9987db9..941a587 100644 --- a/cross-avr-gcc11-bootstrap.changes +++ b/cross-avr-gcc11-bootstrap.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-avr-gcc11-bootstrap.spec b/cross-avr-gcc11-bootstrap.spec index 47d54b4..ec78671 100644 --- a/cross-avr-gcc11-bootstrap.spec +++ b/cross-avr-gcc11-bootstrap.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-avr-gcc11.changes b/cross-avr-gcc11.changes index 9987db9..941a587 100644 --- a/cross-avr-gcc11.changes +++ b/cross-avr-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-avr-gcc11.spec b/cross-avr-gcc11.spec index 5939485..f3a9031 100644 --- a/cross-avr-gcc11.spec +++ b/cross-avr-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-epiphany-gcc11-bootstrap.changes b/cross-epiphany-gcc11-bootstrap.changes index 9987db9..941a587 100644 --- a/cross-epiphany-gcc11-bootstrap.changes +++ b/cross-epiphany-gcc11-bootstrap.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-epiphany-gcc11-bootstrap.spec b/cross-epiphany-gcc11-bootstrap.spec index 2dda78f..7d47a77 100644 --- a/cross-epiphany-gcc11-bootstrap.spec +++ b/cross-epiphany-gcc11-bootstrap.spec @@ -235,12 +235,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -765,13 +765,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-epiphany-gcc11.changes b/cross-epiphany-gcc11.changes index 9987db9..941a587 100644 --- a/cross-epiphany-gcc11.changes +++ b/cross-epiphany-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-epiphany-gcc11.spec b/cross-epiphany-gcc11.spec index 3ff032b..1ee91b3 100644 --- a/cross-epiphany-gcc11.spec +++ b/cross-epiphany-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-hppa-gcc11.changes b/cross-hppa-gcc11.changes index 9987db9..941a587 100644 --- a/cross-hppa-gcc11.changes +++ b/cross-hppa-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-hppa-gcc11.spec b/cross-hppa-gcc11.spec index 55cda20..f269c05 100644 --- a/cross-hppa-gcc11.spec +++ b/cross-hppa-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-i386-gcc11.changes b/cross-i386-gcc11.changes index 9987db9..941a587 100644 --- a/cross-i386-gcc11.changes +++ b/cross-i386-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-i386-gcc11.spec b/cross-i386-gcc11.spec index 2682449..4d71c71 100644 --- a/cross-i386-gcc11.spec +++ b/cross-i386-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-m68k-gcc11.changes b/cross-m68k-gcc11.changes index 9987db9..941a587 100644 --- a/cross-m68k-gcc11.changes +++ b/cross-m68k-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-m68k-gcc11.spec b/cross-m68k-gcc11.spec index 5998396..dbf7595 100644 --- a/cross-m68k-gcc11.spec +++ b/cross-m68k-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-mips-gcc11.changes b/cross-mips-gcc11.changes index 9987db9..941a587 100644 --- a/cross-mips-gcc11.changes +++ b/cross-mips-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-mips-gcc11.spec b/cross-mips-gcc11.spec index 75c7b0b..f5d4332 100644 --- a/cross-mips-gcc11.spec +++ b/cross-mips-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-nvptx-gcc11.changes b/cross-nvptx-gcc11.changes index 9987db9..941a587 100644 --- a/cross-nvptx-gcc11.changes +++ b/cross-nvptx-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-nvptx-gcc11.spec b/cross-nvptx-gcc11.spec index 7ff4ae2..59b7da2 100644 --- a/cross-nvptx-gcc11.spec +++ b/cross-nvptx-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-ppc64-gcc11.changes b/cross-ppc64-gcc11.changes index 9987db9..941a587 100644 --- a/cross-ppc64-gcc11.changes +++ b/cross-ppc64-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-ppc64-gcc11.spec b/cross-ppc64-gcc11.spec index 2b036c1..a9f9751 100644 --- a/cross-ppc64-gcc11.spec +++ b/cross-ppc64-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-ppc64le-gcc11.changes b/cross-ppc64le-gcc11.changes index 9987db9..941a587 100644 --- a/cross-ppc64le-gcc11.changes +++ b/cross-ppc64le-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-ppc64le-gcc11.spec b/cross-ppc64le-gcc11.spec index 62d97e6..400464a 100644 --- a/cross-ppc64le-gcc11.spec +++ b/cross-ppc64le-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-riscv64-elf-gcc11-bootstrap.changes b/cross-riscv64-elf-gcc11-bootstrap.changes index 9987db9..941a587 100644 --- a/cross-riscv64-elf-gcc11-bootstrap.changes +++ b/cross-riscv64-elf-gcc11-bootstrap.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-riscv64-elf-gcc11-bootstrap.spec b/cross-riscv64-elf-gcc11-bootstrap.spec index dc56e2a..bfeebf1 100644 --- a/cross-riscv64-elf-gcc11-bootstrap.spec +++ b/cross-riscv64-elf-gcc11-bootstrap.spec @@ -235,12 +235,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -765,13 +765,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-riscv64-elf-gcc11.changes b/cross-riscv64-elf-gcc11.changes index 9987db9..941a587 100644 --- a/cross-riscv64-elf-gcc11.changes +++ b/cross-riscv64-elf-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-riscv64-elf-gcc11.spec b/cross-riscv64-elf-gcc11.spec index d95bf4a..1f9131f 100644 --- a/cross-riscv64-elf-gcc11.spec +++ b/cross-riscv64-elf-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-riscv64-gcc11.changes b/cross-riscv64-gcc11.changes index 9987db9..941a587 100644 --- a/cross-riscv64-gcc11.changes +++ b/cross-riscv64-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-riscv64-gcc11.spec b/cross-riscv64-gcc11.spec index 7302939..4ce9e17 100644 --- a/cross-riscv64-gcc11.spec +++ b/cross-riscv64-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-rx-gcc11-bootstrap.changes b/cross-rx-gcc11-bootstrap.changes index 9987db9..941a587 100644 --- a/cross-rx-gcc11-bootstrap.changes +++ b/cross-rx-gcc11-bootstrap.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-rx-gcc11-bootstrap.spec b/cross-rx-gcc11-bootstrap.spec index bfe4b1a..60be96b 100644 --- a/cross-rx-gcc11-bootstrap.spec +++ b/cross-rx-gcc11-bootstrap.spec @@ -235,12 +235,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -765,13 +765,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-rx-gcc11.changes b/cross-rx-gcc11.changes index 9987db9..941a587 100644 --- a/cross-rx-gcc11.changes +++ b/cross-rx-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-rx-gcc11.spec b/cross-rx-gcc11.spec index dee4873..ed90bc1 100644 --- a/cross-rx-gcc11.spec +++ b/cross-rx-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-s390x-gcc11.changes b/cross-s390x-gcc11.changes index 9987db9..941a587 100644 --- a/cross-s390x-gcc11.changes +++ b/cross-s390x-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-s390x-gcc11.spec b/cross-s390x-gcc11.spec index 076019e..5c9e5a3 100644 --- a/cross-s390x-gcc11.spec +++ b/cross-s390x-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-sparc-gcc11.changes b/cross-sparc-gcc11.changes index 9987db9..941a587 100644 --- a/cross-sparc-gcc11.changes +++ b/cross-sparc-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-sparc-gcc11.spec b/cross-sparc-gcc11.spec index d083d24..873cfb7 100644 --- a/cross-sparc-gcc11.spec +++ b/cross-sparc-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-sparc64-gcc11.changes b/cross-sparc64-gcc11.changes index 9987db9..941a587 100644 --- a/cross-sparc64-gcc11.changes +++ b/cross-sparc64-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-sparc64-gcc11.spec b/cross-sparc64-gcc11.spec index 7734bcf..e03029b 100644 --- a/cross-sparc64-gcc11.spec +++ b/cross-sparc64-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross-x86_64-gcc11.changes b/cross-x86_64-gcc11.changes index 9987db9..941a587 100644 --- a/cross-x86_64-gcc11.changes +++ b/cross-x86_64-gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/cross-x86_64-gcc11.spec b/cross-x86_64-gcc11.spec index 6b4719f..e9bbb09 100644 --- a/cross-x86_64-gcc11.spec +++ b/cross-x86_64-gcc11.spec @@ -234,12 +234,12 @@ ExclusiveArch: %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment -BuildRequires: lld11 +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 +BuildRequires: lld BuildRequires: llvm11 Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld11 +Requires: lld Requires: llvm11 # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -764,13 +764,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/cross.spec.in b/cross.spec.in index dc14733..4bf1bc5 100644 --- a/cross.spec.in +++ b/cross.spec.in @@ -145,12 +145,12 @@ ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif %if "%{cross_arch}" == "amdgcn" -# amdgcn uses the llvm assembler and linker, llvm12 doesn't -# work at the moment +# amdgcn uses the llvm assembler and linker, llvm-mc-12 doesn't +# work at the moment so require llvm11 BuildRequires: llvm11 -BuildRequires: lld11 +BuildRequires: lld Requires: llvm11 -Requires: lld11 +Requires: lld Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -307,13 +307,14 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif # for amdgcn install the symlinks to the llvm tools +# follow alternatives symlinks to the hardcoded version requirement %if "%{TARGET_ARCH}" == "amdgcn" mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin -ln -s /usr/bin/llvm-ar $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar -ln -s /usr/bin/llvm-mc $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as +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/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld -ln -s /usr/bin/llvm-nm $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm -ln -s /usr/bin/llvm-ranlib $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib +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 %{_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 diff --git a/gcc11-testresults.changes b/gcc11-testresults.changes index 9987db9..941a587 100644 --- a/gcc11-testresults.changes +++ b/gcc11-testresults.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener diff --git a/gcc11.changes b/gcc11.changes index 9987db9..941a587 100644 --- a/gcc11.changes +++ b/gcc11.changes @@ -6,7 +6,8 @@ Wed Apr 21 12:31:23 UTC 2021 - Richard Biener - Enable gfortran for offload compilers. - BuildRequire procps from gcc11-testresults if we test go. - Force using llvm11 for amdgcn offloading since llvm12 doesn't - yet work. + yet work. Package expanded symlinks so concurrent installs do + not pull in another llvm-mc. ------------------------------------------------------------------- Tue Apr 20 14:57:07 UTC 2021 - Richard Biener