Merge branch 'main' of https://github.com/nanoframework/nf-interpreter into develop

Author: josesimoes

.github/copilot-instructions.md

@@ -103,8 +103,8 @@ There is no standalone test suite or test runner in this repository. Testing is
 
 ### Language Standards
 
-- **C++20** (`stdcpp20`) for C++ files (`.cpp`).
-- **C17** (`stdc17`) for C files (`.c`).
+- **C++23** (`stdcpp23`) for C++ files (`.cpp`).
+- **C23** (`stdc23`) for C files (`.c`).
 - HAL-level code tends to be C; CLR, PAL, and device API code is C++.
 
 ### Formatting

.github/workflows/posix-nanoclr.yml

@@ -42,9 +42,22 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Install GCC 15
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+          sudo apt-get update
+          sudo apt-get install -y gcc-15 g++-15
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-15 100
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-15 100
+
       - name: Install arm64 cross-toolchain
         if: matrix.posix_rid == 'linux-arm64'
-        run: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+        run: |
+            curl -fsSL "https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-x86_64-aarch64-none-linux-gnu.tar.xz" \
+              | sudo tar -xJ -C /opt
+            echo "/opt/arm-gnu-toolchain-15.2.rel1-x86_64-aarch64-none-linux-gnu/bin" >> $GITHUB_PATH
+
 
       - name: Configure
         run: |

CMake/Modules/FindChibiOS_RP2040_HAL.cmake

@@ -184,10 +184,12 @@ endforeach()
 # Suppress -Wshadow for ChibiOS ADC HAL (variable shadowing in macro expansion)
 SET_SOURCE_FILES_PROPERTIES(${chibios_SOURCE_DIR}/os/hal/ports/RP/LLD/ADCv1/hal_adc_lld.c PROPERTIES COMPILE_FLAGS -Wno-shadow)
 
-# Force -fno-inline for ChibiOS USB HAL on RP2040 (Cortex-M0+ / Thumb-1).
-# Inlining ChibiOS static inline helpers creates composite functions whose stack frames
-# exceed the Thumb-1 SP-relative ldr offset limit (1020 bytes), causing assembler errors.
-SET_SOURCE_FILES_PROPERTIES(${chibios_SOURCE_DIR}/os/hal/ports/RP/LLD/USBv1/hal_usb_lld.c PROPERTIES COMPILE_FLAGS -fno-inline)
+# Force -Os -fno-inline for ChibiOS USB HAL on RP2040 (Cortex-M0+ / Thumb-1).
+# -fno-inline prevents inlining static inline helpers that would create composite
+# functions with stack frames exceeding the Thumb-1 SP-relative ldr offset limit (1020 bytes).
+# -Os overrides the global -Og: GCC 15 changed -Og to keep more variables on the stack for
+# debuggability, pushing individual function frames past 1020 bytes even without inlining.
+SET_SOURCE_FILES_PROPERTIES(${chibios_SOURCE_DIR}/os/hal/ports/RP/LLD/USBv1/hal_usb_lld.c PROPERTIES COMPILE_FLAGS "-Os -fno-inline")
 
 include(FindPackageHandleStandardArgs)
 

CMake/binutils.ESP32.cmake

@@ -870,6 +870,18 @@ macro(nf_add_idf_as_library)
         message(STATUS "Using default XTAL frequency")
     endif()
 
