diff --git a/bsp/cmake/SetLinkerOptions.cmake b/bsp/cmake/SetLinkerOptions.cmake
index f88c9e41..e272f6e3 100644
--- a/bsp/cmake/SetLinkerOptions.cmake
+++ b/bsp/cmake/SetLinkerOptions.cmake
@@ -9,7 +9,7 @@ macro(set_linker_script executable_target)
             PRIVATE
                 $<$<STREQUAL:${ARM_CORSTONE_BSP_TARGET_PLATFORM},corstone300>:-T ${IOT_REFERENCE_ARM_CORSTONE3XX_SOURCE_DIR}/bsp/corstone300/an552_ns.ld>
                 $<$<STREQUAL:${ARM_CORSTONE_BSP_TARGET_PLATFORM},corstone310>:-T ${IOT_REFERENCE_ARM_CORSTONE3XX_SOURCE_DIR}/bsp/corstone310/an555_ns.ld>
-                -Wl,--gc-sections
+                -Wl,--gc-sections,-Map=${executable_target}.map
                 --specs=nosys.specs
         )
     else()
diff --git a/release_changes/202401101603.change b/release_changes/202401101603.change
new file mode 100644
index 00000000..be842a0a
--- /dev/null
+++ b/release_changes/202401101603.change
@@ -0,0 +1 @@
+gnu-compiler: Generate map file