summaryrefslogtreecommitdiff
path: root/nuttx/configs/olimex-strp711/nsh/Make.defs
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-06-11 16:32:55 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-06-11 16:32:55 +0000
commit2c279270c74e1b38ef9b875c4c29b9eb9a3092d9 (patch)
tree096785b72d829c379892b4187c3dbbdb56824e0c /nuttx/configs/olimex-strp711/nsh/Make.defs
parent94a04f9e5a37e615bc7f8809a055ed98ea36a19b (diff)
downloadpx4-nuttx-2c279270c74e1b38ef9b875c4c29b9eb9a3092d9.tar.gz
px4-nuttx-2c279270c74e1b38ef9b875c4c29b9eb9a3092d9.tar.bz2
px4-nuttx-2c279270c74e1b38ef9b875c4c29b9eb9a3092d9.zip
Additional fixes for devkitARM toolchain
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1876 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/olimex-strp711/nsh/Make.defs')
-rw-r--r--nuttx/configs/olimex-strp711/nsh/Make.defs26
1 files changed, 14 insertions, 12 deletions
diff --git a/nuttx/configs/olimex-strp711/nsh/Make.defs b/nuttx/configs/olimex-strp711/nsh/Make.defs
index bb6d5dace..762ff0d2f 100644
--- a/nuttx/configs/olimex-strp711/nsh/Make.defs
+++ b/nuttx/configs/olimex-strp711/nsh/Make.defs
@@ -62,23 +62,12 @@ OBJCOPYARGS = -R .note -R .note.gnu.build-id -R .comment
endif
endif
-ifeq ("${CONFIG_DEBUG}","y")
- ARCHOPTIMIZATION = -g
-else
- ARCHOPTIMIZATION = -Os -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
-endif
-
-ifeq ($(ARCHCCMAJOR),4)
- ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
-else
- ARCHCPUFLAGS = -mapcs-32 -mcpu=arm7tdmi -msoft-float
-endif
-
ifeq ($(CROSSDEV),arm-elf-)
MKDEP = $(TOPDIR)/tools/mkdeps.sh
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script
+ MAXOPTIMIZATION = -Os
else
WINTOOL = y
DIRLINK = $(TOPDIR)/tools/winlink.sh
@@ -87,6 +76,19 @@ else
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}"
+ MAXOPTIMIZATION = -O2
+endif
+
+ifeq ("${CONFIG_DEBUG}","y")
+ ARCHOPTIMIZATION = -g
+else
+ ARCHOPTIMIZATION = $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+endif
+
+ifeq ($(ARCHCCMAJOR),4)
+ ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
+else
+ ARCHCPUFLAGS = -mapcs-32 -mcpu=arm7tdmi -msoft-float
endif
ARCHCFLAGS = -fno-builtin