From e44bc9b6a6fb2dc31b0f697783d60831c3c4f26e1dfabb0eac8084cd47548c2c Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 20 Mar 2024 09:05:46 +0000 Subject: [PATCH 1/4] - Add gcc13-pr111731.patch to fix unwinding for JIT code. [bsc#1221239] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc13?expand=0&rev=100 --- cross-aarch64-gcc13-bootstrap.spec | 2 + cross-aarch64-gcc13.spec | 2 + cross-amdgcn-gcc13.spec | 2 + cross-arm-gcc13.spec | 2 + cross-arm-none-gcc13-bootstrap.spec | 2 + cross-arm-none-gcc13.spec | 2 + cross-avr-gcc13-bootstrap.spec | 2 + cross-avr-gcc13.spec | 2 + cross-bpf-gcc13.spec | 2 + cross-epiphany-gcc13-bootstrap.spec | 2 + cross-epiphany-gcc13.spec | 2 + cross-hppa-gcc13-bootstrap.spec | 2 + cross-hppa-gcc13.spec | 2 + cross-m68k-gcc13.spec | 2 + cross-mips-gcc13.spec | 2 + cross-nvptx-gcc13.spec | 2 + cross-ppc64-gcc13.spec | 2 + cross-ppc64le-gcc13-bootstrap.spec | 2 + cross-ppc64le-gcc13.spec | 2 + cross-pru-gcc13-bootstrap.spec | 2 + cross-pru-gcc13.spec | 2 + cross-riscv64-elf-gcc13-bootstrap.spec | 2 + cross-riscv64-elf-gcc13.spec | 2 + cross-riscv64-gcc13-bootstrap.spec | 2 + cross-riscv64-gcc13.spec | 2 + cross-rx-gcc13-bootstrap.spec | 2 + cross-rx-gcc13.spec | 2 + cross-s390x-gcc13-bootstrap.spec | 2 + cross-s390x-gcc13.spec | 2 + cross-sparc-gcc13.spec | 2 + cross-sparc64-gcc13.spec | 2 + cross-x86_64-gcc13.spec | 2 + gcc.spec.in | 2 + gcc13-pr111731.patch | 118 +++++++++++++++++++++++++ gcc13-testresults.spec | 2 + gcc13.changes | 6 ++ gcc13.spec | 2 + 37 files changed, 194 insertions(+) create mode 100644 gcc13-pr111731.patch diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec index 62344f3..1152771 100644 --- a/cross-aarch64-gcc13-bootstrap.spec +++ b/cross-aarch64-gcc13-bootstrap.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec index c6e1d80..13de517 100644 --- a/cross-aarch64-gcc13.spec +++ b/cross-aarch64-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec index 542a7f3..1fa096a 100644 --- a/cross-amdgcn-gcc13.spec +++ b/cross-amdgcn-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec index 12129a3..11a1880 100644 --- a/cross-arm-gcc13.spec +++ b/cross-arm-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec index f39934d..c1442e9 100644 --- a/cross-arm-none-gcc13-bootstrap.spec +++ b/cross-arm-none-gcc13-bootstrap.spec @@ -137,6 +137,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -364,6 +365,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec index 4ddd076..e004da3 100644 --- a/cross-arm-none-gcc13.spec +++ b/cross-arm-none-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec index af778dd..13009dc 100644 --- a/cross-avr-gcc13-bootstrap.spec +++ b/cross-avr-gcc13-bootstrap.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec index 4dfc0de..c212ac0 100644 --- a/cross-avr-gcc13.spec +++ b/cross-avr-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec index c83d90e..94b542c 100644 --- a/cross-bpf-gcc13.spec +++ b/cross-bpf-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec index 169f806..37aadfb 100644 --- a/cross-epiphany-gcc13-bootstrap.spec +++ b/cross-epiphany-gcc13-bootstrap.spec @@ -137,6 +137,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -364,6 +365,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec index 6b0ec23..d1a155c 100644 --- a/cross-epiphany-gcc13.spec +++ b/cross-epiphany-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec index 300492e..64d1483 100644 --- a/cross-hppa-gcc13-bootstrap.spec +++ b/cross-hppa-gcc13-bootstrap.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec index 056a0a1..6645e42 100644 --- a/cross-hppa-gcc13.spec +++ b/cross-hppa-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec index 12f1d2c..0c46f54 100644 --- a/cross-m68k-gcc13.spec +++ b/cross-m68k-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec index 6d55d72..5f70e2e 100644 --- a/cross-mips-gcc13.spec +++ b/cross-mips-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec index 527ed91..975a4fd 100644 --- a/cross-nvptx-gcc13.spec +++ b/cross-nvptx-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec index 64408a0..dad90ac 100644 --- a/cross-ppc64-gcc13.spec +++ b/cross-ppc64-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-ppc64le-gcc13-bootstrap.spec b/cross-ppc64le-gcc13-bootstrap.spec index b5f27dd..d40b46d 100644 --- a/cross-ppc64le-gcc13-bootstrap.spec +++ b/cross-ppc64le-gcc13-bootstrap.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec index 477f044..d04f1fa 100644 --- a/cross-ppc64le-gcc13.spec +++ b/cross-ppc64le-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec index da35480..aff3233 100644 --- a/cross-pru-gcc13-bootstrap.spec +++ b/cross-pru-gcc13-bootstrap.spec @@ -137,6 +137,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -364,6 +365,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec index 2df00c2..09f7ce0 100644 --- a/cross-pru-gcc13.spec +++ b/cross-pru-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec index 6821d1f..9661f1b 100644 --- a/cross-riscv64-elf-gcc13-bootstrap.spec +++ b/cross-riscv64-elf-gcc13-bootstrap.spec @@ -137,6 +137,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -364,6 +365,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec index 95e8d64..5a6f693 100644 --- a/cross-riscv64-elf-gcc13.spec +++ b/cross-riscv64-elf-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec index a6dfdfd..8c47a07 100644 --- a/cross-riscv64-gcc13-bootstrap.spec +++ b/cross-riscv64-gcc13-bootstrap.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec index 91ffe02..80af893 100644 --- a/cross-riscv64-gcc13.spec +++ b/cross-riscv64-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec index 394f1aa..a688d9c 100644 --- a/cross-rx-gcc13-bootstrap.spec +++ b/cross-rx-gcc13-bootstrap.spec @@ -137,6 +137,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -364,6 +365,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec index 9da7630..db295e7 100644 --- a/cross-rx-gcc13.spec +++ b/cross-rx-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-s390x-gcc13-bootstrap.spec b/cross-s390x-gcc13-bootstrap.spec index 7f2142b..bbfa80b 100644 --- a/cross-s390x-gcc13-bootstrap.spec +++ b/cross-s390x-gcc13-bootstrap.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec index 01e6f5a..faf3114 100644 --- a/cross-s390x-gcc13.spec +++ b/cross-s390x-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec index 0764dec..477fa7b 100644 --- a/cross-sparc-gcc13.spec +++ b/cross-sparc-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec index e881130..7d58d6d 100644 --- a/cross-sparc64-gcc13.spec +++ b/cross-sparc64-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec index 758d843..3e6a331 100644 --- a/cross-x86_64-gcc13.spec +++ b/cross-x86_64-gcc13.spec @@ -136,6 +136,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -363,6 +364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/gcc.spec.in b/gcc.spec.in index 5b63954..192b9a8 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -388,6 +388,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1361,6 +1362,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/gcc13-pr111731.patch b/gcc13-pr111731.patch new file mode 100644 index 0000000..cec8c5f --- /dev/null +++ b/gcc13-pr111731.patch @@ -0,0 +1,118 @@ +From 0f5d8836055aef216e6fff9a1d0342a44a46a6a9 Mon Sep 17 00:00:00 2001 +From: Thomas Neumann +Date: Mon, 11 Mar 2024 14:35:20 +0100 +Subject: [PATCH] handle unwind tables that are embedded within unwinding code + [PR111731] + +Original bug report: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111731 + +The unwinding mechanism registers both the code range and the unwind +table itself within a b-tree lookup structure. That data structure +assumes that is consists of non-overlappping intervals. This +becomes a problem if the unwinding table is embedded within the +code itself, as now the intervals do overlap. + +To fix this problem we now keep the unwind tables in a separate +b-tree, which prevents the overlap. + +libgcc/ChangeLog: + PR libgcc/111731 + * unwind-dw2-fde.c: Split unwind ranges if they contain the + unwind table. +--- + libgcc/unwind-dw2-fde.c | 37 +++++++++++++++++++++---------------- + 1 file changed, 21 insertions(+), 16 deletions(-) + +diff --git a/libgcc/unwind-dw2-fde.c b/libgcc/unwind-dw2-fde.c +index 61a578d097e..9d503545677 100644 +--- a/libgcc/unwind-dw2-fde.c ++++ b/libgcc/unwind-dw2-fde.c +@@ -48,6 +48,7 @@ typedef __UINTPTR_TYPE__ uintptr_type; + #include "unwind-dw2-btree.h" + + static struct btree registered_frames; ++static struct btree registered_objects; + static bool in_shutdown; + + static void +@@ -58,6 +59,7 @@ release_registered_frames (void) + /* Release the b-tree and all frames. Frame releases that happen later are + * silently ignored */ + btree_destroy (®istered_frames); ++ btree_destroy (®istered_objects); + in_shutdown = true; + } + +@@ -103,6 +105,21 @@ static __gthread_mutex_t object_mutex; + #endif + #endif + ++#ifdef ATOMIC_FDE_FAST_PATH ++// Register the pc range for a given object in the lookup structure. ++static void ++register_pc_range_for_object (uintptr_type begin, struct object *ob) ++{ ++ // Register the object itself to know the base pointer on deregistration. ++ btree_insert (®istered_objects, begin, 1, ob); ++ ++ // Register the frame in the b-tree ++ uintptr_type range[2]; ++ get_pc_range (ob, range); ++ btree_insert (®istered_frames, range[0], range[1] - range[0], ob); ++} ++#endif ++ + /* Called from crtbegin.o to register the unwind info for an object. */ + + void +@@ -124,13 +141,7 @@ __register_frame_info_bases (const void *begin, struct object *ob, + #endif + + #ifdef ATOMIC_FDE_FAST_PATH +- // Register the object itself to know the base pointer on deregistration. +- btree_insert (®istered_frames, (uintptr_type) begin, 1, ob); +- +- // Register the frame in the b-tree +- uintptr_type range[2]; +- get_pc_range (ob, range); +- btree_insert (®istered_frames, range[0], range[1] - range[0], ob); ++ register_pc_range_for_object ((uintptr_type) begin, ob); + #else + init_object_mutex_once (); + __gthread_mutex_lock (&object_mutex); +@@ -178,13 +189,7 @@ __register_frame_info_table_bases (void *begin, struct object *ob, + ob->s.b.encoding = DW_EH_PE_omit; + + #ifdef ATOMIC_FDE_FAST_PATH +- // Register the object itself to know the base pointer on deregistration. +- btree_insert (®istered_frames, (uintptr_type) begin, 1, ob); +- +- // Register the frame in the b-tree +- uintptr_type range[2]; +- get_pc_range (ob, range); +- btree_insert (®istered_frames, range[0], range[1] - range[0], ob); ++ register_pc_range_for_object ((uintptr_type) begin, ob); + #else + init_object_mutex_once (); + __gthread_mutex_lock (&object_mutex); +@@ -232,7 +237,7 @@ __deregister_frame_info_bases (const void *begin) + + #ifdef ATOMIC_FDE_FAST_PATH + // Find the originally registered object to get the base pointer. +- ob = btree_remove (®istered_frames, (uintptr_type) begin); ++ ob = btree_remove (®istered_objects, (uintptr_type) begin); + + // Remove the corresponding PC range. + if (ob) +@@ -240,7 +245,7 @@ __deregister_frame_info_bases (const void *begin) + uintptr_type range[2]; + get_pc_range (ob, range); + if (range[0] != range[1]) +- btree_remove (®istered_frames, range[0]); ++ btree_remove (®istered_frames, range[0]); + } + + // Deallocate the sort array if any. +-- +2.43.0 + diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec index b83755c..4873883 100644 --- a/gcc13-testresults.spec +++ b/gcc13-testresults.spec @@ -404,6 +404,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -547,6 +548,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/gcc13.changes b/gcc13.changes index 7a1ae38..277bcf6 100644 --- a/gcc13.changes +++ b/gcc13.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 20 08:29:09 UTC 2024 - Richard Biener + +- Add gcc13-pr111731.patch to fix unwinding for JIT code. + [bsc#1221239] + ------------------------------------------------------------------- Wed Mar 13 08:04:27 UTC 2024 - Richard Biener diff --git a/gcc13.spec b/gcc13.spec index ff1c4c9..6074011 100644 --- a/gcc13.spec +++ b/gcc13.spec @@ -383,6 +383,7 @@ Patch20: gcc11-amdgcn-disable-hot-cold-partitioning.patch Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch +Patch25: gcc13-pr111731.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -2371,6 +2372,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 21 -p1 %patch -P 23 -p1 %patch -P 24 -p1 +%patch -P 25 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 From 7de63e5e01aaaf47a02ab9607e444549f9c7d6bac3c895c0495c85fcec4b507e Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 27 Mar 2024 12:24:29 +0000 Subject: [PATCH 2/4] - Make requirement to lld version specific to avoid requiring the meta-package. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc13?expand=0&rev=101 --- cross-aarch64-gcc13-bootstrap.spec | 8 ++++---- cross-aarch64-gcc13.spec | 8 ++++---- cross-amdgcn-gcc13.spec | 8 ++++---- cross-arm-gcc13.spec | 8 ++++---- cross-arm-none-gcc13-bootstrap.spec | 8 ++++---- cross-arm-none-gcc13.spec | 8 ++++---- cross-avr-gcc13-bootstrap.spec | 8 ++++---- cross-avr-gcc13.spec | 8 ++++---- cross-bpf-gcc13.spec | 8 ++++---- cross-epiphany-gcc13-bootstrap.spec | 8 ++++---- cross-epiphany-gcc13.spec | 8 ++++---- cross-hppa-gcc13-bootstrap.spec | 8 ++++---- cross-hppa-gcc13.spec | 8 ++++---- cross-m68k-gcc13.spec | 8 ++++---- cross-mips-gcc13.spec | 8 ++++---- cross-nvptx-gcc13.spec | 8 ++++---- cross-ppc64-gcc13.spec | 8 ++++---- cross-ppc64le-gcc13-bootstrap.spec | 8 ++++---- cross-ppc64le-gcc13.spec | 8 ++++---- cross-pru-gcc13-bootstrap.spec | 8 ++++---- cross-pru-gcc13.spec | 8 ++++---- cross-riscv64-elf-gcc13-bootstrap.spec | 8 ++++---- cross-riscv64-elf-gcc13.spec | 8 ++++---- cross-riscv64-gcc13-bootstrap.spec | 8 ++++---- cross-riscv64-gcc13.spec | 8 ++++---- cross-rx-gcc13-bootstrap.spec | 8 ++++---- cross-rx-gcc13.spec | 8 ++++---- cross-s390x-gcc13-bootstrap.spec | 8 ++++---- cross-s390x-gcc13.spec | 8 ++++---- cross-sparc-gcc13.spec | 8 ++++---- cross-sparc64-gcc13.spec | 8 ++++---- cross-x86_64-gcc13.spec | 8 ++++---- cross.spec.in | 6 +++--- gcc.spec.in | 2 +- gcc13-testresults.spec | 2 +- gcc13.changes | 6 ++++++ gcc13.spec | 2 +- 37 files changed, 140 insertions(+), 134 deletions(-) diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec index 1152771..62bb8c0 100644 --- a/cross-aarch64-gcc13-bootstrap.spec +++ b/cross-aarch64-gcc13-bootstrap.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec index 13de517..3537b75 100644 --- a/cross-aarch64-gcc13.spec +++ b/cross-aarch64-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec index 1fa096a..031b334 100644 --- a/cross-amdgcn-gcc13.spec +++ b/cross-amdgcn-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec index 11a1880..d3e248a 100644 --- a/cross-arm-gcc13.spec +++ b/cross-arm-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec index c1442e9..d84bbf0 100644 --- a/cross-arm-none-gcc13-bootstrap.spec +++ b/cross-arm-none-gcc13-bootstrap.spec @@ -256,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -471,7 +471,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -895,7 +895,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec index e004da3..b56ae15 100644 --- a/cross-arm-none-gcc13.spec +++ b/cross-arm-none-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec index 13009dc..01a4991 100644 --- a/cross-avr-gcc13-bootstrap.spec +++ b/cross-avr-gcc13-bootstrap.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec index c212ac0..1b12fc3 100644 --- a/cross-avr-gcc13.spec +++ b/cross-avr-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec index 94b542c..4d693a5 100644 --- a/cross-bpf-gcc13.spec +++ b/cross-bpf-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec index 37aadfb..89aac93 100644 --- a/cross-epiphany-gcc13-bootstrap.spec +++ b/cross-epiphany-gcc13-bootstrap.spec @@ -256,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -471,7 +471,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -895,7 +895,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec index d1a155c..1403161 100644 --- a/cross-epiphany-gcc13.spec +++ b/cross-epiphany-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec index 64d1483..4790555 100644 --- a/cross-hppa-gcc13-bootstrap.spec +++ b/cross-hppa-gcc13-bootstrap.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec index 6645e42..421a8cf 100644 --- a/cross-hppa-gcc13.spec +++ b/cross-hppa-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec index 0c46f54..909535c 100644 --- a/cross-m68k-gcc13.spec +++ b/cross-m68k-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec index 5f70e2e..dc94c5d 100644 --- a/cross-mips-gcc13.spec +++ b/cross-mips-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec index 975a4fd..a799ab7 100644 --- a/cross-nvptx-gcc13.spec +++ b/cross-nvptx-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec index dad90ac..1bc73cd 100644 --- a/cross-ppc64-gcc13.spec +++ b/cross-ppc64-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-ppc64le-gcc13-bootstrap.spec b/cross-ppc64le-gcc13-bootstrap.spec index d40b46d..2991229 100644 --- a/cross-ppc64le-gcc13-bootstrap.spec +++ b/cross-ppc64le-gcc13-bootstrap.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec index d04f1fa..adbbf2f 100644 --- a/cross-ppc64le-gcc13.spec +++ b/cross-ppc64le-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec index aff3233..7ca77cf 100644 --- a/cross-pru-gcc13-bootstrap.spec +++ b/cross-pru-gcc13-bootstrap.spec @@ -256,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -471,7 +471,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -895,7 +895,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec index 09f7ce0..4cf732a 100644 --- a/cross-pru-gcc13.spec +++ b/cross-pru-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec index 9661f1b..60fb673 100644 --- a/cross-riscv64-elf-gcc13-bootstrap.spec +++ b/cross-riscv64-elf-gcc13-bootstrap.spec @@ -256,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -471,7 +471,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -895,7 +895,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec index 5a6f693..5de2429 100644 --- a/cross-riscv64-elf-gcc13.spec +++ b/cross-riscv64-elf-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec index 8c47a07..e2b7d59 100644 --- a/cross-riscv64-gcc13-bootstrap.spec +++ b/cross-riscv64-gcc13-bootstrap.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec index 80af893..7d353e7 100644 --- a/cross-riscv64-gcc13.spec +++ b/cross-riscv64-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec index a688d9c..5df51d7 100644 --- a/cross-rx-gcc13-bootstrap.spec +++ b/cross-rx-gcc13-bootstrap.spec @@ -256,14 +256,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -471,7 +471,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -895,7 +895,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec index db295e7..15d02cd 100644 --- a/cross-rx-gcc13.spec +++ b/cross-rx-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-s390x-gcc13-bootstrap.spec b/cross-s390x-gcc13-bootstrap.spec index bbfa80b..d38e5b1 100644 --- a/cross-s390x-gcc13-bootstrap.spec +++ b/cross-s390x-gcc13-bootstrap.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec index faf3114..ee007df 100644 --- a/cross-s390x-gcc13.spec +++ b/cross-s390x-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec index 477fa7b..ad51b34 100644 --- a/cross-sparc-gcc13.spec +++ b/cross-sparc-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec index 7d58d6d..10320df 100644 --- a/cross-sparc64-gcc13.spec +++ b/cross-sparc64-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec index 3e6a331..614796b 100644 --- a/cross-x86_64-gcc13.spec +++ b/cross-x86_64-gcc13.spec @@ -255,14 +255,14 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} -Requires: lld +Requires: lld%{product_libs_llvm_ver} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there %if %{suse_version} >= 1550 || 0%{?sle_version:%sle_version} >= 150100 @@ -470,7 +470,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" @@ -894,7 +894,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/cross.spec.in b/cross.spec.in index 3883932..0b62ef9 100644 --- a/cross.spec.in +++ b/cross.spec.in @@ -160,13 +160,13 @@ BuildRequires: llvm13 %else BuildRequires: llvm%{product_libs_llvm_ver} %endif -BuildRequires: lld +BuildRequires: lld%{product_libs_llvm_ver} %if %{suse_version} < 1550 Requires: llvm13 %else Requires: llvm%{product_libs_llvm_ver} %endif -Requires: lld +Requires: lld%{product_libs_llvm_ver} Requires: cross-amdgcn-newlib-devel >= %{version}-%{release} # SLE12 does not fulfil build requirements for GCN, SLE15 SP1 does # technically also SLE12 SP5 but do not bother there @@ -344,7 +344,7 @@ rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} mkdir -p $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/as -ln -s /usr/bin/lld $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* $RPM_BUILD_ROOT%{_prefix}/amdgcn-amdhsa/bin/ranlib ln -s %{_prefix}/amdgcn-amdhsa/bin/ar $RPM_BUILD_ROOT%{_prefix}/bin/amdgcn-amdhsa-ar diff --git a/gcc.spec.in b/gcc.spec.in index 192b9a8..55d03c8 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -1468,7 +1468,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec index 4873883..a0a1d94 100644 --- a/gcc13-testresults.spec +++ b/gcc13-testresults.spec @@ -654,7 +654,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" diff --git a/gcc13.changes b/gcc13.changes index 277bcf6..c7de0a2 100644 --- a/gcc13.changes +++ b/gcc13.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 27 12:11:03 UTC 2024 - Richard Biener + +- Make requirement to lld version specific to avoid requiring the + meta-package. + ------------------------------------------------------------------- Wed Mar 20 08:29:09 UTC 2024 - Richard Biener diff --git a/gcc13.spec b/gcc13.spec index 6074011..94553aa 100644 --- a/gcc13.spec +++ b/gcc13.spec @@ -2478,7 +2478,7 @@ export _POSIX2_VERSION=199209 mkdir -p target-tools/bin ln -s /usr/bin/llvm-ar-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ar ln -s /usr/bin/llvm-mc-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-as -ln -s /usr/bin/lld target-tools/bin/amdgcn-amdhsa-ld +ln -s /usr/bin/lld-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ld ln -s /usr/bin/llvm-nm-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-nm ln -s /usr/bin/llvm-ranlib-%{product_libs_llvm_ver}* target-tools/bin/amdgcn-amdhsa-ranlib export PATH="`pwd`/target-tools/bin:$PATH" From 6df8046a37254e01969781c1ff6fa5ed2b09ff8508d596486cb6efaaf4ab430f Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 28 Mar 2024 07:02:03 +0000 Subject: [PATCH 3/4] - Add gcc13-pr101523.patch to avoid combine spending too much compile-time and memory doing nothing on s390x. [boo#1188441] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc13?expand=0&rev=102 --- cross-aarch64-gcc13-bootstrap.spec | 2 ++ cross-aarch64-gcc13.spec | 2 ++ cross-amdgcn-gcc13.spec | 2 ++ cross-arm-gcc13.spec | 2 ++ cross-arm-none-gcc13-bootstrap.spec | 2 ++ cross-arm-none-gcc13.spec | 2 ++ cross-avr-gcc13-bootstrap.spec | 2 ++ cross-avr-gcc13.spec | 2 ++ cross-bpf-gcc13.spec | 2 ++ cross-epiphany-gcc13-bootstrap.spec | 2 ++ cross-epiphany-gcc13.spec | 2 ++ cross-hppa-gcc13-bootstrap.spec | 2 ++ cross-hppa-gcc13.spec | 2 ++ cross-m68k-gcc13.spec | 2 ++ cross-mips-gcc13.spec | 2 ++ cross-nvptx-gcc13.spec | 2 ++ cross-ppc64-gcc13.spec | 2 ++ cross-ppc64le-gcc13-bootstrap.spec | 2 ++ cross-ppc64le-gcc13.spec | 2 ++ cross-pru-gcc13-bootstrap.spec | 2 ++ cross-pru-gcc13.spec | 2 ++ cross-riscv64-elf-gcc13-bootstrap.spec | 2 ++ cross-riscv64-elf-gcc13.spec | 2 ++ cross-riscv64-gcc13-bootstrap.spec | 2 ++ cross-riscv64-gcc13.spec | 2 ++ cross-rx-gcc13-bootstrap.spec | 2 ++ cross-rx-gcc13.spec | 2 ++ cross-s390x-gcc13-bootstrap.spec | 2 ++ cross-s390x-gcc13.spec | 2 ++ cross-sparc-gcc13.spec | 2 ++ cross-sparc64-gcc13.spec | 2 ++ cross-x86_64-gcc13.spec | 2 ++ gcc.spec.in | 2 ++ gcc13-pr101523.patch | 48 ++++++++++++++++++++++++++ gcc13-testresults.spec | 2 ++ gcc13.changes | 6 ++++ gcc13.spec | 2 ++ 37 files changed, 124 insertions(+) create mode 100644 gcc13-pr101523.patch diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec index 62bb8c0..58ed8e8 100644 --- a/cross-aarch64-gcc13-bootstrap.spec +++ b/cross-aarch64-gcc13-bootstrap.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec index 3537b75..39f796c 100644 --- a/cross-aarch64-gcc13.spec +++ b/cross-aarch64-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec index 031b334..ba2d02a 100644 --- a/cross-amdgcn-gcc13.spec +++ b/cross-amdgcn-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec index d3e248a..87aa85e 100644 --- a/cross-arm-gcc13.spec +++ b/cross-arm-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec index d84bbf0..1572108 100644 --- a/cross-arm-none-gcc13-bootstrap.spec +++ b/cross-arm-none-gcc13-bootstrap.spec @@ -138,6 +138,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -366,6 +367,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec index b56ae15..ab5b0d6 100644 --- a/cross-arm-none-gcc13.spec +++ b/cross-arm-none-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec index 01a4991..405f63d 100644 --- a/cross-avr-gcc13-bootstrap.spec +++ b/cross-avr-gcc13-bootstrap.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec index 1b12fc3..76060f9 100644 --- a/cross-avr-gcc13.spec +++ b/cross-avr-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec index 4d693a5..92c83fe 100644 --- a/cross-bpf-gcc13.spec +++ b/cross-bpf-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec index 89aac93..c435706 100644 --- a/cross-epiphany-gcc13-bootstrap.spec +++ b/cross-epiphany-gcc13-bootstrap.spec @@ -138,6 +138,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -366,6 +367,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec index 1403161..c599119 100644 --- a/cross-epiphany-gcc13.spec +++ b/cross-epiphany-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec index 4790555..940fc65 100644 --- a/cross-hppa-gcc13-bootstrap.spec +++ b/cross-hppa-gcc13-bootstrap.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec index 421a8cf..95034ab 100644 --- a/cross-hppa-gcc13.spec +++ b/cross-hppa-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec index 909535c..569be9e 100644 --- a/cross-m68k-gcc13.spec +++ b/cross-m68k-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec index dc94c5d..c53fad9 100644 --- a/cross-mips-gcc13.spec +++ b/cross-mips-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec index a799ab7..3271297 100644 --- a/cross-nvptx-gcc13.spec +++ b/cross-nvptx-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec index 1bc73cd..6dce3ec 100644 --- a/cross-ppc64-gcc13.spec +++ b/cross-ppc64-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-ppc64le-gcc13-bootstrap.spec b/cross-ppc64le-gcc13-bootstrap.spec index 2991229..dc2cf8b 100644 --- a/cross-ppc64le-gcc13-bootstrap.spec +++ b/cross-ppc64le-gcc13-bootstrap.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec index adbbf2f..68d7afb 100644 --- a/cross-ppc64le-gcc13.spec +++ b/cross-ppc64le-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec index 7ca77cf..0a3d6f7 100644 --- a/cross-pru-gcc13-bootstrap.spec +++ b/cross-pru-gcc13-bootstrap.spec @@ -138,6 +138,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -366,6 +367,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec index 4cf732a..52f39f9 100644 --- a/cross-pru-gcc13.spec +++ b/cross-pru-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec index 60fb673..fb83ee4 100644 --- a/cross-riscv64-elf-gcc13-bootstrap.spec +++ b/cross-riscv64-elf-gcc13-bootstrap.spec @@ -138,6 +138,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -366,6 +367,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec index 5de2429..c89a3c6 100644 --- a/cross-riscv64-elf-gcc13.spec +++ b/cross-riscv64-elf-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec index e2b7d59..f96d09b 100644 --- a/cross-riscv64-gcc13-bootstrap.spec +++ b/cross-riscv64-gcc13-bootstrap.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec index 7d353e7..509de43 100644 --- a/cross-riscv64-gcc13.spec +++ b/cross-riscv64-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec index 5df51d7..3b8c38a 100644 --- a/cross-rx-gcc13-bootstrap.spec +++ b/cross-rx-gcc13-bootstrap.spec @@ -138,6 +138,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -366,6 +367,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec index 15d02cd..029c591 100644 --- a/cross-rx-gcc13.spec +++ b/cross-rx-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-s390x-gcc13-bootstrap.spec b/cross-s390x-gcc13-bootstrap.spec index d38e5b1..f4ceff6 100644 --- a/cross-s390x-gcc13-bootstrap.spec +++ b/cross-s390x-gcc13-bootstrap.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec index ee007df..1f5edf5 100644 --- a/cross-s390x-gcc13.spec +++ b/cross-s390x-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec index ad51b34..9304447 100644 --- a/cross-sparc-gcc13.spec +++ b/cross-sparc-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec index 10320df..91ed9a4 100644 --- a/cross-sparc64-gcc13.spec +++ b/cross-sparc64-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec index 614796b..25d7d59 100644 --- a/cross-x86_64-gcc13.spec +++ b/cross-x86_64-gcc13.spec @@ -137,6 +137,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -365,6 +366,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/gcc.spec.in b/gcc.spec.in index 55d03c8..d0dccab 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -389,6 +389,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1363,6 +1364,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/gcc13-pr101523.patch b/gcc13-pr101523.patch new file mode 100644 index 0000000..2c1993e --- /dev/null +++ b/gcc13-pr101523.patch @@ -0,0 +1,48 @@ +From 839bc42772ba7af66af3bd16efed4a69511312ae Mon Sep 17 00:00:00 2001 +From: Segher Boessenkool +Date: Wed, 27 Mar 2024 14:09:52 +0000 +Subject: [PATCH] combine: Don't combine if I2 does not change +To: gcc-patches@gcc.gnu.org + +In some cases combine will "combine" an I2 and I3, but end up putting +exactly the same thing back as I2 as was there before. This is never +progress, so we shouldn't do it, it will lead to oscillating behaviour +and the like. + +If we want to canonicalise things, that's fine, but this is not the +way to do it. + +2024-03-27 Segher Boessenkool + + PR rtl-optimization/101523 + * combine.cc (try_combine): Don't do a 2-insn combination if + it does not in fact change I2. +--- + gcc/combine.cc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/gcc/combine.cc b/gcc/combine.cc +index a4479f8d836..745391016d0 100644 +--- a/gcc/combine.cc ++++ b/gcc/combine.cc +@@ -4186,6 +4186,17 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, + adjust_for_new_dest (i3); + } + ++ /* If I2 didn't change, this is not a combination (but a simplification or ++ canonicalisation with context), which should not be done here. Doing ++ it here explodes the algorithm. Don't. */ ++ if (rtx_equal_p (newi2pat, PATTERN (i2))) ++ { ++ if (dump_file) ++ fprintf (dump_file, "i2 didn't change, not doing this\n"); ++ undo_all (); ++ return 0; ++ } ++ + /* We now know that we can do this combination. Merge the insns and + update the status of registers and LOG_LINKS. */ + +-- +2.35.3 + diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec index a0a1d94..fd3a667 100644 --- a/gcc13-testresults.spec +++ b/gcc13-testresults.spec @@ -405,6 +405,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -549,6 +550,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 diff --git a/gcc13.changes b/gcc13.changes index c7de0a2..d426b63 100644 --- a/gcc13.changes +++ b/gcc13.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 28 06:55:18 UTC 2024 - Richard Biener + +- Add gcc13-pr101523.patch to avoid combine spending too much + compile-time and memory doing nothing on s390x. [boo#1188441] + ------------------------------------------------------------------- Wed Mar 27 12:11:03 UTC 2024 - Richard Biener diff --git a/gcc13.spec b/gcc13.spec index 94553aa..c2779ca 100644 --- a/gcc13.spec +++ b/gcc13.spec @@ -384,6 +384,7 @@ Patch21: gdcflags.patch Patch23: gcc13-bsc1216664.patch Patch24: gcc13-sanitizer-remove-crypt-interception.patch Patch25: gcc13-pr111731.patch +Patch26: gcc13-pr101523.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -2373,6 +2374,7 @@ ln -s newlib-4.3.0.20230120/newlib . %patch -P 23 -p1 %patch -P 24 -p1 %patch -P 25 -p1 +%patch -P 26 -p1 %patch -P 51 %patch -P 60 -p1 %patch -P 61 -p1 From d44b58ed5761a49b8a7a815ac7072d00fcf69311ead57be3cd02081b1474cd27 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 4 Apr 2024 07:46:22 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc13?expand=0&rev=103 --- gcc13-pr101523.patch | 54 +++++++++++++++++++++----------------------- gcc13.changes | 2 +- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/gcc13-pr101523.patch b/gcc13-pr101523.patch index 2c1993e..48731bd 100644 --- a/gcc13-pr101523.patch +++ b/gcc13-pr101523.patch @@ -1,48 +1,46 @@ -From 839bc42772ba7af66af3bd16efed4a69511312ae Mon Sep 17 00:00:00 2001 -From: Segher Boessenkool -Date: Wed, 27 Mar 2024 14:09:52 +0000 -Subject: [PATCH] combine: Don't combine if I2 does not change +From 5729ffad4db78b26f0d1f658a9fd695be5970550 Mon Sep 17 00:00:00 2001 +From: Richard Biener +Date: Wed, 3 Apr 2024 12:58:26 +0200 +Subject: [PATCH] rtl-optimization/101523 - avoid re-combine after noop 2->2 + combination To: gcc-patches@gcc.gnu.org -In some cases combine will "combine" an I2 and I3, but end up putting -exactly the same thing back as I2 as was there before. This is never -progress, so we shouldn't do it, it will lead to oscillating behaviour -and the like. - -If we want to canonicalise things, that's fine, but this is not the -way to do it. - -2024-03-27 Segher Boessenkool +The following avoids re-walking and re-combining the instructions +between i2 and i3 when the pattern of i2 doesn't change. PR rtl-optimization/101523 - * combine.cc (try_combine): Don't do a 2-insn combination if - it does not in fact change I2. + * combine.cc (try_combine): When the pattern of i2 doesn't + change do not re-start combining at i2 or an earlier insn which + had links or notes added. --- - gcc/combine.cc | 11 +++++++++++ - 1 file changed, 11 insertions(+) + gcc/combine.cc | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/gcc/combine.cc b/gcc/combine.cc -index a4479f8d836..745391016d0 100644 +index a4479f8d836..ff25752cac4 100644 --- a/gcc/combine.cc +++ b/gcc/combine.cc -@@ -4186,6 +4186,17 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, +@@ -4186,6 +4186,10 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, adjust_for_new_dest (i3); } -+ /* If I2 didn't change, this is not a combination (but a simplification or -+ canonicalisation with context), which should not be done here. Doing -+ it here explodes the algorithm. Don't. */ ++ bool i2_unchanged = false; + if (rtx_equal_p (newi2pat, PATTERN (i2))) -+ { -+ if (dump_file) -+ fprintf (dump_file, "i2 didn't change, not doing this\n"); -+ undo_all (); -+ return 0; -+ } ++ i2_unchanged = true; + /* We now know that we can do this combination. Merge the insns and update the status of registers and LOG_LINKS. */ +@@ -4752,6 +4756,9 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, + combine_successes++; + undo_commit (); + ++ if (i2_unchanged) ++ return i3; ++ + rtx_insn *ret = newi2pat ? i2 : i3; + if (added_links_insn && DF_INSN_LUID (added_links_insn) < DF_INSN_LUID (ret)) + ret = added_links_insn; -- 2.35.3 diff --git a/gcc13.changes b/gcc13.changes index d426b63..51b72d1 100644 --- a/gcc13.changes +++ b/gcc13.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Mar 28 06:55:18 UTC 2024 - Richard Biener +Thu Apr 4 07:43:17 UTC 2024 - Richard Biener - Add gcc13-pr101523.patch to avoid combine spending too much compile-time and memory doing nothing on s390x. [boo#1188441]