From a94cda2860f4ea87f254966f71307e928ffe9bcb Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 20 Dec 2013 13:23:42 -0600
Subject: Finishes separation of debug symbols and optimization selections

---
 nuttx/configs/nucleus2g/nsh/Make.defs       | 6 ++++--
 nuttx/configs/nucleus2g/ostest/Make.defs    | 6 ++++--
 nuttx/configs/nucleus2g/usbmsc/Make.defs    | 6 ++++--
 nuttx/configs/nucleus2g/usbserial/Make.defs | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'nuttx/configs/nucleus2g')

diff --git a/nuttx/configs/nucleus2g/nsh/Make.defs b/nuttx/configs/nucleus2g/nsh/Make.defs
index 86cbd013e..638e16daa 100644
--- a/nuttx/configs/nucleus2g/nsh/Make.defs
+++ b/nuttx/configs/nucleus2g/nsh/Make.defs
@@ -68,8 +68,10 @@ 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
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
 ARCHCFLAGS = -fno-builtin
diff --git a/nuttx/configs/nucleus2g/ostest/Make.defs b/nuttx/configs/nucleus2g/ostest/Make.defs
index 1851a03d3..ee74fa746 100644
--- a/nuttx/configs/nucleus2g/ostest/Make.defs
+++ b/nuttx/configs/nucleus2g/ostest/Make.defs
@@ -68,8 +68,10 @@ 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
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
 ARCHCFLAGS = -fno-builtin
diff --git a/nuttx/configs/nucleus2g/usbmsc/Make.defs b/nuttx/configs/nucleus2g/usbmsc/Make.defs
index fc68a3744..7051d6f5f 100644
--- a/nuttx/configs/nucleus2g/usbmsc/Make.defs
+++ b/nuttx/configs/nucleus2g/usbmsc/Make.defs
@@ -68,8 +68,10 @@ 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
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
 ARCHCFLAGS = -fno-builtin
diff --git a/nuttx/configs/nucleus2g/usbserial/Make.defs b/nuttx/configs/nucleus2g/usbserial/Make.defs
index 3973652ac..0e5e10a64 100644
--- a/nuttx/configs/nucleus2g/usbserial/Make.defs
+++ b/nuttx/configs/nucleus2g/usbserial/Make.defs
@@ -68,8 +68,10 @@ 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
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
 ARCHCFLAGS = -fno-builtin
-- 
cgit v1.2.3