Add back LTO (#2432)

josesimoes · web-flow · commit 3b338fd711ad · 2022-09-15T13:23:20.000+01:00
diff --git a/CMake/Modules/AzureRTOS_MAX78000_GCC_options.cmake b/CMake/Modules/AzureRTOS_MAX78000_GCC_options.cmake
@@ -47,13 +47,13 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs --specs=nosys.specs")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto ")
     endif()
+
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs --specs=nosys.specs")
       
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
diff --git a/CMake/Modules/AzureRTOS_MICROBIT_GCC_options.cmake b/CMake/Modules/AzureRTOS_MICROBIT_GCC_options.cmake
@@ -48,14 +48,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs --specs=nosys.specs")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs --specs=nosys.specs")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/Modules/AzureRTOS_RP2040_GCC_options.cmake b/CMake/Modules/AzureRTOS_RP2040_GCC_options.cmake
@@ -46,14 +46,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/Modules/AzureRTOS_STM32F7xx_GCC_options.cmake b/CMake/Modules/AzureRTOS_STM32F7xx_GCC_options.cmake
@@ -52,14 +52,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs --specs=nosys.specs")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs --specs=nosys.specs")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/Modules/AzureRTOS_STM32L4xx_GCC_options.cmake b/CMake/Modules/AzureRTOS_STM32L4xx_GCC_options.cmake
@@ -52,14 +52,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs --specs=nosys.specs")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -fuse-linker-plugin -Os")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs --specs=nosys.specs")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/Modules/CHIBIOS_STM32F0xx_GCC_options.cmake b/CMake/Modules/CHIBIOS_STM32F0xx_GCC_options.cmake
@@ -45,14 +45,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/Modules/CHIBIOS_STM32F4xx_GCC_options.cmake b/CMake/Modules/CHIBIOS_STM32F4xx_GCC_options.cmake
@@ -46,14 +46,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/Modules/CHIBIOS_STM32F7xx_GCC_options.cmake b/CMake/Modules/CHIBIOS_STM32F7xx_GCC_options.cmake
@@ -45,14 +45,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/Modules/CHIBIOS_STM32H7xx_GCC_options.cmake b/CMake/Modules/CHIBIOS_STM32H7xx_GCC_options.cmake
@@ -47,14 +47,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/Modules/CHIBIOS_STM32L0xx_GCC_options.cmake b/CMake/Modules/CHIBIOS_STM32L0xx_GCC_options.cmake
@@ -50,14 +50,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto -fstrict-aliasing -fomit-frame-pointer -fno-unroll-loops -frounding-math -fsignaling-nans -ffloat-store -fno-math-errno -ftree-vectorize -fno-default-inline -finline-functions-called-once -fno-defer-pop ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/Modules/CHIBIOS_STM32L4xx_GCC_options.cmake b/CMake/Modules/CHIBIOS_STM32L4xx_GCC_options.cmake
@@ -46,14 +46,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -fuse-linker-plugin -Os ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/Modules/FreeRTOS_IMXRT10xx_GCC_options.cmake b/CMake/Modules/FreeRTOS_IMXRT10xx_GCC_options.cmake
@@ -47,13 +47,13 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs --specs=nosys.specs -Wl,--start-group -Xlinker --gc-sections -Xlinker --sort-section=alignment -Xlinker -print-memory-usage")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -fuse-linker-plugin -Os ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto ")
     endif()
+
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs --specs=nosys.specs -Wl,--start-group -Xlinker --gc-sections -Xlinker --sort-section=alignment -Xlinker -print-memory-usage")
       
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
diff --git a/CMake/Modules/TI_SimpleLink_CC13X2_GCC_options.cmake b/CMake/Modules/TI_SimpleLink_CC13X2_GCC_options.cmake
@@ -49,14 +49,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_link_options()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -fuse-linker-plugin -Os ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/Modules/TI_SimpleLink_CC32xx_GCC_options.cmake b/CMake/Modules/TI_SimpleLink_CC32xx_GCC_options.cmake
@@ -47,14 +47,14 @@ macro(nf_set_link_options)
         message(FATAL_ERROR "Need to set TARGET argument when calling nf_set_compile_definitions()")
     endif()
 
-    # request specs from newlib nano
-    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
-
     # set optimization linker flags for RELEASE and MinSizeRel
     if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -fuse-linker-plugin -Os ")
+        set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Os -flto ")
     endif()
 
+    # request specs from newlib nano
+    set_property(TARGET ${NFSLO_TARGET} APPEND_STRING PROPERTY LINK_FLAGS " --specs=nano.specs ")
+
     # include libraries in build
     nf_include_libraries_in_build(${NFSLO_TARGET})
 
