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 2021/12/28 04:31:36 UTC
[incubator-nuttx] 01/02: compile/flags: add FRAME_POINTER into Toolchain.defs
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 a42aa8415dfbeb8066d456c731aa63e3187f67c5
Author: chao.an <an...@xiaomi.com>
AuthorDate: Mon Dec 27 12:13:48 2021 +0800
compile/flags: add FRAME_POINTER into Toolchain.defs
Signed-off-by: chao.an <an...@xiaomi.com>
---
Kconfig | 8 ++++++++
arch/arm/src/arm/Toolchain.defs | 6 ++++++
arch/arm/src/armv6-m/Toolchain.defs | 6 ++++++
arch/arm/src/armv7-a/Toolchain.defs | 6 ++++++
arch/arm/src/armv7-m/Toolchain.defs | 6 ++++++
arch/arm/src/armv7-r/Toolchain.defs | 6 ++++++
arch/arm/src/armv8-m/Toolchain.defs | 6 ++++++
arch/arm/src/rtl8720c/Toolchain.defs | 2 +-
arch/mips/src/mips32/Toolchain.defs | 6 ++++++
arch/risc-v/src/rv32im/Toolchain.defs | 6 ++++++
arch/risc-v/src/rv64gc/Toolchain.defs | 6 ++++++
arch/sim/Kconfig | 3 ++-
arch/xtensa/src/lx6/Toolchain.defs | 6 ++++++
arch/xtensa/src/lx7/Toolchain.defs | 7 ++++++-
14 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/Kconfig b/Kconfig
index e0c25e2..4a79672 100644
--- a/Kconfig
+++ b/Kconfig
@@ -1919,6 +1919,14 @@ config DEBUG_SYMBOLS
---help---
Build with debug symbols (needed for use with a debugger).
+config FRAME_POINTER
+ bool "Compile the NuttX with frame pointers"
+ default n
+ ---help---
+ If you say Y here the resulting NuttX image will be slightly
+ larger and slower, but it gives very useful debugging information
+ in case of bugs.
+
endmenu # Debug Options
config ARCH_HAVE_CUSTOMOPT
diff --git a/arch/arm/src/arm/Toolchain.defs b/arch/arm/src/arm/Toolchain.defs
index 4d2bf17..251a7b0 100644
--- a/arch/arm/src/arm/Toolchain.defs
+++ b/arch/arm/src/arm/Toolchain.defs
@@ -67,6 +67,12 @@ else
MAXOPTIMIZATION ?= -Os
endif
+ifeq ($(CONFIG_FRAME_POINTER),y)
+ MAXOPTIMIZATION += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+ MAXOPTIMIZATION += -fomit-frame-pointer
+endif
+
# NuttX buildroot under Linux or Cygwin
ifeq ($(CONFIG_ARM_TOOLCHAIN),BUILDROOT)
diff --git a/arch/arm/src/armv6-m/Toolchain.defs b/arch/arm/src/armv6-m/Toolchain.defs
index 4880564..7cd8874 100644
--- a/arch/arm/src/armv6-m/Toolchain.defs
+++ b/arch/arm/src/armv6-m/Toolchain.defs
@@ -61,6 +61,12 @@ else
MAXOPTIMIZATION ?= -Os
endif
+ifeq ($(CONFIG_FRAME_POINTER),y)
+ MAXOPTIMIZATION += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+ MAXOPTIMIZATION += -fomit-frame-pointer
+endif
+
# NuttX buildroot under Linux or Cygwin
ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),BUILDROOT)
diff --git a/arch/arm/src/armv7-a/Toolchain.defs b/arch/arm/src/armv7-a/Toolchain.defs
index ced1d0d..215d646 100644
--- a/arch/arm/src/armv7-a/Toolchain.defs
+++ b/arch/arm/src/armv7-a/Toolchain.defs
@@ -79,6 +79,12 @@ else
MAXOPTIMIZATION ?= -Os
endif
+ifeq ($(CONFIG_FRAME_POINTER),y)
+ MAXOPTIMIZATION += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+ MAXOPTIMIZATION += -fomit-frame-pointer
+endif
+
ifeq ($(CONFIG_ENDIAN_BIG),y)
TARGET_ARCH := armeb
else
diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs
index 58b5207..b63e6dd 100644
--- a/arch/arm/src/armv7-m/Toolchain.defs
+++ b/arch/arm/src/armv7-m/Toolchain.defs
@@ -75,6 +75,12 @@ else
MAXOPTIMIZATION ?= -Os
endif
+ifeq ($(CONFIG_FRAME_POINTER),y)
+ MAXOPTIMIZATION += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+ MAXOPTIMIZATION += -fomit-frame-pointer
+endif
+
# Parametrization for ARCHCPUFLAGS
ifeq ($(CONFIG_ARCH_CORTEXM4),y)
diff --git a/arch/arm/src/armv7-r/Toolchain.defs b/arch/arm/src/armv7-r/Toolchain.defs
index 4af6d18..d0df68d 100644
--- a/arch/arm/src/armv7-r/Toolchain.defs
+++ b/arch/arm/src/armv7-r/Toolchain.defs
@@ -61,6 +61,12 @@ else
MAXOPTIMIZATION ?= -Os
endif
+ifeq ($(CONFIG_FRAME_POINTER),y)
+ MAXOPTIMIZATION += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+ MAXOPTIMIZATION += -fomit-frame-pointer
+endif
+
ifeq ($(CONFIG_ENDIAN_BIG),y)
TARGET_ARCH := armeb
else
diff --git a/arch/arm/src/armv8-m/Toolchain.defs b/arch/arm/src/armv8-m/Toolchain.defs
index aa0df4f..58df2f5 100644
--- a/arch/arm/src/armv8-m/Toolchain.defs
+++ b/arch/arm/src/armv8-m/Toolchain.defs
@@ -75,6 +75,12 @@ else
MAXOPTIMIZATION ?= -Os
endif
+ifeq ($(CONFIG_FRAME_POINTER),y)
+ MAXOPTIMIZATION += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+ MAXOPTIMIZATION += -fomit-frame-pointer
+endif
+
# Parametrization for ARCHCPUFLAGS
ifeq ($(CONFIG_ARCH_CORTEXM23),y)
TOOLCHAIN_MTUNE := -mtune=cortex-m23
diff --git a/arch/arm/src/rtl8720c/Toolchain.defs b/arch/arm/src/rtl8720c/Toolchain.defs
index 9be75a7..0c8bba6 100644
--- a/arch/arm/src/rtl8720c/Toolchain.defs
+++ b/arch/arm/src/rtl8720c/Toolchain.defs
@@ -43,7 +43,7 @@ ifeq ($(CONFIG_STACK_CANARIES),y)
endif
ifneq ($(CONFIG_DEBUG_NOOPT),y)
- ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+ ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce
ARCHOPTIMIZATION += -ffunction-sections -fdata-sections
ifneq ($(CONFIG_ARMV8M_STACKCHECK),y)
#ARCHOPTIMIZATION += -flto -fuse-linker-plugin
diff --git a/arch/mips/src/mips32/Toolchain.defs b/arch/mips/src/mips32/Toolchain.defs
index c148e57..5512d2b 100644
--- a/arch/mips/src/mips32/Toolchain.defs
+++ b/arch/mips/src/mips32/Toolchain.defs
@@ -259,6 +259,12 @@ ifeq ($(CONFIG_MIPS32_TOOLCHAIN),PINGUINOW)
LDSCRIPT = mips-elf-debug.ld
endif
+ifeq ($(CONFIG_FRAME_POINTER),y)
+ MAXOPTIMIZATION += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+ MAXOPTIMIZATION += -fomit-frame-pointer
+endif
+
# Default toolchain
CC = $(CROSSDEV)gcc
diff --git a/arch/risc-v/src/rv32im/Toolchain.defs b/arch/risc-v/src/rv32im/Toolchain.defs
index 9283a55..d3d628d 100644
--- a/arch/risc-v/src/rv32im/Toolchain.defs
+++ b/arch/risc-v/src/rv32im/Toolchain.defs
@@ -53,6 +53,12 @@ else
MAXOPTIMIZATION ?= -Os
endif
+ifeq ($(CONFIG_FRAME_POINTER),y)
+ MAXOPTIMIZATION += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+ MAXOPTIMIZATION += -fomit-frame-pointer
+endif
+
# Generic GNU RVG toolchain
ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG)
diff --git a/arch/risc-v/src/rv64gc/Toolchain.defs b/arch/risc-v/src/rv64gc/Toolchain.defs
index 07e659a..4217ec3 100644
--- a/arch/risc-v/src/rv64gc/Toolchain.defs
+++ b/arch/risc-v/src/rv64gc/Toolchain.defs
@@ -53,6 +53,12 @@ else
MAXOPTIMIZATION ?= -Os
endif
+ifeq ($(CONFIG_FRAME_POINTER),y)
+ MAXOPTIMIZATION += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+ MAXOPTIMIZATION += -fomit-frame-pointer
+endif
+
# Generic GNU RVG toolchain
ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG)
diff --git a/arch/sim/Kconfig b/arch/sim/Kconfig
index f5d29e3..617a849 100644
--- a/arch/sim/Kconfig
+++ b/arch/sim/Kconfig
@@ -61,7 +61,7 @@ config SIM_CYGWIN_DECORATED
config SIM_ASAN
bool "Address Sanitizer"
default n
- depends on MM_CUSTOMIZE_MANAGER
+ depends on MM_CUSTOMIZE_MANAGER && FRAME_POINTER
---help---
AddressSanitizer (ASan) is a fast compiler-based tool for detecting memory
bugs in native code.
@@ -69,6 +69,7 @@ config SIM_ASAN
config SIM_UBSAN
bool "Undefined Behaviour Sanitizer"
default n
+ depends on FRAME_POINTER
---help---
Compile-time instrumentation is used to detect various undefined behaviours
at runtime.
diff --git a/arch/xtensa/src/lx6/Toolchain.defs b/arch/xtensa/src/lx6/Toolchain.defs
index 0a99d7f..d5e767a 100644
--- a/arch/xtensa/src/lx6/Toolchain.defs
+++ b/arch/xtensa/src/lx6/Toolchain.defs
@@ -49,6 +49,12 @@ else
MAXOPTIMIZATION ?= -Os
endif
+ifeq ($(CONFIG_FRAME_POINTER),y)
+ MAXOPTIMIZATION += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+ MAXOPTIMIZATION += -fomit-frame-pointer
+endif
+
# Default toolchain
ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCC), y)
CC = $(CROSSDEV)xcc
diff --git a/arch/xtensa/src/lx7/Toolchain.defs b/arch/xtensa/src/lx7/Toolchain.defs
index 1c39d64..e36bf8f 100644
--- a/arch/xtensa/src/lx7/Toolchain.defs
+++ b/arch/xtensa/src/lx7/Toolchain.defs
@@ -29,7 +29,6 @@
# reliable code generation.
#
-
ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCC), y)
CROSSDEV = xt-
endif
@@ -50,6 +49,12 @@ else
MAXOPTIMIZATION := -Os
endif
+ifeq ($(CONFIG_FRAME_POINTER),y)
+ MAXOPTIMIZATION += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+else
+ MAXOPTIMIZATION += -fomit-frame-pointer
+endif
+
# Default toolchain
ifeq ($(CONFIG_XTENSA_TOOLCHAIN_XCC), y)
CC = $(CROSSDEV)xcc