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/stm32f3discovery/nsh/Make.defs    | 6 ++++--
 nuttx/configs/stm32f3discovery/ostest/Make.defs | 6 ++++--
 nuttx/configs/stm32f3discovery/usbnsh/Make.defs | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'nuttx/configs/stm32f3discovery')

diff --git a/nuttx/configs/stm32f3discovery/nsh/Make.defs b/nuttx/configs/stm32f3discovery/nsh/Make.defs
index 2987bb200..045926d3f 100644
--- a/nuttx/configs/stm32f3discovery/nsh/Make.defs
+++ b/nuttx/configs/stm32f3discovery/nsh/Make.defs
@@ -70,8 +70,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/stm32f3discovery/ostest/Make.defs b/nuttx/configs/stm32f3discovery/ostest/Make.defs
index fe4c86d90..db9b4b028 100644
--- a/nuttx/configs/stm32f3discovery/ostest/Make.defs
+++ b/nuttx/configs/stm32f3discovery/ostest/Make.defs
@@ -66,8 +66,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/stm32f3discovery/usbnsh/Make.defs b/nuttx/configs/stm32f3discovery/usbnsh/Make.defs
index 367162aca..2669947fe 100644
--- a/nuttx/configs/stm32f3discovery/usbnsh/Make.defs
+++ b/nuttx/configs/stm32f3discovery/usbnsh/Make.defs
@@ -70,8 +70,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