summaryrefslogtreecommitdiff
path: root/nuttx/configs/sim
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-12-20 12:36:02 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-12-20 12:36:02 -0600
commitdfea55cdfbbe46972be0ccc9eed2c5402c96ca22 (patch)
tree7675f3efa2f2e8c99d338f1f809edc2bef0db2bc /nuttx/configs/sim
parentb80eaf7a0505b5f2e4d434edee324f03cdeae416 (diff)
downloadpx4-nuttx-dfea55cdfbbe46972be0ccc9eed2c5402c96ca22.tar.gz
px4-nuttx-dfea55cdfbbe46972be0ccc9eed2c5402c96ca22.tar.bz2
px4-nuttx-dfea55cdfbbe46972be0ccc9eed2c5402c96ca22.zip
More separation of debug symbols and optimization selections
Diffstat (limited to 'nuttx/configs/sim')
-rw-r--r--nuttx/configs/sim/configdata/Make.defs6
-rw-r--r--nuttx/configs/sim/cxxtest/Make.defs6
-rw-r--r--nuttx/configs/sim/mount/Make.defs6
-rw-r--r--nuttx/configs/sim/mtdpart/Make.defs6
-rw-r--r--nuttx/configs/sim/nettest/Make.defs6
-rw-r--r--nuttx/configs/sim/nsh/Make.defs6
-rw-r--r--nuttx/configs/sim/nsh2/Make.defs6
-rw-r--r--nuttx/configs/sim/nx/Make.defs6
-rw-r--r--nuttx/configs/sim/nx11/Make.defs6
-rw-r--r--nuttx/configs/sim/nxffs/Make.defs6
-rw-r--r--nuttx/configs/sim/nxlines/Make.defs8
-rw-r--r--nuttx/configs/sim/nxwm/Make.defs6
-rw-r--r--nuttx/configs/sim/ostest/Make.defs8
-rw-r--r--nuttx/configs/sim/pashello/Make.defs6
-rw-r--r--nuttx/configs/sim/touchscreen/Make.defs6
15 files changed, 62 insertions, 32 deletions
diff --git a/nuttx/configs/sim/configdata/Make.defs b/nuttx/configs/sim/configdata/Make.defs
index 99712bebe..102620785 100644
--- a/nuttx/configs/sim/configdata/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/cxxtest/Make.defs b/nuttx/configs/sim/cxxtest/Make.defs
index 9c7c3d46b..6ef9cb83f 100644
--- a/nuttx/configs/sim/cxxtest/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/mount/Make.defs b/nuttx/configs/sim/mount/Make.defs
index 54adfdbc4..833596b31 100644
--- a/nuttx/configs/sim/mount/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/mtdpart/Make.defs b/nuttx/configs/sim/mtdpart/Make.defs
index 31f89a7fe..1a142f35a 100644
--- a/nuttx/configs/sim/mtdpart/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/nettest/Make.defs b/nuttx/configs/sim/nettest/Make.defs
index 0851bcc77..ff645f3cb 100644
--- a/nuttx/configs/sim/nettest/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/nsh/Make.defs b/nuttx/configs/sim/nsh/Make.defs
index e08318808..52c70c420 100644
--- a/nuttx/configs/sim/nsh/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/nsh2/Make.defs b/nuttx/configs/sim/nsh2/Make.defs
index a8bfaf254..48ac1f106 100644
--- a/nuttx/configs/sim/nsh2/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/nx/Make.defs b/nuttx/configs/sim/nx/Make.defs
index 924ac90bf..1d2cd7f69 100644
--- a/nuttx/configs/sim/nx/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/nx11/Make.defs b/nuttx/configs/sim/nx11/Make.defs
index e78a3a636..000f56ce8 100644
--- a/nuttx/configs/sim/nx11/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/nxffs/Make.defs b/nuttx/configs/sim/nxffs/Make.defs
index 10b5012ea..90e9dc9fc 100644
--- a/nuttx/configs/sim/nxffs/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/nxlines/Make.defs b/nuttx/configs/sim/nxlines/Make.defs
index 18c8bf537..c391850b4 100644
--- a/nuttx/configs/sim/nxlines/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/nxwm/Make.defs b/nuttx/configs/sim/nxwm/Make.defs
index b5b2e389c..2840cf189 100644
--- a/nuttx/configs/sim/nxwm/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/ostest/Make.defs b/nuttx/configs/sim/ostest/Make.defs
index 975d59338..ce3b24ae6 100644
--- a/nuttx/configs/sim/ostest/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/pashello/Make.defs b/nuttx/configs/sim/pashello/Make.defs
index 553026914..3ce6b9406 100644
--- a/nuttx/configs/sim/pashello/Make.defs
+++ b/nuttx/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
diff --git a/nuttx/configs/sim/touchscreen/Make.defs b/nuttx/configs/sim/touchscreen/Make.defs
index 05d223099..29090dda8 100644
--- a/nuttx/configs/sim/touchscreen/Make.defs
+++ b/nuttx/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