From 8f3f00ce94cb80b810019bf9e598b0f57a7ff48a Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Mon, 18 Sep 2023 22:32:49 +0100 Subject: [PATCH] Updates GCC to 12.3.rel1 (#2720) ***NO_CI*** --- .devcontainer/Dockerfile.All | 2 +- .devcontainer/Dockerfile.AzureRTOS | 2 +- .devcontainer/Dockerfile.ChibiOS | 2 +- .devcontainer/Dockerfile.TI | 2 +- .devcontainer/sources/Dockerfile.All | 2 +- .devcontainer/sources/Dockerfile.AzureRTOS | 2 +- .devcontainer/sources/Dockerfile.ChibiOS | 2 +- .devcontainer/sources/Dockerfile.TI | 2 +- .../download-install-arm-gcc-toolchain.yml | 2 +- install-scripts/install-arm-gcc-toolchain.ps1 | 2 +- src/nanoFramework.Graphics/Graphics/Core/Support/Jpeg/Jpeg.cpp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.devcontainer/Dockerfile.All b/.devcontainer/Dockerfile.All index c7353a6151..7908e25567 100644 --- a/.devcontainer/Dockerfile.All +++ b/.devcontainer/Dockerfile.All @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-all:v2.36 +FROM ghcr.io/nanoframework/dev-container-all:v2.37 diff --git a/.devcontainer/Dockerfile.AzureRTOS b/.devcontainer/Dockerfile.AzureRTOS index 1247671d76..6dd56b668b 100644 --- a/.devcontainer/Dockerfile.AzureRTOS +++ b/.devcontainer/Dockerfile.AzureRTOS @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.20 +FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.21 diff --git a/.devcontainer/Dockerfile.ChibiOS b/.devcontainer/Dockerfile.ChibiOS index 50225cd4e8..cdda06df72 100644 --- a/.devcontainer/Dockerfile.ChibiOS +++ b/.devcontainer/Dockerfile.ChibiOS @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-chibios:v1.20 +FROM ghcr.io/nanoframework/dev-container-chibios:v1.21 diff --git a/.devcontainer/Dockerfile.TI b/.devcontainer/Dockerfile.TI index 6567332c73..468acd6491 100644 --- a/.devcontainer/Dockerfile.TI +++ b/.devcontainer/Dockerfile.TI @@ -1 +1 @@ -FROM ghcr.io/nanoframework/dev-container-ti:v1.17 +FROM ghcr.io/nanoframework/dev-container-ti:v1.18 diff --git a/.devcontainer/sources/Dockerfile.All b/.devcontainer/sources/Dockerfile.All index 0a54717c0e..c58a874f7d 100644 --- a/.devcontainer/sources/Dockerfile.All +++ b/.devcontainer/sources/Dockerfile.All @@ -7,7 +7,7 @@ RUN apt-get update \ unzip \ wget -ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz +ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1-x86_64-arm-none-eabi.tar.xz RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \ && curl -o /tmp/dc-downloads/gcc-arm.tar.xz $GCC_URI \ && xz -d /tmp/dc-downloads/gcc-arm.tar.xz \ diff --git a/.devcontainer/sources/Dockerfile.AzureRTOS b/.devcontainer/sources/Dockerfile.AzureRTOS index 71eb8e6e66..013cc1ff85 100644 --- a/.devcontainer/sources/Dockerfile.AzureRTOS +++ b/.devcontainer/sources/Dockerfile.AzureRTOS @@ -7,7 +7,7 @@ RUN apt-get update \ unzip \ wget -ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz +ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1-x86_64-arm-none-eabi.tar.xz RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \ && curl -o /tmp/dc-downloads/gcc-arm.tar.xz $GCC_URI \ && xz -d /tmp/dc-downloads/gcc-arm.tar.xz \ diff --git a/.devcontainer/sources/Dockerfile.ChibiOS b/.devcontainer/sources/Dockerfile.ChibiOS index 119a4e7803..29fd98d2da 100644 --- a/.devcontainer/sources/Dockerfile.ChibiOS +++ b/.devcontainer/sources/Dockerfile.ChibiOS @@ -7,7 +7,7 @@ RUN apt-get update \ unzip \ wget -ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz +ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1-x86_64-arm-none-eabi.tar.xz RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \ && curl -o /tmp/dc-downloads/gcc-arm.tar.xz $GCC_URI \ && xz -d /tmp/dc-downloads/gcc-arm.tar.xz \ diff --git a/.devcontainer/sources/Dockerfile.TI b/.devcontainer/sources/Dockerfile.TI index 4837de9518..318bca4a89 100644 --- a/.devcontainer/sources/Dockerfile.TI +++ b/.devcontainer/sources/Dockerfile.TI @@ -7,7 +7,7 @@ RUN apt-get update \ unzip \ wget -ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz +ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1-x86_64-arm-none-eabi.tar.xz RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \ && curl -o /tmp/dc-downloads/gcc-arm.tar.xz $GCC_URI \ && xz -d /tmp/dc-downloads/gcc-arm.tar.xz \ diff --git a/azure-pipelines-templates/download-install-arm-gcc-toolchain.yml b/azure-pipelines-templates/download-install-arm-gcc-toolchain.yml index 4e8557864a..745d01cb6e 100644 --- a/azure-pipelines-templates/download-install-arm-gcc-toolchain.yml +++ b/azure-pipelines-templates/download-install-arm-gcc-toolchain.yml @@ -6,7 +6,7 @@ steps: condition: eq(variables.GccArm_Version, '') displayName: Cache latest ARM GCC toolchain inputs: - key: 'gcc-12_2_rel1 | gccUpdateKey' + key: 'gcc-12_3_rel1 | gccUpdateKey' restoreKeys: gccUpdateKey path: $(Agent.TempDirectory)\GNU_Tools_ARM_Embedded cacheHitVar: GCC_CACHE_RESTORED diff --git a/install-scripts/install-arm-gcc-toolchain.ps1 b/install-scripts/install-arm-gcc-toolchain.ps1 index aec2a6e900..76d8d360d6 100644 --- a/install-scripts/install-arm-gcc-toolchain.ps1 +++ b/install-scripts/install-arm-gcc-toolchain.ps1 @@ -12,7 +12,7 @@ param ( # set default GNU GCC version if ([string]::IsNullOrEmpty($Version)) { - $Version = "12.2.rel1" + $Version = "12.3.rel1" } # check if running on Azure Pipelines by looking at this two environment variables diff --git a/src/nanoFramework.Graphics/Graphics/Core/Support/Jpeg/Jpeg.cpp b/src/nanoFramework.Graphics/Graphics/Core/Support/Jpeg/Jpeg.cpp index 69fb2c761e..7638b535f2 100644 --- a/src/nanoFramework.Graphics/Graphics/Core/Support/Jpeg/Jpeg.cpp +++ b/src/nanoFramework.Graphics/Graphics/Core/Support/Jpeg/Jpeg.cpp @@ -22,7 +22,7 @@ extern "C" struct JPEGErrorManager { jpeg_error_mgr pub; - int setjmpBuffer[32]; + jmp_buf setjmpBuffer; }; void JPEGErrorHandler(j_common_ptr cinfo)