diff options
Diffstat (limited to 'ld')
-rw-r--r-- | ld/ChangeLog | 12 | ||||
-rw-r--r-- | ld/Makefile.am | 5 | ||||
-rw-r--r-- | ld/Makefile.in | 16 | ||||
-rw-r--r-- | ld/configure.tgt | 2 | ||||
-rw-r--r-- | ld/emulparams/avr1.sh | 3 | ||||
-rw-r--r-- | ld/emulparams/avr2.sh | 3 | ||||
-rw-r--r-- | ld/emulparams/avr3.sh | 3 | ||||
-rw-r--r-- | ld/emulparams/avr4.sh | 3 | ||||
-rw-r--r-- | ld/emulparams/avr5.sh | 3 | ||||
-rw-r--r-- | ld/emulparams/avr6.sh | 11 | ||||
-rw-r--r-- | ld/emultempl/avrelf.em | 267 | ||||
-rw-r--r-- | ld/scripttempl/avr.sc | 36 |
12 files changed, 338 insertions, 26 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 0f8a375..f693584 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,15 @@ +2006-05-24 Bjoern Haase <bjoern.m.haase@web.de> + + * configure.tgt: Add avr6 to emulation list. + * Makefile.am: Add eavr6.o and corresponding rule. + * Makefile.in: Regenerate. + * emulparams/avr6.sh: New file. + * emulparams/avrX.sh (TEMPLATE_NAME): Use elf32 instead of generic + for target option support. + (EXTRA_EM_FILE): Add reference to new em template file avrelf. + * scripttempl/avr.sc: Add ".trampolines" section. + * emultempl/avrelf.em: Add new file for target specific options. + 2006-05-22 Nick Clifton <nickc@redhat.com> * scripttempl/elf32crx.sc (.rdata): Add .rodata.*. diff --git a/ld/Makefile.am b/ld/Makefile.am index 61581ac..61bbfb9 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -133,6 +133,7 @@ ALL_EMULATIONS = \ eavr3.o \ eavr4.o \ eavr5.o \ + eavr6.o \ ecoff_i860.o \ ecoff_sparc.o \ ecrisaout.o \ @@ -595,6 +596,10 @@ eavr5.c: $(srcdir)/emulparams/avr5.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} ${GENSCRIPTS} avr5 "$(tdir_avr2)" +eavr6.c: $(srcdir)/emulparams/avr6.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} avr6 "$(tdir_avr2)" ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS} ${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)" diff --git a/ld/Makefile.in b/ld/Makefile.in index 8c9029f..0e5e226 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -357,6 +357,7 @@ ALL_EMULATIONS = \ eavr3.o \ eavr4.o \ eavr5.o \ + eavr6.o \ ecoff_i860.o \ ecoff_sparc.o \ ecrisaout.o \ @@ -878,13 +879,10 @@ dist-info: $(INFO_DEPS) $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ if test -f $$base; then d=.; else d=$(srcdir); fi; \ - base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ - for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ - if test -f $$file; then \ - relfile=`expr "$$file" : "$$d/\(.*\)"`; \ - test -f $(distdir)/$$relfile || \ - cp -p $$file $(distdir)/$$relfile; \ - else :; fi; \ + for file in $$d/$$base*; do \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f $(distdir)/$$relfile || \ + cp -p $$file $(distdir)/$$relfile; \ done; \ done @@ -1409,6 +1407,10 @@ eavr5.c: $(srcdir)/emulparams/avr5.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} ${GENSCRIPTS} avr5 "$(tdir_avr2)" +eavr6.c: $(srcdir)/emulparams/avr6.sh \ + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ + ${GEN_DEPENDS} + ${GENSCRIPTS} avr6 "$(tdir_avr2)" ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS} ${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)" diff --git a/ld/configure.tgt b/ld/configure.tgt index d324e4e..c86820a 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -81,7 +81,7 @@ xscale-*-coff) targ_emul=armcoff ;; xscale-*-elf) targ_emul=armelf ;; avr-*-*) targ_emul=avr2 - targ_extra_emuls="avr1 avr3 avr4 avr5" + targ_extra_emuls="avr1 avr3 avr4 avr5 avr6" ;; bfin-*-elf) targ_emul=elf32bfin; targ_extra_emuls="elf32bfinfd" ;; bfin-*-uclinux*) targ_emul=elf32bfin; targ_extra_emuls="elf32bfinfd" ;; diff --git a/ld/emulparams/avr1.sh b/ld/emulparams/avr1.sh index 4ccc9ed..7d907fe 100644 --- a/ld/emulparams/avr1.sh +++ b/ld/emulparams/avr1.sh @@ -4,7 +4,8 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=generic +TEMPLATE_NAME=elf32 TEXT_LENGTH=8K DATA_LENGTH=0 +EXTRA_EM_FILE=avrelf diff --git a/ld/emulparams/avr2.sh b/ld/emulparams/avr2.sh index 9c98ce1..2bd677b 100644 --- a/ld/emulparams/avr2.sh +++ b/ld/emulparams/avr2.sh @@ -4,7 +4,8 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=generic +TEMPLATE_NAME=elf32 TEXT_LENGTH=8K DATA_LENGTH=0xffa0 +EXTRA_EM_FILE=avrelf diff --git a/ld/emulparams/avr3.sh b/ld/emulparams/avr3.sh index 0434d07..ff559e6 100644 --- a/ld/emulparams/avr3.sh +++ b/ld/emulparams/avr3.sh @@ -4,7 +4,8 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=generic +TEMPLATE_NAME=elf32 TEXT_LENGTH=128K DATA_LENGTH=0xffa0 +EXTRA_EM_FILE=avrelf diff --git a/ld/emulparams/avr4.sh b/ld/emulparams/avr4.sh index 33fc83a..2f57cb0 100644 --- a/ld/emulparams/avr4.sh +++ b/ld/emulparams/avr4.sh @@ -4,7 +4,8 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=generic +TEMPLATE_NAME=elf32 TEXT_LENGTH=8K DATA_LENGTH=0xffa0 +EXTRA_EM_FILE=avrelf diff --git a/ld/emulparams/avr5.sh b/ld/emulparams/avr5.sh index 5b175b8..69090be 100644 --- a/ld/emulparams/avr5.sh +++ b/ld/emulparams/avr5.sh @@ -4,7 +4,8 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=generic +TEMPLATE_NAME=elf32 TEXT_LENGTH=128K DATA_LENGTH=0xffa0 +EXTRA_EM_FILE=avrelf diff --git a/ld/emulparams/avr6.sh b/ld/emulparams/avr6.sh new file mode 100644 index 0000000..5326488 --- /dev/null +++ b/ld/emulparams/avr6.sh @@ -0,0 +1,11 @@ +ARCH=avr:6 +MACHINE= +SCRIPT_NAME=avr +OUTPUT_FORMAT="elf32-avr" +MAXPAGESIZE=1 +EMBEDDED=yes +TEMPLATE_NAME=elf32 + +TEXT_LENGTH=1024K +DATA_LENGTH=0xffa0 +EXTRA_EM_FILE=avrelf diff --git a/ld/emultempl/avrelf.em b/ld/emultempl/avrelf.em new file mode 100644 index 0000000..ba595e9 --- /dev/null +++ b/ld/emultempl/avrelf.em @@ -0,0 +1,267 @@ +# This shell script emits a C file. -*- C -*- +# Copyright 2006 +# Free Software Foundation, Inc. +# +# This file is part of GLD, the Gnu Linker. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +# MA 02110-1301 USA. + +# This file is sourced from elf32.em, and defines extra avr-elf +# specific routines. It is used to generate the trampolines for the avr6 +# family devices where one needs to address the issue that it is not possible +# to reach the whole program memory by using 16 bit pointers. + +cat >>e${EMULATION_NAME}.c <<EOF + +#include "elf32-avr.h" +#include "ldctor.h" + +/* The fake file and it's corresponding section meant to hold + the linker stubs if needed. */ + +static lang_input_statement_type *stub_file; +static asection *avr_stub_section; + +/* Variables set by the command-line parameters and transfered + to the bfd without use of global shared variables. */ + +static bfd_boolean avr_no_stubs = FALSE; +static bfd_boolean avr_debug_relax = FALSE; +static bfd_boolean avr_debug_stubs = FALSE; +static bfd_boolean avr_replace_call_ret_sequences = TRUE; +static bfd_vma avr_pc_wrap_around = 0x10000000; + +/* Transfers information to the bfd frontend. */ + +static void +avr_elf_set_global_bfd_parameters (void) +{ + elf32_avr_setup_params (& link_info, + stub_file->the_bfd, + avr_stub_section, + avr_no_stubs, + avr_debug_stubs, + avr_debug_relax, + avr_pc_wrap_around, + avr_replace_call_ret_sequences); +} + + +/* Makes a conservative estimate of the trampoline section size that could + be corrected later on. */ + +static void +avr_elf_${EMULATION_NAME}_before_allocation (void) +{ + int ret; + + gld${EMULATION_NAME}_before_allocation (); + + /* We only need stubs for the avr6 family. */ + if (strcmp ("${EMULATION_NAME}","avr6")) + avr_no_stubs = TRUE; + + avr_elf_set_global_bfd_parameters (); + + /* If generating a relocatable output file, then + we don't have to generate the trampolines. */ + if (link_info.relocatable) + avr_no_stubs = TRUE; + + if (avr_no_stubs) + return; + + ret = elf32_avr_setup_section_lists (output_bfd, &link_info); + + if (ret < 0) + einfo ("%X%P: can not setup the input section list: %E\n"); + + if (ret <= 0) + return; + + /* Call into the BFD backend to do the real "stub"-work. */ + if (! elf32_avr_size_stubs (output_bfd, &link_info, TRUE)) + einfo ("%X%P: can not size stub section: %E\n"); +} + +/* This is called before the input files are opened. We create a new + fake input file to hold the stub section and generate the section itself. */ + +static void +avr_elf_create_output_section_statements (void) +{ + flagword flags; + + stub_file = lang_add_input_file ("linker stubs", + lang_input_file_is_fake_enum, + NULL); + + stub_file->the_bfd = bfd_create ("linker stubs", output_bfd); + if (stub_file->the_bfd == NULL + || !bfd_set_arch_mach (stub_file->the_bfd, + bfd_get_arch (output_bfd), + bfd_get_mach (output_bfd))) + { + einfo ("%X%P: can not create stub BFD %E\n"); + return; + } + + /* Now we add the stub section. */ + + avr_stub_section = bfd_make_section_anyway (stub_file->the_bfd, + ".trampolines"); + if (avr_stub_section == NULL) + goto err_ret; + + flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE + | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP); + if (!bfd_set_section_flags (stub_file->the_bfd, avr_stub_section, flags)) + goto err_ret; + + avr_stub_section->alignment_power = 1; + + ldlang_add_file (stub_file); + + return; + + err_ret: + einfo ("%X%P: can not make stub section: %E\n"); + return; +} + +/* Re-calculates the size of the stubs so that we won't waste space. */ + +static void +avr_elf_finish (void) +{ + if (!avr_no_stubs) + { + /* Now build the linker stubs. */ + if (stub_file->the_bfd->sections != NULL) + { + /* Call again the trampoline analyzer to initialize the trampoline + stubs with the correct symbol addresses. Since there could have + been relaxation, the symbol addresses that were found during + first call may no longer be correct. */ + if (!elf32_avr_size_stubs (output_bfd, &link_info, FALSE)) + { + einfo ("%X%P: can not size stub section: %E\n"); + return; + } + + if (!elf32_avr_build_stubs (&link_info)) + einfo ("%X%P: can not build stubs: %E\n"); + } + } + + gld${EMULATION_NAME}_finish (); +} + + +EOF + + +PARSE_AND_LIST_PROLOGUE=' + +#define OPTION_NO_CALL_RET_REPLACEMENT 301 +#define OPTION_PMEM_WRAP_AROUND 302 +#define OPTION_NO_STUBS 303 +#define OPTION_DEBUG_STUBS 304 +#define OPTION_DEBUG_RELAX 305 +' + +PARSE_AND_LIST_LONGOPTS=' + { "no-call-ret-replacement", no_argument, + NULL, OPTION_NO_CALL_RET_REPLACEMENT}, + { "pmem-wrap-around", required_argument, + NULL, OPTION_PMEM_WRAP_AROUND}, + { "no-stubs", no_argument, + NULL, OPTION_NO_STUBS}, + { "debug-stubs", no_argument, + NULL, OPTION_DEBUG_STUBS}, + { "debug-relax", no_argument, + NULL, OPTION_DEBUG_RELAX}, +' + +PARSE_AND_LIST_OPTIONS=' + fprintf (file, _(" --pmem-wrap-around=<val> " + "Make the linker relaxation machine assume that a\n" + " " + "program counter wrap-around occures at address\n" + " " + "<val>. Supported values are 16k, 32k and 64k.\n")); + fprintf (file, _(" --no-call-ret-replacement " + "The relaxation machine normally will\n" + " " + "substitute two immediately following call/ret\n" + " " + "instructions by a single jump instruction.\n" + " " + "This option disables this optimization.\n")); + fprintf (file, _(" --no-stubs " + "If the linker detects to attempt to access\n" + " " + "an instruction beyond 128k by a reloc that\n" + " " + "is limited to 128k max, it inserts a jump\n" + " " + "stub. You can de-active this with this switch.\n")); + fprintf (file, _(" --debug-stubs Used for debugging avr-ld.\n")); + fprintf (file, _(" --debug-relax Used for debugging avr-ld.\n")); +' + +PARSE_AND_LIST_ARGS_CASES=' + + case OPTION_PMEM_WRAP_AROUND: + { + /* This variable is defined in the bfd library. */ + if ((!strcmp (optarg,"32k")) || (!strcmp (optarg,"32K"))) + avr_pc_wrap_around = 32768; + else if ((!strcmp (optarg,"16k")) || (!strcmp (optarg,"16K"))) + avr_pc_wrap_around = 16384; + else if ((!strcmp (optarg,"64k")) || (!strcmp (optarg,"64K"))) + avr_pc_wrap_around = 0x10000; + else + return FALSE; + } + break; + + case OPTION_DEBUG_STUBS: + avr_debug_stubs = TRUE; + break; + + case OPTION_DEBUG_RELAX: + avr_debug_relax = TRUE; + break; + + case OPTION_NO_STUBS: + avr_no_stubs = TRUE; + break; + + case OPTION_NO_CALL_RET_REPLACEMENT: + { + /* This variable is defined in the bfd library. */ + avr_replace_call_ret_sequences = FALSE; + } + break; +' + +# +# Put these extra avr-elf routines in ld_${EMULATION_NAME}_emulation +# +LDEMUL_BEFORE_ALLOCATION=avr_elf_${EMULATION_NAME}_before_allocation +LDEMUL_FINISH=avr_elf_finish +LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=avr_elf_create_output_section_statements diff --git a/ld/scripttempl/avr.sc b/ld/scripttempl/avr.sc index d297b4a..7368caf 100644 --- a/ld/scripttempl/avr.sc +++ b/ld/scripttempl/avr.sc @@ -71,12 +71,32 @@ SECTIONS .rel.plt ${RELOCATING-0} : { *(.rel.plt) } .rela.plt ${RELOCATING-0} : { *(.rela.plt) } - /* Internal text space or external memory */ + /* Internal text space or external memory. */ .text : { *(.vectors) KEEP(*(.vectors)) + /* For data that needs to reside in the lower 64k of progmem. */ + *(.progmem.gcc*) + *(.progmem*) + ${RELOCATING+. = ALIGN(2);} + + ${CONSTRUCTING+ __trampolines_start = . ; } + /* The jump trampolines for the 16-bit limited relocs will reside here. */ + *(.trampolines) + *(.trampolines*) + ${CONSTRUCTING+ __trampolines_end = . ; } + + /* For future tablejump instruction arrays for 3 byte pc devices. + We don't relax jump/call instructions within these sections. */ + *(.jumptables) + *(.jumptables*) + + /* For code that needs to reside in the lower 128k progmem. */ + *(.lowtext) + *(.lowtext*) + ${CONSTRUCTING+ __ctors_start = . ; } ${CONSTRUCTING+ *(.ctors) } ${CONSTRUCTING+ __ctors_end = . ; } @@ -86,18 +106,8 @@ SECTIONS KEEP(SORT(*)(.ctors)) KEEP(SORT(*)(.dtors)) - /* For data that needs to reside in the lower 64k of progmem */ - *(.progmem.gcc*) - *(.progmem*) - ${RELOCATING+. = ALIGN(2);} - - /* for future tablejump instruction arrays for 3 byte pc devices */ - *(.jumptables) - *(.jumptables*) - /* for code that needs to reside in the lower 128k progmem */ - *(.lowtext) - *(.lowtext*) - + /* From this point on, we don't bother about wether the insns are + below or above the 16 bits boundary. */ *(.init0) /* Start here after reset. */ KEEP (*(.init0)) *(.init1) |