diff --git a/CMake/binutils.ChibiOS.cmake b/CMake/binutils.ChibiOS.cmake
@@ -10,8 +10,8 @@ function(nf_set_optimization_options target)
     # debug compile options: -Og (optimize for debugging) and -ggdb (produce debug symbols specifically for gdb)
     target_compile_options(${target} PRIVATE
         $<$<CONFIG:Debug>:-Og -ggdb>
-        $<$<CONFIG:Release>:-O3>
-        $<$<CONFIG:MinSizeRel>:-Os>
+        $<$<CONFIG:Release>:-O3 -flto -ffat-lto-objects>
+        $<$<CONFIG:MinSizeRel>:-Os -flto -ffat-lto-objects>
         $<$<CONFIG:RelWithDebInfo>:-Os -ggdb>
     )
 
diff --git a/CMake/binutils.FreeRTOS.cmake b/CMake/binutils.FreeRTOS.cmake
@@ -8,8 +8,8 @@ function(nf_set_optimization_options target)
     # debug compile options: -Og (optimize for debugging) and -ggdb (produce debug symbols specifically for gdb)
     target_compile_options(${target} PRIVATE
         $<$<CONFIG:Debug>:-Og -ggdb>
-        $<$<CONFIG:Release>:-O3>
-        $<$<CONFIG:MinSizeRel>:-Os>
+        $<$<CONFIG:Release>:-O3 -flto -ffat-lto-objects>
+        $<$<CONFIG:MinSizeRel>:-Os -flto -ffat-lto-objects>
         $<$<CONFIG:RelWithDebInfo>:-Os -ggdb>
     )
 
diff --git a/CMake/binutils.TI_SimpleLink.cmake b/CMake/binutils.TI_SimpleLink.cmake
@@ -13,8 +13,8 @@ function(nf_set_optimization_options target)
     # debug compile options: -Og (optimize for debugging) and -ggdb (produce debug symbols specifically for gdb)
     target_compile_options(${target} PRIVATE
         $<$<CONFIG:Debug>:-Og -ggdb>
-        $<$<CONFIG:Release>:-O3>
-        $<$<CONFIG:MinSizeRel>:-Os>
+        $<$<CONFIG:Release>:-O3 -flto -ffat-lto-objects>
+        $<$<CONFIG:MinSizeRel>:-Os -flto -ffat-lto-objects>
         $<$<CONFIG:RelWithDebInfo>:-Os -ggdb>
     )
 
diff --git a/src/CLR/Core/CLR_RT_HeapBlock_Lock.cpp b/src/CLR/Core/CLR_RT_HeapBlock_Lock.cpp
@@ -5,6 +5,11 @@
 //
 #include "Core.h"
 
