Skip to content

Update gcc 14.2 - fix [workaround] for mbedTLS #3197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
+165 −171
Draft

Update gcc 14.2 - fix [workaround] for mbedTLS #3197

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7f95cfa
Update GCC to 14.2.rel1
josesimoes Jan 3, 2025
cfbf764
Update binutils.common.cmake
networkfusion Jul 5, 2025
b0f8d18
Merge branch 'main' into update-gcc-14-2-tls
networkfusion Jul 5, 2025
7ff868b
Improve comment for mbedcrypto compile flags
networkfusion Jul 5, 2025
c1caa8f
Update CLR_RT_Interop.cpp
networkfusion Jul 5, 2025
d341538
Use single quotes for literal cache keys
networkfusion Jul 5, 2025
5d7fd14
Restore need for Ninja
networkfusion Jul 5, 2025
213b093
Split FreeRTOS and CMSIS commands
networkfusion Jul 5, 2025
23acf9f
Update docker/build-push-action
networkfusion Jul 5, 2025
5f4bde6
test fix
networkfusion Jul 5, 2025
90a23f1
Test LFS fix
networkfusion Jul 5, 2025
ef14df8
Fix ARM_GCC_PATH
networkfusion Jul 7, 2025
68d1839
Merge branch 'main' into update-gcc-14-2-tls
networkfusion Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/All/Dockerfile.All
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/nanoframework/dev-container-all:v2.57
FROM ghcr.io/nanoframework/dev-container-all:v2.58
2 changes: 1 addition & 1 deletion .devcontainer/All/Dockerfile.All.SRC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update \

RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted

ARG GCC_VERSION=13.3.rel1
ARG GCC_VERSION=14.2.rel1
ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/$GCC_VERSION/binrel/arm-gnu-toolchain-$GCC_VERSION-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 \
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/AzureRTOS/Dockerfile.AzureRTOS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.34
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.35
2 changes: 1 addition & 1 deletion .devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update \

RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted

ARG GCC_VERSION=13.3.rel1
ARG GCC_VERSION=14.2.rel1
ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/$GCC_VERSION/binrel/arm-gnu-toolchain-$GCC_VERSION-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 \
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/ChibiOS/Dockerfile.ChibiOS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/nanoframework/dev-container-chibios:v1.35
FROM ghcr.io/nanoframework/dev-container-chibios:v1.36
2 changes: 1 addition & 1 deletion .devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update \

RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted

ARG GCC_VERSION=13.3.rel1
ARG GCC_VERSION=14.2.rel1
ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/$GCC_VERSION/binrel/arm-gnu-toolchain-$GCC_VERSION-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 \
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.07
FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.08
2 changes: 1 addition & 1 deletion .devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update \

RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted

ARG GCC_VERSION=13.3.rel1
ARG GCC_VERSION=14.2.rel1
ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/$GCC_VERSION/binrel/arm-gnu-toolchain-$GCC_VERSION-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 \
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/TI/Dockerfile.TI.SRC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update \

RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted

ARG GCC_VERSION=13.3.rel1
ARG GCC_VERSION=14.2.rel1
ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/$GCC_VERSION/binrel/arm-gnu-toolchain-$GCC_VERSION-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 \
Expand Down
3 changes: 2 additions & 1 deletion CMake/binutils.common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,8 @@ macro(nf_setup_target_build_common)

# need to unset several flags for MbedTLS to compile correctly
target_compile_options(mbedtls PRIVATE -Wno-undef -Wno-error=unused-function -Wno-error=discarded-qualifiers -Wno-error=unused-parameter)
target_compile_options(mbedcrypto PRIVATE -Wno-undef -Wno-error=unused-function -Wno-error=discarded-qualifiers -Wno-error=unused-parameter)
# FIXME: -fomit-frame-pointer should be removed when the issue is resolved: https://github.com/Mbed-TLS/mbedtls/issues/9875
target_compile_options(mbedcrypto PRIVATE -fomit-frame-pointer -Wno-undef -Wno-error=unused-function -Wno-error=discarded-qualifiers -Wno-error=unused-parameter)
target_compile_options(mbedx509 PRIVATE -Wno-undef -Wno-error=unused-function -Wno-error=discarded-qualifiers -Wno-error=unused-parameter)

endif()
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
parameters:
- name: gccArmVersion
type: string
default: "13.3.rel1"
default: "14.2.rel1"

steps:
- task: Cache@2
condition: eq(variables.GccArm_Version, '')
displayName: Cache latest ARM GCC toolchain
inputs:
key: "gcc-13_3__rel1 | gccUpdateKey"
key: "gcc-14_2__rel1 | gccUpdateKey"
restoreKeys: gccUpdateKey
path: $(Agent.TempDirectory)\arm-gnu-toolchain-${{ parameters.gccArmVersion }}-mingw-w64-i686-arm-none-eabi
cacheHitVar: GCC_CACHE_RESTORED
Expand Down
266 changes: 125 additions & 141 deletions install-scripts/install-arm-gcc-toolchain.ps1
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/CLR/Core/CLR_RT_Interop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ unsigned int &Interop_Marshal_GetField_UINT32(CLR_RT_HeapBlock *pThis, unsigned

unsigned __int64 &Interop_Marshal_GetField_UINT64(CLR_RT_HeapBlock *pThis, unsigned int fieldIndex)
{
return (unsigned __int64 &)pThis[fieldIndex].NumericByRef().u8;
return *reinterpret_cast<unsigned __int64 *>(&pThis[fieldIndex].NumericByRef().u8);
}

#ifdef __GNUC__
Expand Down Expand Up @@ -925,7 +925,7 @@ signed int &Interop_Marshal_GetField_INT32(CLR_RT_HeapBlock *pThis, unsigned int

signed __int64 &Interop_Marshal_GetField_INT64(CLR_RT_HeapBlock *pThis, unsigned int fieldIndex)
{
return (signed __int64 &)pThis[fieldIndex].NumericByRef().s8;
return *reinterpret_cast<signed __int64 *>(&pThis[fieldIndex].NumericByRef().s8);
}

#ifdef __GNUC__
Expand All @@ -947,7 +947,7 @@ float &Interop_Marshal_GetField_float(CLR_RT_HeapBlock *pThis, unsigned int fiel

double &Interop_Marshal_GetField_double(CLR_RT_HeapBlock *pThis, unsigned int fieldIndex)
{
return (double &)pThis[fieldIndex].NumericByRef().r8;
return *reinterpret_cast<double *>(&pThis[fieldIndex].NumericByRef().r8);
}

#ifdef __GNUC__
Expand Down
Loading