You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/05/20 16:03:13 UTC

[incubator-nuttx] branch master updated (f2bc4555bb -> 2f03b42bfc)

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


    from f2bc4555bb kmalloc.h: Add kmm_heapmember for !CONFIG_MM_KERNEL_HEAP case
     new a74c707da6 arch: arm: armv6-m: fix LTO build
     new 2f03b42bfc boards: arm: kl: keep cfmconfig sections in linker script

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 arch/arm/src/armv6-m/Toolchain.defs                  | 20 +++++++++++++++++---
 boards/arm/kl/freedom-kl25z/scripts/freedom-kl25z.ld |  2 +-
 boards/arm/kl/freedom-kl26z/scripts/freedom-kl26z.ld |  2 +-
 boards/arm/kl/teensy-lc/scripts/teensy-lc.ld         |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)


[incubator-nuttx] 02/02: boards: arm: kl: keep cfmconfig sections in linker script

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 2f03b42bfc234e211e13eed3df3ea87a40833b07
Author: Karel Kočí <ka...@nic.cz>
AuthorDate: Fri May 20 11:44:05 2022 +0200

    boards: arm: kl: keep cfmconfig sections in linker script
    
    This makes sure that this section is present even if LTO is enabled.
---
 boards/arm/kl/freedom-kl25z/scripts/freedom-kl25z.ld | 2 +-
 boards/arm/kl/freedom-kl26z/scripts/freedom-kl26z.ld | 2 +-
 boards/arm/kl/teensy-lc/scripts/teensy-lc.ld         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boards/arm/kl/freedom-kl25z/scripts/freedom-kl25z.ld b/boards/arm/kl/freedom-kl25z/scripts/freedom-kl25z.ld
index 165055ea3e..5f59ac0c1b 100644
--- a/boards/arm/kl/freedom-kl25z/scripts/freedom-kl25z.ld
+++ b/boards/arm/kl/freedom-kl25z/scripts/freedom-kl25z.ld
@@ -43,7 +43,7 @@ SECTIONS
     } > vectflash
 
     .cfmprotect : {
-        *(.cfmconfig)
+        KEEP(*(.cfmconfig))
     } > cfmprotect
 
     .text : {
diff --git a/boards/arm/kl/freedom-kl26z/scripts/freedom-kl26z.ld b/boards/arm/kl/freedom-kl26z/scripts/freedom-kl26z.ld
index fd1d583bc0..9d89206883 100644
--- a/boards/arm/kl/freedom-kl26z/scripts/freedom-kl26z.ld
+++ b/boards/arm/kl/freedom-kl26z/scripts/freedom-kl26z.ld
@@ -43,7 +43,7 @@ SECTIONS
     } > vectflash
 
     .cfmprotect : {
-        *(.cfmconfig)
+        KEEP(*(.cfmconfig))
     } > cfmprotect
 
     .text : {
diff --git a/boards/arm/kl/teensy-lc/scripts/teensy-lc.ld b/boards/arm/kl/teensy-lc/scripts/teensy-lc.ld
index 1a922110d0..074acc2cd4 100644
--- a/boards/arm/kl/teensy-lc/scripts/teensy-lc.ld
+++ b/boards/arm/kl/teensy-lc/scripts/teensy-lc.ld
@@ -43,7 +43,7 @@ SECTIONS
     } > vectflash
 
     .cfmprotect : {
-        *(.cfmconfig)
+        KEEP(*(.cfmconfig))
     } > cfmprotect
 
     .text : {


[incubator-nuttx] 01/02: arch: arm: armv6-m: fix LTO build

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit a74c707da651ffb357d24a6e90e46706024f2a9b
Author: Karel Kočí <ka...@nic.cz>
AuthorDate: Fri May 20 11:37:25 2022 +0200

    arch: arm: armv6-m: fix LTO build
    
    This imports changes from armv7-m.
---
 arch/arm/src/armv6-m/Toolchain.defs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/arch/arm/src/armv6-m/Toolchain.defs b/arch/arm/src/armv6-m/Toolchain.defs
index 8679684d29..400a3ec376 100644
--- a/arch/arm/src/armv6-m/Toolchain.defs
+++ b/arch/arm/src/armv6-m/Toolchain.defs
@@ -100,6 +100,9 @@ ifeq ($(CONFIG_LTO_THIN),y)
   ARCHOPTIMIZATION += -flto=thin
 else ifeq ($(CONFIG_LTO_FULL),y)
   ARCHOPTIMIZATION += -flto
+  ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),GNU_EABI)
+    ARCHOPTIMIZATION += -fuse-linker-plugin
+  endif
 endif
 
 # NuttX buildroot under Linux or Cygwin
@@ -143,12 +146,21 @@ else
   CC      = $(CROSSDEV)gcc
   CXX     = $(CROSSDEV)g++
   CPP     = $(CROSSDEV)gcc -E -P -x c
-  LD      = $(CROSSDEV)ld
   STRIP   = $(CROSSDEV)strip --strip-unneeded
-  AR      = $(CROSSDEV)ar rcs
-  NM      = $(CROSSDEV)nm
   OBJCOPY = $(CROSSDEV)objcopy
   OBJDUMP = $(CROSSDEV)objdump
+  LD      = $(CROSSDEV)ld
+  AR      = $(CROSSDEV)ar rcs
+  NM      = $(CROSSDEV)nm
+
+  ifeq ($(CONFIG_LTO_FULL),y)
+    ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),GNU_EABI)
+      LD := $(CROSSDEV)gcc
+      AR := $(CROSSDEV)gcc-ar rcs
+      NM := $(CROSSDEV)gcc-nm
+      ARCHOPTIMIZATION += -fno-builtin
+    endif
+  endif
 endif
 
 # Architecture flags
@@ -171,6 +183,8 @@ ifneq ($(CONFIG_CXX_RTTI),y)
   ARCHCXXFLAGS += -fno-rtti
 endif
 
+LDFLAGS += -nostdlib
+
 # Optimization of unused sections
 
 ifeq ($(CONFIG_DEBUG_OPT_UNUSED_SECTIONS),y)