+#ifdef __GNUC__
+#pragma GCC push_options
+#pragma GCC optimize("O1")
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 HRESULT CLR_RT_HeapBlock_Lock::CreateInstance(
@@ -237,3 +242,7 @@ void CLR_RT_HeapBlock_Lock::Relocate_Owner()
 {
     NATIVE_PROFILE_CLR_CORE();
 }
+
+#ifdef __GNUC__
+#pragma GCC push_options
+#endif
diff --git a/targets/ChibiOS/ST_NUCLEO64_F091RC/CMakeLists.txt b/targets/ChibiOS/ST_NUCLEO64_F091RC/CMakeLists.txt
@@ -43,7 +43,7 @@ if(SRECORD_TOOL_AVAILABLE)
         nf_generate_bin_package(
             ${CMAKE_SOURCE_DIR}/build/${NANOBOOTER_PROJECT_NAME}.bin
             ${CMAKE_SOURCE_DIR}/build/${NANOCLR_PROJECT_NAME}.bin
-            5000
+            2800
             ${CMAKE_SOURCE_DIR}/build/nanobooter-nanoclr.bin)
     endif()
 
diff --git a/targets/ChibiOS/ST_NUCLEO64_F091RC/common/Device_BlockStorage.c b/targets/ChibiOS/ST_NUCLEO64_F091RC/common/Device_BlockStorage.c
@@ -9,13 +9,13 @@
 // 2kB block
 const BlockRange BlockRange1[] = {
     // 0x08000000 nanoBooter
-    {BlockRange_BLOCKTYPE_BOOTSTRAP, 0, 9},
+    {BlockRange_BLOCKTYPE_BOOTSTRAP, 0, 4},
 
-    // 0x08005000 nanoCLR
-    {BlockRange_BLOCKTYPE_CODE, 10, 95},
+    // 0x08002800 nanoCLR
+    {BlockRange_BLOCKTYPE_CODE, 5, 86},
 
-    // 0x08030000 deployment
-    {BlockRange_BLOCKTYPE_DEPLOYMENT, 96, 127}};
+    // 0x0802B800 deployment
+    {BlockRange_BLOCKTYPE_DEPLOYMENT, 87, 127}};
 
 const BlockRegionInfo BlockRegions[] = {
     {
diff --git a/targets/ChibiOS/ST_NUCLEO64_F091RC/nanoBooter/STM32F091xC_booter.ld b/targets/ChibiOS/ST_NUCLEO64_F091RC/nanoBooter/STM32F091xC_booter.ld
@@ -12,7 +12,7 @@
  */
 MEMORY
 {
-    flash0     (rx) : org = 0x08000000, len = 20k     /* space reserved for nanoBooter */
+    flash0     (rx) : org = 0x08000000, len = 10k     /* space reserved for nanoBooter */
     flash1     (rx) : org = 0x00000000, len = 0
     flash2     (rx) : org = 0x00000000, len = 0
     flash3     (rx) : org = 0x00000000, len = 0
diff --git a/targets/ChibiOS/ST_NUCLEO64_F091RC/nanoCLR/STM32F091xC_CLR.ld b/targets/ChibiOS/ST_NUCLEO64_F091RC/nanoCLR/STM32F091xC_CLR.ld
@@ -17,7 +17,7 @@
 
 MEMORY
 {
-    flash0     (rx) : org = 0x08005000, len = 256k - 20k - 46k   /* flash size less the space reserved for nanoBooter and application deployment*/
+    flash0     (rx) : org = 0x08002800, len = 256k - 10k - 82k   /* flash size less the space reserved for nanoBooter and application deployment*/
     flash1     (rx) : org = 0x00000000, len = 0
     flash2     (rx) : org = 0x00000000, len = 0
     flash3     (rx) : org = 0x00000000, len = 0
@@ -26,7 +26,7 @@ MEMORY
     flash6     (rx) : org = 0x00000000, len = 0
     flash7     (rx) : org = 0x00000000, len = 0
     config     (rw) : org = 0x00000000, len = 0                  /* space reserved for configuration block */
-    deployment (rx) : org = 0x08030000, len = 46k                /* space reserved for application deployment */
+    deployment (rx) : org = 0x0802B800, len = 82k                /* space reserved for application deployment */
     ramvt      (wx) : org = 0x20000000, len = 0xC0               /* initial RAM address is reserved for a copy of the vector table */
     ram0       (wx) : org = 0x200000C0, len = 32k - 0xC0 - 48    /* remaining RAM is free for use */
     ram1       (wx) : org = 0x00000000, len = 0
diff --git a/targets/ChibiOS/ST_STM32F429I_DISCOVERY/common/Device_BlockStorage.c b/targets/ChibiOS/ST_STM32F429I_DISCOVERY/common/Device_BlockStorage.c
@@ -8,8 +8,8 @@
 
 // 16kB blocks
 const BlockRange BlockRange1[] = {
-    {BlockRange_BLOCKTYPE_BOOTSTRAP, 0, 1}, // 0x08000000 nanoBooter
-    {BlockRange_BLOCKTYPE_CODE, 2, 3}       // 0x08008000 nanoCLR
+    {BlockRange_BLOCKTYPE_BOOTSTRAP, 0, 0}, // 0x08000000 nanoBooter
+    {BlockRange_BLOCKTYPE_CODE, 1, 3}       // 0x08004000 nanoCLR
 };
 
 // 64kB blocks
@@ -19,8 +19,8 @@ const BlockRange BlockRange2[] = {
 
 // 128kB blocks
 const BlockRange BlockRange3[] = {
-    {BlockRange_BLOCKTYPE_CODE, 0, 1},       // 0x08020000 nanoCLR
-    {BlockRange_BLOCKTYPE_DEPLOYMENT, 2, 6}, // 0x08060000 deployment
+    {BlockRange_BLOCKTYPE_CODE, 0, 0},       // 0x08020000 nanoCLR
+    {BlockRange_BLOCKTYPE_DEPLOYMENT, 1, 6}, // 0x08040000 deployment
 };
 
 // 16kB blocks
diff --git a/targets/ChibiOS/ST_STM32F429I_DISCOVERY/nanoBooter/STM32F429xI_booter.ld b/targets/ChibiOS/ST_STM32F429I_DISCOVERY/nanoBooter/STM32F429xI_booter.ld
diff --git a/targets/ChibiOS/ST_STM32F429I_DISCOVERY/nanoCLR/STM32F429xI_CLR.ld b/targets/ChibiOS/ST_STM32F429I_DISCOVERY/nanoCLR/STM32F429xI_CLR.ld
