From b829a39df56d401e6c7493c6cef2bf3880335626 Mon Sep 17 00:00:00 2001 From: chenguoqi Date: Sun, 29 Jan 2023 15:33:17 +0800 Subject: [PATCH] unix/linux: update to gcc 13.0.0, qemu 7.1.0 for loong64 No changes in generated files. Update loongarch64-linux-gcc to 13.0.0 - The kernel header file version is upgraded to 5.19 Update qemu-loongarch64 to 7.1.0 - Support for LoongArch has been merged upstream. Change-Id: I637925fd9e5575dfb4ce91ece98951d5bf3053e6 Reviewed-on: https://go-review.googlesource.com/c/sys/+/453458 Run-TryBot: Ian Lance Taylor Auto-Submit: Ian Lance Taylor Reviewed-by: xiaodong liu TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor Reviewed-by: Cherry Mui --- unix/linux/Dockerfile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/unix/linux/Dockerfile b/unix/linux/Dockerfile index 592a2841..59c2ada1 100644 --- a/unix/linux/Dockerfile +++ b/unix/linux/Dockerfile @@ -58,14 +58,18 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Only for loong64, getting tools of qemu-user and gcc-cross-compiler -RUN apt-get update && apt-get install wget xz-utils -y && mkdir /loong64 && cd /loong64 \ - && wget -q https://github.com/loongson/build-tools/releases/download/2021.12.21/qemu-loongarch-2022-4-01.tar.gz \ - && tar xf qemu-loongarch-2022-4-01.tar.gz && cp ./4-1/new-world/qemu-loongarch64 /usr/bin/ \ - && rm -rf qemu-loongarch-2022-4-01.tar.gz 4-1 \ - && wget -q https://github.com/loongson/build-tools/releases/download/2021.12.21/loongarch64-clfs-2022-03-03-cross-tools-gcc-glibc.tar.xz \ - && tar xf loongarch64-clfs-2022-03-03-cross-tools-gcc-glibc.tar.xz && mv cross-tools.gcc_glibc /usr/local/cross-tools-loong64 \ - && rm -rf loongarch64-clfs-2022-03-03-cross-tools-gcc-glibc.tar.xz \ - && ln -s /usr/local/cross-tools-loong64/bin/loongarch64-unknown-linux-gnu-gcc /usr/bin/loongarch64-linux-gnu-gcc \ +ENV LOONG64_BASE_URL https://github.com/loongson/build-tools/releases/download/2022.09.06 +ENV LOONG64_GCC loongarch64-clfs-6.3-cross-tools-gcc-glibc.tar.xz +ENV LOONG64_QEMU qemu-loongarch64 +ENV LOONG64_GCC_DOWNLOAD_URL $LOONG64_BASE_URL/$LOONG64_GCC +ENV LOONG64_QEMU_DOWNLOAD_URL $LOONG64_BASE_URL/$LOONG64_QEMU + +RUN apt-get update && apt-get install xz-utils -y && mkdir /loong64 && cd /loong64 \ + && curl -fsSL "$LOONG64_QEMU_DOWNLOAD_URL" -o /usr/bin/"$LOONG64_QEMU" \ + && chmod +x /usr/bin/"$LOONG64_QEMU" \ + && curl -fsSL "$LOONG64_GCC_DOWNLOAD_URL" -o "$LOONG64_GCC" \ + && tar xf "$LOONG64_GCC" -C /usr/local/ \ + && ln -s /usr/local/cross-tools/bin/loongarch64-unknown-linux-gnu-gcc /usr/bin/loongarch64-linux-gnu-gcc \ && rm -rf /loong64 # Let the scripts know they are in the docker environment