More separation of debug symbols and optimization selections

2013-12-20 12:36:02 -06:00 · 2013-12-20 12:36:02 -06:00 · a4e72dec0e
commit a4e72dec0e
parent 434dab59dc
32 changed files with 141 additions and 83 deletions
--- a/arch/avr/src/avr32/Toolchain.defs
+++ b/arch/avr/src/avr32/Toolchain.defs
@ -66,3 +66,4 @@ ifeq ($(CONFIG_AVR32_TOOLCHAIN),AVRTOOLSW)
 else
  # AVR Tools or avr32-toolchain from https://github.com/jsnyder/avr32-toolchain
 endif
+
--- a/configs/avr32dev1/nsh/Make.defs
+++ b/configs/avr32dev1/nsh/Make.defs
@ -66,9 +66,11 @@ ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gc
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -g
-else
-  ARCHOPTIMIZATION = -Os -ffunction-sections -fdata-sections -fno-strict-aliasing
+  ARCHOPTIMIZATION	= -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -Os -ffunction-sections -fdata-sections -fno-strict-aliasing
 endif

 ARCHCFLAGS = -fno-builtin -muse-rodata-section
--- a/configs/avr32dev1/ostest/Make.defs
+++ b/configs/avr32dev1/ostest/Make.defs
@ -35,6 +35,7 @@

 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/avr/src/avr32/Toolchain.defs

 # Setup for the selected toolchain

@ -79,9 +80,11 @@ ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gc
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -g
-else
-  ARCHOPTIMIZATION = -Os -ffunction-sections -fdata-sections -fno-strict-aliasing
+  ARCHOPTIMIZATION	= -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -Os -ffunction-sections -fdata-sections -fno-strict-aliasing
 endif

 ARCHCFLAGS = -fno-builtin -muse-rodata-section
--- a/configs/c5471evm/httpd/Make.defs
+++ b/configs/c5471evm/httpd/Make.defs
@ -35,6 +35,7 @@

 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs

 CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
@ -50,9 +51,10 @@ ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-			  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ifeq ($(ARCHCCMAJOR),4)
--- a/configs/c5471evm/nettest/Make.defs
+++ b/configs/c5471evm/nettest/Make.defs
@ -35,6 +35,7 @@

 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs

 CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
@ -50,9 +51,10 @@ ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-			  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ifeq ($(ARCHCCMAJOR),4)
--- a/configs/c5471evm/nsh/Make.defs
+++ b/configs/c5471evm/nsh/Make.defs
@ -35,6 +35,7 @@

 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs

 CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
@ -50,9 +51,10 @@ ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-			  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ifeq ($(ARCHCCMAJOR),4)
--- a/configs/c5471evm/ostest/Make.defs
+++ b/configs/c5471evm/ostest/Make.defs
@ -35,6 +35,7 @@

 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs

 CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
@ -50,9 +51,10 @@ ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-			  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ifeq ($(ARCHCCMAJOR),4)
--- a/configs/compal_e86/nsh_highram/Make.defs
+++ b/configs/compal_e86/nsh_highram/Make.defs
@ -87,10 +87,12 @@ OBJDUMP = $(CROSSDEV)objdump
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
-  ARCHOPTIMIZATION = -g
-else
-  ARCHOPTIMIZATION = $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  ARCHOPTIMIZATION	= -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ifeq ($(ARCHCCMAJOR),4)
--- a/configs/compal_e88/nsh_highram/Make.defs
+++ b/configs/compal_e88/nsh_highram/Make.defs
@ -35,6 +35,7 @@

 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs

 ifeq ("${CONFIG_SERCOMM_CONSOLE}","y")
 OSMODIR			= $(TOPDIR)/../../osmocom-bb
@ -59,9 +60,10 @@ ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-			  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ifeq ($(ARCHCCMAJOR),4)
--- a/configs/compal_e99/nsh_compalram/Make.defs
+++ b/configs/compal_e99/nsh_compalram/Make.defs
@ -35,6 +35,7 @@

 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs

 ifeq ("${CONFIG_SERCOMM_CONSOLE}","y")
 OSMODIR			= $(TOPDIR)/../../osmocom-bb
@ -59,9 +60,10 @@ ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-			  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ifeq ($(ARCHCCMAJOR),4)
--- a/configs/compal_e99/nsh_highram/Make.defs
+++ b/configs/compal_e99/nsh_highram/Make.defs
@ -35,6 +35,7 @@

 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs

 ifeq ("${CONFIG_SERCOMM_CONSOLE}","y")
 OSMODIR			= $(TOPDIR)/../../osmocom-bb
@ -59,9 +60,10 @@ ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-			  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ifeq ($(ARCHCCMAJOR),4)
--- a/configs/m68332evb/Make.defs
+++ b/configs/m68332evb/Make.defs
@ -38,9 +38,10 @@ include ${TOPDIR}/tools/Config.mk

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-			  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -Os -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ARCHCPUFLAGS		= -m68332 -mcpu32
@ -72,7 +73,6 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  LDFLAGS		+= -g
 endif

-
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh

 HOSTCC			= gcc
