diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-04 17:18:25 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-04 17:18:25 +0000 |
| commit | 813efa266bb67269669e532b5ce6f00ee2097948 (patch) | |
| tree | ac30163b79435767a2d5c7a4b350531bb945c3b9 /nuttx/configs/kwikstik-k40 | |
| parent | d619bef95e6e08dea3d15b52f991e056fb869ebf (diff) | |
| download | px4-nuttx-813efa266bb67269669e532b5ce6f00ee2097948.tar.gz px4-nuttx-813efa266bb67269669e532b5ce6f00ee2097948.tar.bz2 px4-nuttx-813efa266bb67269669e532b5ce6f00ee2097948.zip | |
Massive clean-up of linker scripts from Freddie Chopin
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5307 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/kwikstik-k40')
| -rw-r--r-- | nuttx/configs/kwikstik-k40/ostest/Make.defs | 4 | ||||
| -rwxr-xr-x | nuttx/configs/kwikstik-k40/ostest/ld.script | 32 |
2 files changed, 21 insertions, 15 deletions
diff --git a/nuttx/configs/kwikstik-k40/ostest/Make.defs b/nuttx/configs/kwikstik-k40/ostest/Make.defs index a51f37e94..f239d872d 100644 --- a/nuttx/configs/kwikstik-k40/ostest/Make.defs +++ b/nuttx/configs/kwikstik-k40/ostest/Make.defs @@ -74,14 +74,14 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh 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)/ostest/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" MAXOPTIMIZATION = -O2 else # Linux/Cygwin-native toolchain 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)/ostest/ld.script + ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/nuttx/configs/kwikstik-k40/ostest/ld.script b/nuttx/configs/kwikstik-k40/ostest/ld.script index 2b7b517fa..97ac473ca 100755 --- a/nuttx/configs/kwikstik-k40/ostest/ld.script +++ b/nuttx/configs/kwikstik-k40/ostest/ld.script @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/kwikstik-k40/ostest/ld.script + * configs/kwikstik-k40/scripts/ld.script * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -70,10 +70,10 @@ SECTIONS .text : { _stext = ABSOLUTE(.); - *(.text .text.*) + *(.text .text.*) *(.fixup) *(.gnu.warning) - *(.rodata .rodata.*) + *(.rodata .rodata.*) *(.gnu.linkonce.t.*) *(.glue_7) *(.glue_7t) @@ -83,6 +83,22 @@ SECTIONS _etext = ABSOLUTE(.); } > progflash + .init_section : { + _sinit = ABSOLUTE(.); + *(.init_array .init_array.*) + _einit = ABSOLUTE(.); + } > progflash + + .ARM.extab : { + *(.ARM.extab*) + } > progflash + + __exidx_start = ABSOLUTE(.); + .ARM.exidx : { + *(.ARM.exidx*) + } > progflash + __exidx_end = ABSOLUTE(.); + .data : { _sdata = ABSOLUTE(.); *(.data .data.*) @@ -101,16 +117,6 @@ SECTIONS _framfuncs = LOADADDR(.ramfunc); - .ARM.extab : { - *(.ARM.extab*) - } > datasram - - __exidx_start = ABSOLUTE(.); - .ARM.exidx : { - *(.ARM.exidx*) - } > datasram - __exidx_end = ABSOLUTE(.); - .bss : { _sbss = ABSOLUTE(.); *(.bss .bss.*) |