diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-11 16:32:55 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-11 16:32:55 +0000 |
commit | 2c279270c74e1b38ef9b875c4c29b9eb9a3092d9 (patch) | |
tree | 096785b72d829c379892b4187c3dbbdb56824e0c /nuttx/configs/olimex-strp711/nsh | |
parent | 94a04f9e5a37e615bc7f8809a055ed98ea36a19b (diff) | |
download | px4-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')
-rw-r--r-- | nuttx/configs/olimex-strp711/nsh/Make.defs | 26 | ||||
-rw-r--r-- | nuttx/configs/olimex-strp711/nsh/ld.script | 2 | ||||
-rwxr-xr-x | nuttx/configs/olimex-strp711/nsh/setenv.sh | 10 |
3 files changed, 21 insertions, 17 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 diff --git a/nuttx/configs/olimex-strp711/nsh/ld.script b/nuttx/configs/olimex-strp711/nsh/ld.script index 34c7a4edb..a4ee85eab 100644 --- a/nuttx/configs/olimex-strp711/nsh/ld.script +++ b/nuttx/configs/olimex-strp711/nsh/ld.script @@ -93,7 +93,9 @@ SECTIONS } >sram .ARM.exidx : { + __exidx_start = ABSOLUTE(.); *(.ARM.exidx*) + __exidx_end = ABSOLUTE(.); } >sram .bss : { diff --git a/nuttx/configs/olimex-strp711/nsh/setenv.sh b/nuttx/configs/olimex-strp711/nsh/setenv.sh index ec99e5205..42fef8da6 100755 --- a/nuttx/configs/olimex-strp711/nsh/setenv.sh +++ b/nuttx/configs/olimex-strp711/nsh/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/olimex-strp711/nsh/setenv.sh # -# Copyright (C) 2008 Gregory Nutt. All rights reserved. +# Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # # Redistribution and use in source and binary forms, with or without @@ -37,11 +37,11 @@ if [ "$(basename $0)" = "setenv.sh" ] ; then exit 1 fi -if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi +if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi WD=`pwd` -export BUILDROOT_BIN=${WD}/../buildroot/build_arm_nofpu/staging_dir/bin -export STR41XSCRIPTS=$WD/configs/olimex-strp711/scripts -export PATH=${BUILDROOT_BIN}:${STR41XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG} +export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin" +export STR41XSCRIPTS="$WD/configs/olimex-strp711/scripts" +export PATH="${BUILDROOT_BIN}:${STR41XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" |