From a58f1bcbec216b143bdc40fe36af7aea5562ac4d Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 20 Dec 2013 11:43:02 -0600
Subject: [PATCH] Beginning separation of debug symbols and optimization
 selections

---
 Kconfig                                    | 11 +++++++++--
 configs/ez80f910200kitg/ostest/Make.defs   | 10 ++++++++--
 configs/ez80f910200zco/dhcpd/Make.defs     | 10 ++++++++--
 configs/ez80f910200zco/httpd/Make.defs     | 10 ++++++++--
 configs/ez80f910200zco/nettest/Make.defs   | 10 ++++++++--
 configs/ez80f910200zco/nsh/Make.defs       | 10 ++++++++--
 configs/ez80f910200zco/ostest/Make.defs    | 10 ++++++++--
 configs/ez80f910200zco/poll/Make.defs      | 10 ++++++++--
 configs/z16f2800100zcog/ostest/Make.defs   | 10 ++++++++--
 configs/z16f2800100zcog/pashello/Make.defs | 10 ++++++++--
 configs/z8encore000zco/ostest/Make.defs    | 10 ++++++++--
 configs/z8f64200100kit/ostest/Make.defs    | 10 ++++++++--
 12 files changed, 97 insertions(+), 24 deletions(-)

diff --git a/Kconfig b/Kconfig
index 3b588dd9660..beb02405dd5 100644
--- a/Kconfig
+++ b/Kconfig
@@ -566,8 +566,15 @@ config DEBUG_SYMBOLS
 	bool "Generate Debug Symbols"
 	default n
 	---help---
-		Build without optimization and with debug symbols (needed
-		for use with a debugger).
+		Build with debug symbols (needed for use with a debugger).
+
+config DEBUG_NOOPT
+	bool "Suppress optimization"
+	default y if DEBUG_SYMBOLS
+	default n if !DEBUG_SYMBOLS
+	---help---
+		Build without optimization.  This is often helpful when debugging code.
+
 endmenu
 endmenu
 
diff --git a/configs/ez80f910200kitg/ostest/Make.defs b/configs/ez80f910200kitg/ostest/Make.defs
index f4fc1975ebb..ae19306e244 100644
--- a/configs/ez80f910200kitg/ostest/Make.defs
+++ b/configs/ez80f910200kitg/ostest/Make.defs
@@ -118,9 +118,15 @@ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS)
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -debug -reduceopt
+  ARCHOPTIMIZATION = -debug
 else
-  ARCHOPTIMIZATION = -nodebug -optsize
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -reduceopt
+else
+  ARCHOPTIMIZATION += -optsize
 endif
 
 ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
diff --git a/configs/ez80f910200zco/dhcpd/Make.defs b/configs/ez80f910200zco/dhcpd/Make.defs
index 42066d9a295..6a036b4a1e7 100644
--- a/configs/ez80f910200zco/dhcpd/Make.defs
+++ b/configs/ez80f910200zco/dhcpd/Make.defs
@@ -118,9 +118,15 @@ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS)
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -debug -reduceopt
+  ARCHOPTIMIZATION = -debug
 else
-  ARCHOPTIMIZATION = -nodebug -optsize
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -reduceopt
+else
+  ARCHOPTIMIZATION += -optsize
 endif
 
 ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
diff --git a/configs/ez80f910200zco/httpd/Make.defs b/configs/ez80f910200zco/httpd/Make.defs
index ed87a37ec68..81063778d70 100644
--- a/configs/ez80f910200zco/httpd/Make.defs
+++ b/configs/ez80f910200zco/httpd/Make.defs
@@ -118,9 +118,15 @@ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS)
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -debug -reduceopt
+  ARCHOPTIMIZATION = -debug
 else
-  ARCHOPTIMIZATION = -nodebug -optsize
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -reduceopt
+else
+  ARCHOPTIMIZATION += -optsize
 endif
 
 ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
diff --git a/configs/ez80f910200zco/nettest/Make.defs b/configs/ez80f910200zco/nettest/Make.defs
index f6db2f84abd..f5f1e4c0f4f 100644
--- a/configs/ez80f910200zco/nettest/Make.defs
+++ b/configs/ez80f910200zco/nettest/Make.defs
@@ -118,9 +118,15 @@ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS)
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -debug -reduceopt
+  ARCHOPTIMIZATION = -debug
 else
-  ARCHOPTIMIZATION = -nodebug -optsize
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -reduceopt
+else
+  ARCHOPTIMIZATION += -optsize
 endif
 
 ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
diff --git a/configs/ez80f910200zco/nsh/Make.defs b/configs/ez80f910200zco/nsh/Make.defs
index f8a79c7eb21..f8c540c9bea 100644
--- a/configs/ez80f910200zco/nsh/Make.defs
+++ b/configs/ez80f910200zco/nsh/Make.defs
@@ -118,9 +118,15 @@ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS)
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -debug -reduceopt
+  ARCHOPTIMIZATION = -debug
 else
