Hi Tom, > As this is the current version of the public cross toolchains we use, > upgrade to this now. > > Suggested-by: Alexey Brodkin <[email protected]> > Signed-off-by: Tom Rini <[email protected]> > --- > Cc: Heinrich Schuchardt <[email protected]> > > Heinrich, at this point is there a newer grub we should be testing? > There's now 2 changes for RISC-V that we're cherry-picking for newer > toolchains.
That's what I noticed as well - grub fails to build for RISCV with the following message, I guess you saw that as well: ----------------------->8---------------------- ./grub-mkimage: error: relocation 0x13 is not implemented yet. ----------------------->8---------------------- > --- > .azure-pipelines.yml | 2 +- > .gitlab-ci.yml | 2 +- > tools/buildman/toolchain.py | 2 +- > tools/docker/Dockerfile | 57 +++++++++++++++++++------------------ > 4 files changed, 32 insertions(+), 31 deletions(-) > > diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml > index 76982ec3e52e..83cc6176e7b4 100644 > --- a/.azure-pipelines.yml > +++ b/.azure-pipelines.yml > @@ -194,7 +194,7 @@ stages: > ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb > nokia_rx51_tmp/ > ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb > nokia_rx51_tmp/ > ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/ > - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH > + export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH > test/nokia_rx51_test.sh > > - job: pylint > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index f7ffb8f5dfdc..5300813cf511 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -232,7 +232,7 @@ Run tests for Nokia RX-51 (aka N900): > ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/; > ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb > nokia_rx51_tmp/; > ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/; > - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH; > + export PATH=/opt/gcc-13.1.0-nolibc/arm-linux-gnueabi/bin:$PATH; > test/nokia_rx51_test.sh > > # Check for any pylint regressions > diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py > index 0ecd8458b912..1001b612086f 100644 > --- a/tools/buildman/toolchain.py > +++ b/tools/buildman/toolchain.py > @@ -499,7 +499,7 @@ class Toolchains: > if arch == 'aarch64': > arch = 'arm64' > base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' > - versions = ['12.2.0', '11.1.0'] > + versions = ['13.1.0', '12.2.0'] > links = [] > for version in versions: > url = '%s/%s/%s/' % (base, arch, version) > diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile > index f72cba0b8cc4..2f2ace2e6554 100644 > --- a/tools/docker/Dockerfile > +++ b/tools/docker/Dockerfile > @@ -14,18 +14,18 @@ RUN apt-get update && apt-get install -y gnupg2 wget > xz-utils && rm -rf /var/lib > RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - > RUN echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main | tee > /etc/apt/sources.list.d/llvm.list > > -# Manually install the kernel.org "Crosstool" based toolchains for gcc-12.2.0 > -RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-aarch64-linux.tar.xz > | tar -C /opt -xJ > -RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-arm-linux-gnueabi.tar.xz > | tar -C /opt -xJ > -RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-i386-linux.tar.xz > | tar -C /opt -xJ > -RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-m68k-linux.tar.xz > | tar -C /opt -xJ > -RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-mips-linux.tar.xz > | tar -C /opt -xJ > -RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-microblaze-linux.tar.xz > | tar -C /opt -xJ > -RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-nios2-linux.tar.xz > | tar -C /opt -xJ > -RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-powerpc-linux.tar.xz > | tar -C /opt -xJ > -RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-riscv64-linux.tar.xz > | tar -C /opt -xJ > -RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-riscv32-linux.tar.xz > | tar -C /opt -xJ > -RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/12.2.0/x86_64-gcc-12.2.0-nolibc-sh2-linux.tar.xz > | tar -C /opt -xJ > +# Manually install the kernel.org "Crosstool" based toolchains for gcc-13.1.0 > +RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-aarch64-linux.tar.xz > | tar -C /opt -xJ > +RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-arm-linux-gnueabi.tar.xz > | tar -C /opt -xJ > +RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-i386-linux.tar.xz > | tar -C /opt -xJ > +RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-m68k-linux.tar.xz > | tar -C /opt -xJ > +RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-mips-linux.tar.xz > | tar -C /opt -xJ > +RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-microblaze-linux.tar.xz > | tar -C /opt -xJ > +RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-nios2-linux.tar.xz > | tar -C /opt -xJ > +RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-powerpc-linux.tar.xz > | tar -C /opt -xJ > +RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-riscv64-linux.tar.xz > | tar -C /opt -xJ > +RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-riscv32-linux.tar.xz > | tar -C /opt -xJ > +RUN wget -O - > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.1.0/x86_64-gcc-13.1.0-nolibc-sh2-linux.tar.xz > | tar -C /opt -xJ Maybe squash my ARC GNU toolchain removal from https://lists.denx.de/pipermail/u-boot/2023-July/521983.html here with use of GCC 13.1.0? I may do it as a follow-up patch as well if it loos more appropriate. Otherwise, thanks for working on that change and... Acked-by: Alexey Brodkin <[email protected]> -Alexey
