diff --git a/arch/arm/src/cmake/gcc.cmake b/arch/arm/src/cmake/gcc.cmake index 573f7538f4..c003345857 100644 --- a/arch/arm/src/cmake/gcc.cmake +++ b/arch/arm/src/cmake/gcc.cmake @@ -65,6 +65,7 @@ if(CONFIG_ARCH_TOOLCHAIN_GNU AND NOT CONFIG_ARCH_TOOLCHAIN_CLANG) set(GCCVER ${CMAKE_MATCH_1}) if(GCCVER GREATER_EQUAL 12) + add_link_options(-Wl,--print-memory-usage) add_compile_options(--param=min-pagesize=0) if(CONFIG_ARCH_RAMFUNCS OR NOT CONFIG_BOOT_RUNFROMFLASH) add_link_options(-Wl,--no-warn-rwx-segments) @@ -229,8 +230,6 @@ if(CONFIG_DEBUG_LINK_MAP) add_link_options(-Wl,--cref -Wl,-Map=nuttx.map) endif() -add_link_options(-Wl,--print-memory-usage) - if(CONFIG_DEBUG_SYMBOLS) add_compile_options(${CONFIG_DEBUG_SYMBOLS_LEVEL}) endif() diff --git a/arch/arm/src/common/Toolchain.defs b/arch/arm/src/common/Toolchain.defs index 65dd1d27fa..ba571237ad 100644 --- a/arch/arm/src/common/Toolchain.defs +++ b/arch/arm/src/common/Toolchain.defs @@ -318,6 +318,7 @@ else endif ifeq ($(shell expr "$(GCCVER)" \>= 12), 1) ARCHOPTIMIZATION += --param=min-pagesize=0 + LDFLAGS += --print-memory-usage ifeq ($(CONFIG_ARCH_RAMFUNCS),y) LDFLAGS += --no-warn-rwx-segments else ifeq ($(CONFIG_BOOT_RUNFROMFLASH),) @@ -328,8 +329,6 @@ else endif LDFLAGS += --entry=__start - LDFLAGS += --print-memory-usage - endif ifeq ($(CONFIG_ARCH_TOOLCHAIN_CLANG),y) diff --git a/arch/arm64/src/Toolchain.defs b/arch/arm64/src/Toolchain.defs index 1c80759c1e..aa94a21572 100644 --- a/arch/arm64/src/Toolchain.defs +++ b/arch/arm64/src/Toolchain.defs @@ -197,6 +197,8 @@ ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) LDFLAGS += --no-warn-rwx-segments endif + endif + ifeq ($(shell expr "$(GCCVER)" \>= 12), 1) LDFLAGS += --print-memory-usage endif endif diff --git a/arch/arm64/src/cmake/Toolchain.cmake b/arch/arm64/src/cmake/Toolchain.cmake index 1fadb3f1f3..e3f5ad69c7 100644 --- a/arch/arm64/src/cmake/Toolchain.cmake +++ b/arch/arm64/src/cmake/Toolchain.cmake @@ -198,8 +198,8 @@ if(CONFIG_ARCH_TOOLCHAIN_GNU AND NOT CONFIG_ARCH_TOOLCHAIN_CLANG) set(GCCVER ${CMAKE_MATCH_1}) endif() if(GCCVER GREATER_EQUAL 12) + add_link_options(-Wl,--print-memory-usage) add_link_options(-Wl,--no-warn-rwx-segments) endif() - add_link_options(-Wl,--print-memory-usage) endif()