--- a/configs/mx1ads/ostest/Make.defs
+++ b/configs/mx1ads/ostest/Make.defs
@ -35,6 +35,7 @@

 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs

 CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
@ -56,9 +57,10 @@ ARCHWARNINGSXX		= -Wall -Wshadow

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-			  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ifeq ($(ARCHCCMAJOR),4)
--- a/configs/pirelli_dpl10/nsh_highram/Make.defs
+++ b/configs/pirelli_dpl10/nsh_highram/Make.defs
@ -57,11 +57,12 @@ OBJDUMP		= $(CROSSDEV)objdump
 ARCHCCVERSION	= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-					  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ifeq ($(ARCHCCMAJOR),4)
--- a/configs/sim/configdata/Make.defs
+++ b/configs/sim/configdata/Make.defs
@ -40,8 +40,10 @@ HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION = -g
-else
-  ARCHOPTIMIZATION = -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -O2
 endif

 ARCHCPUFLAGS = -fno-builtin
--- a/configs/sim/cxxtest/Make.defs
+++ b/configs/sim/cxxtest/Make.defs
@ -40,8 +40,10 @@ HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION = -g
-else
-  ARCHOPTIMIZATION = -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -O2
 endif

 ARCHCPUFLAGS = -fno-builtin
--- a/configs/sim/mount/Make.defs
+++ b/configs/sim/mount/Make.defs
@ -40,8 +40,10 @@ HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS		= -fno-builtin
--- a/configs/sim/mtdpart/Make.defs
+++ b/configs/sim/mtdpart/Make.defs
@ -40,8 +40,10 @@ HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS		= -fno-builtin
--- a/configs/sim/nettest/Make.defs
+++ b/configs/sim/nettest/Make.defs
@ -40,8 +40,10 @@ HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS		= -fno-builtin
--- a/configs/sim/nsh/Make.defs
+++ b/configs/sim/nsh/Make.defs
@ -40,8 +40,10 @@ HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS		= -fno-builtin
--- a/configs/sim/nsh2/Make.defs
+++ b/configs/sim/nsh2/Make.defs
@ -40,8 +40,10 @@ HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS		= -fno-builtin
--- a/configs/sim/nx/Make.defs
+++ b/configs/sim/nx/Make.defs
@ -40,8 +40,10 @@ HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS		= -fno-builtin
--- a/configs/sim/nx11/Make.defs
+++ b/configs/sim/nx11/Make.defs
@ -40,8 +40,10 @@ HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS		= -fno-builtin
--- a/configs/sim/nxffs/Make.defs
+++ b/configs/sim/nxffs/Make.defs
@ -40,8 +40,10 @@ HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS		= -fno-builtin
--- a/configs/sim/nxlines/Make.defs
+++ b/configs/sim/nxlines/Make.defs
@ -39,9 +39,11 @@ include ${TOPDIR}/tools/Config.mk
 HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -g
-else
-  ARCHOPTIMIZATION = -O2
+  ARCHOPTIMIZATION	= -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS = -fno-builtin
--- a/configs/sim/nxwm/Make.defs
+++ b/configs/sim/nxwm/Make.defs
@ -40,8 +40,10 @@ HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS		= -fno-builtin
--- a/configs/sim/ostest/Make.defs
+++ b/configs/sim/ostest/Make.defs
@ -39,9 +39,11 @@ include ${TOPDIR}/tools/Config.mk
 HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -g
-else
-  ARCHOPTIMIZATION = -O2
+  ARCHOPTIMIZATION	= -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS = -fno-builtin
--- a/configs/sim/pashello/Make.defs
+++ b/configs/sim/pashello/Make.defs
@ -40,8 +40,10 @@ HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS		= -fno-builtin
--- a/configs/sim/touchscreen/Make.defs
+++ b/configs/sim/touchscreen/Make.defs
@ -40,8 +40,10 @@ HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -O2
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -O2
 endif

 ARCHCPUFLAGS		= -fno-builtin
--- a/configs/skp16c26/ostest/Make.defs
+++ b/configs/skp16c26/ostest/Make.defs
@ -50,8 +50,10 @@ ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -Os -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ARCHCPUFLAGS		= -mcpu=m16c -fno-builtin
@ -74,7 +76,6 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  LDFLAGS		+= -g
 endif

-
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh

 HOSTCC			= gcc
--- a/configs/us7032evb1/nsh/Make.defs
+++ b/configs/us7032evb1/nsh/Make.defs
@ -38,9 +38,10 @@ include ${TOPDIR}/tools/Config.mk

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-			  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -Os -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ARCHCPUFLAGS		= -m1 -fno-builtin
--- a/configs/us7032evb1/ostest/Make.defs
+++ b/configs/us7032evb1/ostest/Make.defs
@ -38,9 +38,10 @@ include ${TOPDIR}/tools/Config.mk

 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
  ARCHOPTIMIZATION	= -g
-else
-  ARCHOPTIMIZATION	= -Os -fno-strict-aliasing -fno-strength-reduce \
-			  -fomit-frame-pointer
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION	+= -Os -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif

 ARCHCPUFLAGS		= -m1 -fno-builtin