+    # Workaround for MODLOG_N implicit-declaration error with GCC 15+ in NimBLE debug builds.
+    # NimBLE defines log-level names as integers (DEBUG=1, INFO=2, ...). When these are used as
+    # the level argument to MODLOG_DFLT(), they expand to their numeric values before the ## paste
+    # in modlog.h, producing e.g. MODLOG_1 which is not defined. GCC 15 turns that implicit-
+    # function-declaration into a hard error. The compat header provides silent no-op fallbacks.
+    if(HAL_USE_BLE_OPTION AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+        idf_build_set_property(COMPILE_OPTIONS
+            "-include${CMAKE_SOURCE_DIR}/targets/ESP32/_include/nimble_modlog_compat.h"
+            APPEND
+        )
+    endif()
+
     # create IDF static libraries
     idf_build_process(${TARGET_SERIES_SHORT}
         COMPONENTS 

CMake/toolchain.arm-none-eabi.cmake

@@ -50,10 +50,5 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 
 # set required C and C++ standard for ALL targets
-set(CMAKE_C_STANDARD 17 CACHE INTERNAL "C standard for all targets")
-set(CMAKE_CXX_STANDARD 17 CACHE INTERNAL "C++ standard for all targets")
-
-# set all C and C++ extensions to be OFF on ALL targets
-# this forces the use of -std=c17 and -std=c++17 instead of -std=gnu17 and -std=gnu++17
-set(CMAKE_C_EXTENSIONS OFF CACHE INTERNAL "C compiler extensions OFF")
-set(CMAKE_CXX_EXTENSIONS OFF CACHE INTERNAL "C++ compiler extensions OFF")
+set(CMAKE_C_STANDARD 23 CACHE INTERNAL "C standard for all targets")
+set(CMAKE_CXX_STANDARD 23 CACHE INTERNAL "C++ standard for all targets")

azure-pipelines.yml

@@ -94,7 +94,7 @@ jobs:
             {
               Write-Host "##[command] **This is a PR build**"
 
-              $pr = Invoke-RestMethod -Uri "https://api.github.com/repos/nanoframework/nf-interpreter/pulls/$env:System_PullRequest_PullRequestId" -Header @{"Authorization"="$auth"} -ContentType "application/json" -Method GET
+              $pr = Invoke-RestMethod -Uri "https://api.github.com/repos/nanoframework/nf-interpreter/pulls/$env:System_PullRequest_PullRequestNumber" -Header @{"Authorization"="$auth"} -ContentType "application/json" -Method GET
 
               # check if this is a version update PR, if so, skip build
               if( ($pr.user.login -eq "nfbot") -and ($pr.title -like "*[version update]*") )
@@ -1301,7 +1301,9 @@ jobs:
           # Install arm64 cross-compiler when building linux-arm64 on an x86_64 agent.
           TOOLCHAIN_ARG=""
           if [ "$(POSIX_RID)" = "linux-arm64" ]; then
-            sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+            curl -fsSL "https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-x86_64-aarch64-none-linux-gnu.tar.xz" \
+              | sudo tar -xJ -C /opt
+            export PATH="/opt/arm-gnu-toolchain-15.2.rel1-x86_64-aarch64-none-linux-gnu/bin:$PATH"
             TOOLCHAIN_ARG="-DCMAKE_TOOLCHAIN_FILE=$(pwd)/targets/posix/toolchain-aarch64-linux-gnu.cmake"
           fi
 

nf.props

@@ -25,7 +25,7 @@
     <ClCompile>
       <PreprocessorDefinitions>VIRTUAL_DEVICE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;VERSION_MAJOR=$(NBGV_VersionMajor);VERSION_MINOR=$(NBGV_VersionMinor);VERSION_BUILD=$(NBGV_BuildNumber);VERSION_REVISION=$(TARGET_BUILD_COUNTER);PLATFORMNAMESTRING="WINDOWS";</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\targets\win32\Include;..\..\targets\netcore\nanoFramework.nanoCLR;..\..\..\targets\netcore\nanoFramework.nanoCLR;..\..\..\..\targets\netcore\nanoFramework.nanoCLR;..\CLR\Include;..\..\CLR\Include;..\CorLib;..\HAL\Include;..\..\src\HAL\Include;..\..\..\src\HAL\Include;..\..\..\..\src\HAL\Include;..\PAL\Include;</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard>stdcpp23</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
   </ItemDefinitionGroup>

targets/ChibiOS/RP_PICO_W_RP2040/CMakeLists.txt

@@ -65,9 +65,16 @@ nf_setup_target_build(
 if(USE_NETWORKING_OPTION AND TARGET_HAS_WIFI)
     foreach(CYW43_SRC ${CYW43_DRIVER_SOURCES})
         get_filename_component(CYW43_SRC_NAME ${CYW43_SRC} NAME)
-        if(CYW43_SRC_NAME MATCHES "^cyw43_")
+        if(CYW43_SRC_NAME STREQUAL "cyw43_ll.c")
+            # cyw43_ll.c is a very large file. GCC 15 changed -Og to keep more variables on
+            # the stack for debuggability, pushing function frames past the Thumb-1
+            # SP-relative ldr offset limit (1020 bytes). Force -Os -fno-inline to prevent
+            # this — same fix applied to hal_usb_lld.c for the same reason.
             set_source_files_properties(${CYW43_SRC} PROPERTIES COMPILE_FLAGS
-                "-Wno-error=shadow -Wno-error=return-type -Wno-error=implicit-function-declaration -Wno-error=type-limits -Wno-error=unused-parameter -Wno-error=missing-prototypes -Wno-error=missing-declarations -Wno-error=old-style-definition -Wno-error=undef")
+                "-Os -fno-inline -Wno-undef -Wno-error=shadow -Wno-error=return-type -Wno-error=implicit-function-declaration -Wno-error=type-limits -Wno-error=unused-parameter -Wno-error=missing-prototypes -Wno-error=missing-declarations -Wno-error=old-style-definition")
+        elseif(CYW43_SRC_NAME MATCHES "^cyw43_")
+            set_source_files_properties(${CYW43_SRC} PROPERTIES COMPILE_FLAGS
+                "-Wno-undef -Wno-error=shadow -Wno-error=return-type -Wno-error=implicit-function-declaration -Wno-error=type-limits -Wno-error=unused-parameter -Wno-error=missing-prototypes -Wno-error=missing-declarations -Wno-error=old-style-definition")
         endif()
     endforeach()
 endif()

targets/ChibiOS/_nanoCLR/nanoFramework.Hardware.Stm32/nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Configuration.cpp

@@ -57,7 +57,10 @@ HRESULT Library_nf_hardware_stm32_native_nanoFramework_Hardware_Stm32_Configurat
     alternateFunction = (uint8_t)gpioConfiguration[GpioConfiguration::FIELD___alternateFunction].NumericByRef().s4;
 
     // configure the pin
-    palSetPadMode(port, pad, mode | pullUpDown | speed | (PAL_MODE_ALTERNATE(alternateFunction)));
+    palSetPadMode(
+        port,
+        pad,
+        (iomode_t)((uint32_t)mode | (uint32_t)pullUpDown | (uint32_t)speed | PAL_MODE_ALTERNATE(alternateFunction)));
 
     NANOCLR_NOCLEANUP_NOLABEL();
 }

targets/ESP32/_include/nimble_modlog_compat.h

@@ -0,0 +1,49 @@
+//
+// Copyright (c) .NET Foundation and Contributors
+// See LICENSE file in the project root for full license information.
+//
+
+// Compatibility shim for NimBLE modlog numeric-level macros with GCC 15+.
+//
+// NimBLE defines log-level constants as integers (e.g. DEBUG=1, INFO=2, ...).
+// When MODLOG_DFLT(DEBUG, ...) expands, DEBUG is resolved to 1 before the
+// ## token-paste in modlog.h fires, producing MODLOG_1 which is not defined
+// in the ESP-IDF NimBLE port's modlog.h. GCC 15 promotes that implicit-
+// function-declaration from a warning to an error. The definitions below
+// provide silent no-op fallbacks for every numeric variant that modlog.h
+// leaves undefined, without modifying any ESP-IDF source files.
+
+#ifndef NIMBLE_MODLOG_COMPAT_H
+#define NIMBLE_MODLOG_COMPAT_H
+
+#ifndef MODLOG_1
+// NOLINTBEGIN
+#define MODLOG_1(ml_mod_, ...) ((void)0)
+// NOLINTEND
+#endif
+
+#ifndef MODLOG_2
+// NOLINTBEGIN
+#define MODLOG_2(ml_mod_, ...) ((void)0)
+// NOLINTEND
+#endif
+
+#ifndef MODLOG_3
+// NOLINTBEGIN
+#define MODLOG_3(ml_mod_, ...) ((void)0)
+// NOLINTEND
+#endif
+
+#ifndef MODLOG_4
+// NOLINTBEGIN
+#define MODLOG_4(ml_mod_, ...) ((void)0)
+// NOLINTEND
+#endif
+
+#ifndef MODLOG_5
+// NOLINTBEGIN
+#define MODLOG_5(ml_mod_, ...) ((void)0)
+// NOLINTEND
+#endif
+
+#endif // NIMBLE_MODLOG_COMPAT_H