sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for 2-pass link

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2890 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2010-08-28 02:30:50 +00:00
parent 3e4fbc7c76
commit 2ffe28d6e5
5 changed files with 129 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configs/ea3131/locked/Makefile
View File

@ -35,20 +35,37 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
all: liblocked.r ifeq ($(WINTOOL),y)
# Windows-native toolchains
PASS1_LIBPATHS = ${shell for path in $(LINKLIBS); do dir=`dirname $(TOPDIR)/$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
PASS1_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/locked/ld-locked.inc}"
else
# Linux/Cygwin-native toolchain
PASS1_LIBPATHS = $(addprefix -L$(TOPDIR)/,$(dir $(LINKLIBS)))
PASS1_LDSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/locked/ld-locked.inc
endif
ld-locked.script: PASS1_LDFLAGS = -r $(PASS1_LDSCRIPT)
./mklocked.sh "$(TOPDIR)" PASS1_LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS))))
PASS1_LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
liblocked.r: ld-locked.script $(OBJS) all: locked.r
@LD -o $@ --start-group $(LDLIBS) --end-group -u os_start $(LIBGCC)
ld-locked.inc: mklocked.sh $(TOPDIR)/.config
@echo "MK: ld-locked.inc"
@./mklocked.sh "$(TOPDIR)"
locked.r: ld-locked.inc $(OBJS)
@echo "LD: locked.r"
@$(LD) -o $@ $(PASS1_LDFLAGS) $(PASS1_LIBPATHS) --start-group $(PASS1_LDLIBS) --end-group -u os_start $(PASS1_LIBGCC)
.depend: .depend:
depend: .depend depend: .depend
clean: clean:
@rm -f liblocked.r *~ .*.swp @rm -f locked.r *~ .*.swp
distclean: clean distclean: clean
@rm -f ld-locked.script @rm -f ld-locked.inc

44
configs/ea3131/locked/ld-locked.script Normal file
View File

@ -0,0 +1,44 @@
/****************************************************************************
* configs/ea3131/pgnsh/ld-locked.script
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
INCLUDE ld-locked.inc
OUTPUT_ARCH(arm)
SECTIONS
{
.locked : {
*(.vectors)
*(.text .text.*)
}
}

57
configs/ea3131/locked/mklocked.sh
View File

@ -76,62 +76,61 @@ function checkconfig () {
# Interrupt Handlers # Interrupt Handlers
############################################################################ ############################################################################
# #
# All interrupt handlers must be forced to lie in the locked # All interrupt handlers must be forced to lie in the locked .text region
# .text region
# #
# These are the vector entry points (only one is really needed # These are the vector entry points (only one is really needed since they
# since they are all in the same file). These should drag in all # are all in the same file). These should drag in all of the vector
# of the vector dispatching logic. # dispatching logic.
# #
rm -f ld-locked.script rm -f ld-locked.inc
echo "EXTERN(up_vectorswi)" >>ld-locked.script echo "EXTERN(up_vectorswi)" >>ld-locked.inc
echo "EXTERN(up_vectordata)" >>ld-locked.script echo "EXTERN(up_vectordata)" >>ld-locked.inc
echo "EXTERN(up_vectorprefetch)" >>ld-locked.script echo "EXTERN(up_vectorprefetch)" >>ld-locked.inc
echo "EXTERN(up_vectorundefinsn)" >>ld-locked.script echo "EXTERN(up_vectorundefinsn)" >>ld-locked.inc
echo "EXTERN(up_vectorfiq)" >>ld-locked.script echo "EXTERN(up_vectorfiq)" >>ld-locked.inc
echo "EXTERN(up_vectorirq)" >>ld-locked.script echo "EXTERN(up_vectorirq)" >>ld-locked.inc
# #
# These are the initialization entry points of all device drivers # These are the initialization entry points of all device drivers that
# that handle interrupts. We really want to include as little as # handle interrupts. We really want to include as little as possible --
# possible -- ideally just the interrupt handler itself, but that # ideally just the interrupt handler itself, but that is not usually
# is not usually possible. # possible.
# #
# Of course, this list must be extended as interrupt handlers are # Of course, this list must be extended as interrupt handlers are added.
# added.
echo "EXTERN(up_timerinit)" >>ld-locked.script echo "EXTERN(up_timerinit)" >>ld-locked.inc
answer=$(checkconfig CONFIG_LPC313X_UART) answer=$(checkconfig CONFIG_LPC313X_UART)
if [ $answer = y ]; then if [ $answer = y ]; then
echo "EXTERN(up_earlyserialinit)" >>ld-locked.script echo "EXTERN(up_earlyserialinit)" >>ld-locked.inc
fi fi
# up_i2cinitialize -- Not conditioned on anything # up_i2cinitialize -- Not conditioned on anything
answer=$(checkconfig CONFIG_USBDEV) answer=$(checkconfig CONFIG_USBDEV)
if [ $answer = y ]; then if [ $answer = y ]; then
echo "EXTERN(up_usbinitialize)" >>ld-locked.script echo "EXTERN(up_usbinitialize)" >>ld-locked.inc
fi fi
############################################################################ ############################################################################
# Idle Loop # Idle Loop
############################################################################ ############################################################################
# #
# The IDLE loop must be forced to lie in the locked .text region # The IDLE loop must be forced to lie in the locked .text region. NOTE that
# NOTE that most of the IDLE loop is is os_start.c, but we don't # most of the IDLE loop is is os_start.c, but we don't we want to handle
# we want to handle that differently so that it does not draw in # that differently so that it does not draw in a lot of things that we do
# a lot of things that we do not need. # not need in the locked region. However, we do need to bring in all of
# the things called by os_start up to the point where the page fill worker
# thread is started.
echo "EXTERN(up_idle)" >>ld-locked.script echo "EXTERN(up_idle)" >>ld-locked.inc
############################################################################ ############################################################################
# PG Fill Worker Thread # PG Fill Worker Thread
############################################################################ ############################################################################
# #
# All of the page fill worker thread must be in the locked .text # All of the page fill worker thread must be in the locked .text region.
# region.
echo "EXTERN(pg_worker)" >>ld-locked.script echo "EXTERN(pg_worker)" >>ld-locked.inc

7
configs/ea3131/pgnsh/defconfig
View File

@ -198,6 +198,13 @@ CONFIG_MOTOROLA_SREC=n
CONFIG_RAW_BINARY=y CONFIG_RAW_BINARY=y
CONFIG_HAVE_LIBM=n CONFIG_HAVE_LIBM=n
#
# Setup for a two-pass build
#
CONFIG_BUILD_2PASS=y
CONFIG_PASS1_DIR=configs/ea3131/locked
CONFIG_PASS1_LIB=locked.r
# #
# General OS setup # General OS setup
# #

35
configs/ea3131/pgnsh/ld.script
View File

@ -37,20 +37,37 @@
* LPC313x boot ROM expects the boot image be compiled with entry point at * LPC313x boot ROM expects the boot image be compiled with entry point at
* 0x1102:9000. A 128b header will appear at this address (applied by * 0x1102:9000. A 128b header will appear at this address (applied by
* lpc313xImgCreator) and the executable code must begin at 0x1102:9080. * lpc313xImgCreator) and the executable code must begin at 0x1102:9080.
*
* The .text vitual address space begins at the same location as the physical
* address space: 0x1102 8000. The virtual space is broken up into three
* regions:
*
* locked - Pages locked in memory. Start: 0x1102 8000 Size: 36Kb
* paged - Pages in nonvolatile store. Start: 0x1103 1000 Size: 384Kb
* data - .data/.bss/heap. Start: 0x1109 1000 Size: 44Kb
*/ */
MEMORY MEMORY
{ {
isram (rwx) : ORIGIN = 0x11029080, LENGTH = 192K - 4224 locked (rx) : ORIGIN = 0x11029080, LENGTH = 36K - 4224
paged (rx) : ORIGIN = 0x11031000, LENGTH = 384K
data (rw) : ORIGIN = 0x11091000, LENGTH = 44K
} }
OUTPUT_ARCH(arm) OUTPUT_ARCH(arm)
ENTRY(_stext) ENTRY(_stext)
SECTIONS SECTIONS
{ {
.text : { .locked : {
_stext = ABSOLUTE(.); _slocked = ABSOLUTE(.);
*(.vectors) *(.vectors)
*(.locked)
_elocked = ABSOLUTE(.);
} >locked
_eronly = ABSOLUTE(.); /* See below */
.paged : {
_spaged = ABSOLUTE(.);
*(.text .text.*) *(.text .text.*)
*(.fixup) *(.fixup)
*(.gnu.warning) *(.gnu.warning)
@ -61,8 +78,8 @@ SECTIONS
*(.got) *(.got)
*(.gcc_except_table) *(.gcc_except_table)
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
_etext = ABSOLUTE(.); _epaged = ABSOLUTE(.);
} > isram } > paged
_eronly = ABSOLUTE(.); _eronly = ABSOLUTE(.);
@ -72,17 +89,17 @@ SECTIONS
*(.gnu.linkonce.d.*) *(.gnu.linkonce.d.*)
CONSTRUCTORS CONSTRUCTORS
_edata = ABSOLUTE(.); _edata = ABSOLUTE(.);
} > isram } > data AT > locked
.ARM.extab : { .ARM.extab : {
*(.ARM.extab*) *(.ARM.extab*)
} >isram } >data
.ARM.exidx : { .ARM.exidx : {
__exidx_start = ABSOLUTE(.); __exidx_start = ABSOLUTE(.);
*(.ARM.exidx*) *(.ARM.exidx*)
__exidx_end = ABSOLUTE(.); __exidx_end = ABSOLUTE(.);
} > isram } > data
.bss : { .bss : {
_sbss = ABSOLUTE(.); _sbss = ABSOLUTE(.);
@ -90,7 +107,7 @@ SECTIONS
*(.gnu.linkonce.b.*) *(.gnu.linkonce.b.*)
*(COMMON) *(COMMON)
_ebss = ABSOLUTE(.); _ebss = ABSOLUTE(.);
} > isram } > data
/* Stabs debugging sections. */ /* Stabs debugging sections. */
.stab 0 : { *(.stab) } .stab 0 : { *(.stab) }
.stabstr 0 : { *(.stabstr) } .stabstr 0 : { *(.stabstr) }