-  ARCHOPTIMIZATION = -nodebug -optsize
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -reduceopt
+else
+  ARCHOPTIMIZATION += -optsize
 endif
 
 ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
diff --git a/configs/ez80f910200zco/ostest/Make.defs b/configs/ez80f910200zco/ostest/Make.defs
index ae963a36fed..b83e6460372 100644
--- a/configs/ez80f910200zco/ostest/Make.defs
+++ b/configs/ez80f910200zco/ostest/Make.defs
@@ -118,9 +118,15 @@ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS)
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -debug -reduceopt
+  ARCHOPTIMIZATION = -debug
 else
-  ARCHOPTIMIZATION = -nodebug -optsize
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -reduceopt
+else
+  ARCHOPTIMIZATION += -optsize
 endif
 
 ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
diff --git a/configs/ez80f910200zco/poll/Make.defs b/configs/ez80f910200zco/poll/Make.defs
index 920696b3c3b..6fbcaf900b3 100644
--- a/configs/ez80f910200zco/poll/Make.defs
+++ b/configs/ez80f910200zco/poll/Make.defs
@@ -118,9 +118,15 @@ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS)
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -debug -reduceopt
+  ARCHOPTIMIZATION = -debug
 else
-  ARCHOPTIMIZATION = -nodebug -optsize
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -reduceopt
+else
+  ARCHOPTIMIZATION += -optsize
 endif
 
 ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
diff --git a/configs/z16f2800100zcog/ostest/Make.defs b/configs/z16f2800100zcog/ostest/Make.defs
index 5d8e964ef62..1b552f9609a 100644
--- a/configs/z16f2800100zcog/ostest/Make.defs
+++ b/configs/z16f2800100zcog/ostest/Make.defs
@@ -112,9 +112,15 @@ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS)
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -debug -NOregvar -reduceopt
+  ARCHOPTIMIZATION = -debug
 else
-  ARCHOPTIMIZATION = -nodebug -regvar
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -NOregvar -reduceopt
+else
+  ARCHOPTIMIZATION += -regvar
 endif
 
 ARCHCPUFLAGS = -chartype:S -model:L -NOmodsect -cpu:Z16F2811AL -NOgenprint \
diff --git a/configs/z16f2800100zcog/pashello/Make.defs b/configs/z16f2800100zcog/pashello/Make.defs
index 3a2945c07ef..ed915364316 100644
--- a/configs/z16f2800100zcog/pashello/Make.defs
+++ b/configs/z16f2800100zcog/pashello/Make.defs
@@ -112,9 +112,15 @@ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS)
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -debug -NOregvar -reduceopt
+  ARCHOPTIMIZATION = -debug
 else
-  ARCHOPTIMIZATION = -nodebug -regvar
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -NOregvar -reduceopt
+else
+  ARCHOPTIMIZATION += -regvar
 endif
 
 ARCHCPUFLAGS = -chartype:S -model:L -NOmodsect -cpu:Z16F2811AL -NOgenprint \
diff --git a/configs/z8encore000zco/ostest/Make.defs b/configs/z8encore000zco/ostest/Make.defs
index 2bf1bc42443..39cf842a81e 100644
--- a/configs/z8encore000zco/ostest/Make.defs
+++ b/configs/z8encore000zco/ostest/Make.defs
@@ -145,9 +145,15 @@ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS)
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -debug -NOregvar -reduceopt
+  ARCHOPTIMIZATION = -debug
 else
-  ARCHOPTIMIZATION = -nodebug -regvar
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -NOregvar -reduceopt
+else
+  ARCHOPTIMIZATION += -regvar
 endif
 
 ARCHCPUFLAGS = -chartype:S -model:L -const:RAM -NOoptlink -promote -cpu:$(ARCHCPU) $(ARCHREVAA) -NOgenprintf \
diff --git a/configs/z8f64200100kit/ostest/Make.defs b/configs/z8f64200100kit/ostest/Make.defs
index 7cc5a2705c9..446b62c20f7 100644
--- a/configs/z8f64200100kit/ostest/Make.defs
+++ b/configs/z8f64200100kit/ostest/Make.defs
@@ -145,9 +145,15 @@ AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS)
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -debug -NOregvar -reduceopt
+  ARCHOPTIMIZATION = -debug
 else
-  ARCHOPTIMIZATION = -nodebug -regvar
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -NOregvar -reduceopt
+else
+  ARCHOPTIMIZATION += -regvar
 endif
 
 ARCHCPUFLAGS = -chartype:S -model:L -const:RAM -NOoptlink -promote -cpu:$(ARCHCPU) $(ARCHREVAA) -NOgenprintf \