From 75ca919acf3a0e2ac74dd7627f65d57d29f511e6 Mon Sep 17 00:00:00 2001 From: Marek Michalkiewicz Date: Sun, 19 Oct 2003 16:46:14 +0000 Subject: [PATCH] * Makefile.am: Remove old (before GCC 3.3) emulations for AVR target: avr1200, avr23xx, avr4433, avr44x4, avr85xx, avrmega103, avrmega161, avrmega603. Default to avr2. * Makefile.in: Regenerate. * configure.tgt: Likewise. * emulparams/avr1200.sh: Remove. * emulparams/avr23xx.sh: Remove. * emulparams/avr4433.sh: Remove. * emulparams/avr44x4.sh: Remove. * emulparams/avr85xx.sh: Remove. * emulparams/avrmega103.sh: Remove. * emulparams/avrmega161.sh: Remove. * emulparams/avrmega603.sh: Remove. * scripttempl/elf32avr.sc: Remove. --- ld/ChangeLog | 17 +++++ ld/Makefile.am | 56 +++------------- ld/Makefile.in | 56 +++------------- ld/configure.tgt | 4 +- ld/emulparams/avr1200.sh | 13 ---- ld/emulparams/avr23xx.sh | 14 ---- ld/emulparams/avr4433.sh | 14 ---- ld/emulparams/avr44x4.sh | 14 ---- ld/emulparams/avr85xx.sh | 14 ---- ld/emulparams/avrmega103.sh | 13 ---- ld/emulparams/avrmega161.sh | 14 ---- ld/emulparams/avrmega603.sh | 13 ---- ld/scripttempl/elf32avr.sc | 151 -------------------------------------------- 13 files changed, 35 insertions(+), 358 deletions(-) delete mode 100644 ld/emulparams/avr1200.sh delete mode 100644 ld/emulparams/avr23xx.sh delete mode 100644 ld/emulparams/avr4433.sh delete mode 100644 ld/emulparams/avr44x4.sh delete mode 100644 ld/emulparams/avr85xx.sh delete mode 100644 ld/emulparams/avrmega103.sh delete mode 100644 ld/emulparams/avrmega161.sh delete mode 100644 ld/emulparams/avrmega603.sh delete mode 100644 ld/scripttempl/elf32avr.sc diff --git a/ld/ChangeLog b/ld/ChangeLog index 2024345..406538d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,20 @@ +2003-10-19 Marek Michalkiewicz + + * Makefile.am: Remove old (before GCC 3.3) emulations for AVR + target: avr1200, avr23xx, avr4433, avr44x4, avr85xx, avrmega103, + avrmega161, avrmega603. Default to avr2. + * Makefile.in: Regenerate. + * configure.tgt: Likewise. + * emulparams/avr1200.sh: Remove. + * emulparams/avr23xx.sh: Remove. + * emulparams/avr4433.sh: Remove. + * emulparams/avr44x4.sh: Remove. + * emulparams/avr85xx.sh: Remove. + * emulparams/avrmega103.sh: Remove. + * emulparams/avrmega161.sh: Remove. + * emulparams/avrmega603.sh: Remove. + * scripttempl/elf32avr.sc: Remove. + 2003-10-19 Andreas Schwab * emultempl/ticoff.em (gld_${EMULATION_NAME}_list_options): Add diff --git a/ld/Makefile.am b/ld/Makefile.am index 549c27b..106e095 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -128,16 +128,8 @@ ALL_EMULATIONS = \ earmnto.o \ earmnbsd.o \ earmpe.o \ - eavr1200.o \ - eavr23xx.o \ - eavr4433.o \ - eavr44x4.o \ - eavr85xx.o \ - eavrmega103.o \ - eavrmega161.o \ - eavrmega603.o \ - eavr1.o \ eavr2.o \ + eavr1.o \ eavr3.o \ eavr4.o \ eavr5.o \ @@ -527,58 +519,26 @@ earm_epoc_pe.c: $(srcdir)/emulparams/arm_epoc_pe.sh \ earmpe.c: $(srcdir)/emulparams/armpe.sh \ $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS} ${GENSCRIPTS} armpe "$(tdir_armpe)" -eavr85xx.c: $(srcdir)/emulparams/avr85xx.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avr85xx "$(tdir_avr85xx)" -eavr1200.c: $(srcdir)/emulparams/avr1200.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avr1200 "$(tdir_avr85xx)" -eavr23xx.c: $(srcdir)/emulparams/avr23xx.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avr23xx "$(tdir_avr85xx)" -eavr44x4.c: $(srcdir)/emulparams/avr44x4.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avr44x4 "$(tdir_avr85xx)" -eavr4433.c: $(srcdir)/emulparams/avr4433.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avr4433 "$(tdir_avr85xx)" -eavrmega603.c: $(srcdir)/emulparams/avrmega603.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avrmega603 "$(tdir_avr85xx)" -eavrmega103.c: $(srcdir)/emulparams/avrmega103.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avrmega103 "$(tdir_avr85xx)" -eavrmega161.c: $(srcdir)/emulparams/avrmega161.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avrmega161 "$(tdir_avr85xx)" -eavr1.c: $(srcdir)/emulparams/avr1.sh \ +eavr2.c: $(srcdir)/emulparams/avr2.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} - ${GENSCRIPTS} avr1 "$(tdir_avr85xx)" -eavr2.c: $(srcdir)/emulparams/avr2.sh \ + ${GENSCRIPTS} avr2 "$(tdir_avr2)" +eavr1.c: $(srcdir)/emulparams/avr1.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} - ${GENSCRIPTS} avr2 "$(tdir_avr85xx)" + ${GENSCRIPTS} avr1 "$(tdir_avr2)" eavr3.c: $(srcdir)/emulparams/avr3.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} - ${GENSCRIPTS} avr3 "$(tdir_avr85xx)" + ${GENSCRIPTS} avr3 "$(tdir_avr2)" eavr4.c: $(srcdir)/emulparams/avr4.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} - ${GENSCRIPTS} avr4 "$(tdir_avr85xx)" + ${GENSCRIPTS} avr4 "$(tdir_avr2)" eavr5.c: $(srcdir)/emulparams/avr5.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} - ${GENSCRIPTS} avr5 "$(tdir_avr85xx)" + ${GENSCRIPTS} avr5 "$(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 a12d6ed..f7201a3 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -242,16 +242,8 @@ ALL_EMULATIONS = \ earmnto.o \ earmnbsd.o \ earmpe.o \ - eavr1200.o \ - eavr23xx.o \ - eavr4433.o \ - eavr44x4.o \ - eavr85xx.o \ - eavrmega103.o \ - eavrmega161.o \ - eavrmega603.o \ - eavr1.o \ eavr2.o \ + eavr1.o \ eavr3.o \ eavr4.o \ eavr5.o \ @@ -1253,58 +1245,26 @@ earm_epoc_pe.c: $(srcdir)/emulparams/arm_epoc_pe.sh \ earmpe.c: $(srcdir)/emulparams/armpe.sh \ $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS} ${GENSCRIPTS} armpe "$(tdir_armpe)" -eavr85xx.c: $(srcdir)/emulparams/avr85xx.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avr85xx "$(tdir_avr85xx)" -eavr1200.c: $(srcdir)/emulparams/avr1200.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avr1200 "$(tdir_avr85xx)" -eavr23xx.c: $(srcdir)/emulparams/avr23xx.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avr23xx "$(tdir_avr85xx)" -eavr44x4.c: $(srcdir)/emulparams/avr44x4.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avr44x4 "$(tdir_avr85xx)" -eavr4433.c: $(srcdir)/emulparams/avr4433.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avr4433 "$(tdir_avr85xx)" -eavrmega603.c: $(srcdir)/emulparams/avrmega603.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avrmega603 "$(tdir_avr85xx)" -eavrmega103.c: $(srcdir)/emulparams/avrmega103.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avrmega103 "$(tdir_avr85xx)" -eavrmega161.c: $(srcdir)/emulparams/avrmega161.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf32avr.sc \ - ${GEN_DEPENDS} - ${GENSCRIPTS} avrmega161 "$(tdir_avr85xx)" -eavr1.c: $(srcdir)/emulparams/avr1.sh \ +eavr2.c: $(srcdir)/emulparams/avr2.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} - ${GENSCRIPTS} avr1 "$(tdir_avr85xx)" -eavr2.c: $(srcdir)/emulparams/avr2.sh \ + ${GENSCRIPTS} avr2 "$(tdir_avr2)" +eavr1.c: $(srcdir)/emulparams/avr1.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} - ${GENSCRIPTS} avr2 "$(tdir_avr85xx)" + ${GENSCRIPTS} avr1 "$(tdir_avr2)" eavr3.c: $(srcdir)/emulparams/avr3.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} - ${GENSCRIPTS} avr3 "$(tdir_avr85xx)" + ${GENSCRIPTS} avr3 "$(tdir_avr2)" eavr4.c: $(srcdir)/emulparams/avr4.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} - ${GENSCRIPTS} avr4 "$(tdir_avr85xx)" + ${GENSCRIPTS} avr4 "$(tdir_avr2)" eavr5.c: $(srcdir)/emulparams/avr5.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \ ${GEN_DEPENDS} - ${GENSCRIPTS} avr5 "$(tdir_avr85xx)" + ${GENSCRIPTS} avr5 "$(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 bc57897..c01fc6f 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -24,8 +24,8 @@ arm-*-wince) targ_emul=armpe ; arm-*-pe) targ_emul=armpe ; targ_extra_ofiles="deffilep.o pe-dll.o" ;; arc-*-elf*) targ_emul=arcelf ;; -avr-*-*) targ_emul=avr85xx - targ_extra_emuls="avr1200 avr23xx avr44x4 avr4433 avrmega603 avrmega103 avrmega161 avr1 avr2 avr3 avr4 avr5" ;; +avr-*-*) targ_emul=avr2 + targ_extra_emuls="avr1 avr3 avr4 avr5" ;; cris-*-*aout*) targ_emul=crisaout targ_extra_emuls="criself crislinux" targ_extra_libpath=$targ_extra_emuls ;; diff --git a/ld/emulparams/avr1200.sh b/ld/emulparams/avr1200.sh deleted file mode 100644 index 0bbcecd..0000000 --- a/ld/emulparams/avr1200.sh +++ /dev/null @@ -1,13 +0,0 @@ -ARCH=avr:1 -MACHINE= -SCRIPT_NAME=elf32avr -OUTPUT_FORMAT="elf32-avr" -MAXPAGESIZE=1 -EMBEDDED=yes -TEMPLATE_NAME=generic - -TEXT_LENGTH=1K -DATA_LENGTH=0 -EEPROM_LENGTH=64 -DATA_START=0x60 -STACK=0 diff --git a/ld/emulparams/avr23xx.sh b/ld/emulparams/avr23xx.sh deleted file mode 100644 index 49bd5ad..0000000 --- a/ld/emulparams/avr23xx.sh +++ /dev/null @@ -1,14 +0,0 @@ -ARCH=avr:2 -MACHINE= -SCRIPT_NAME=elf32avr -OUTPUT_FORMAT="elf32-avr" -MAXPAGESIZE=1 -EMBEDDED=yes -TEMPLATE_NAME=generic - -TEXT_LENGTH=2K -DATA_LENGTH=128 -EEPROM_LENGTH=128 -DATA_START=0x60 -STACK=0x0DF - diff --git a/ld/emulparams/avr4433.sh b/ld/emulparams/avr4433.sh deleted file mode 100644 index 0cfb471..0000000 --- a/ld/emulparams/avr4433.sh +++ /dev/null @@ -1,14 +0,0 @@ -ARCH=avr:2 -MACHINE= -SCRIPT_NAME=elf32avr -OUTPUT_FORMAT="elf32-avr" -MAXPAGESIZE=1 -EMBEDDED=yes -TEMPLATE_NAME=generic - -TEXT_LENGTH=4K -DATA_LENGTH=128 -EEPROM_LENGTH=256 -DATA_START=0x60 -STACK=0x0DF - diff --git a/ld/emulparams/avr44x4.sh b/ld/emulparams/avr44x4.sh deleted file mode 100644 index 7e9fa48..0000000 --- a/ld/emulparams/avr44x4.sh +++ /dev/null @@ -1,14 +0,0 @@ -ARCH=avr:2 -MACHINE= -SCRIPT_NAME=elf32avr -OUTPUT_FORMAT="elf32-avr" -MAXPAGESIZE=1 -EMBEDDED=yes -TEMPLATE_NAME=generic - -TEXT_LENGTH=4K -DATA_LENGTH=256 -EEPROM_LENGTH=256 -DATA_START=0x60 -STACK=0x15F - diff --git a/ld/emulparams/avr85xx.sh b/ld/emulparams/avr85xx.sh deleted file mode 100644 index f925795..0000000 --- a/ld/emulparams/avr85xx.sh +++ /dev/null @@ -1,14 +0,0 @@ -ARCH=avr:2 -MACHINE= -SCRIPT_NAME=elf32avr -OUTPUT_FORMAT="elf32-avr" -MAXPAGESIZE=1 -EMBEDDED=yes -TEMPLATE_NAME=generic - -TEXT_LENGTH=8K -DATA_LENGTH=512 -EEPROM_LENGTH=512 -DATA_START=0x60 -STACK=0x25F - diff --git a/ld/emulparams/avrmega103.sh b/ld/emulparams/avrmega103.sh deleted file mode 100644 index 5a59b35..0000000 --- a/ld/emulparams/avrmega103.sh +++ /dev/null @@ -1,13 +0,0 @@ -ARCH=avr:3 -MACHINE= -SCRIPT_NAME=elf32avr -OUTPUT_FORMAT="elf32-avr" -MAXPAGESIZE=1 -EMBEDDED=yes -TEMPLATE_NAME=generic - -TEXT_LENGTH=128K -DATA_LENGTH=4000 -EEPROM_LENGTH=4K -DATA_START=0x60 -STACK=0x0FFF diff --git a/ld/emulparams/avrmega161.sh b/ld/emulparams/avrmega161.sh deleted file mode 100644 index 2f97b72..0000000 --- a/ld/emulparams/avrmega161.sh +++ /dev/null @@ -1,14 +0,0 @@ -ARCH=avr:5 -MACHINE= -SCRIPT_NAME=elf32avr -OUTPUT_FORMAT="elf32-avr" -MAXPAGESIZE=1 -EMBEDDED=yes -TEMPLATE_NAME=generic - -TEXT_LENGTH=16K -DATA_LENGTH=1K -EEPROM_LENGTH=512 -DATA_START=0x60 -STACK=0x45F - diff --git a/ld/emulparams/avrmega603.sh b/ld/emulparams/avrmega603.sh deleted file mode 100644 index e4823fa..0000000 --- a/ld/emulparams/avrmega603.sh +++ /dev/null @@ -1,13 +0,0 @@ -ARCH=avr:3 -MACHINE= -SCRIPT_NAME=elf32avr -OUTPUT_FORMAT="elf32-avr" -MAXPAGESIZE=1 -EMBEDDED=yes -TEMPLATE_NAME=generic - -TEXT_LENGTH=64K -DATA_LENGTH=4000 -EEPROM_LENGTH=2K -DATA_START=0x60 -STACK=0x0FFF diff --git a/ld/scripttempl/elf32avr.sc b/ld/scripttempl/elf32avr.sc deleted file mode 100644 index ba9ec22..0000000 --- a/ld/scripttempl/elf32avr.sc +++ /dev/null @@ -1,151 +0,0 @@ -cat < text} - - .data ${RELOCATING-0} : ${RELOCATING+AT (ADDR (.text) + SIZEOF (.text))} - { - ${RELOCATING+ PROVIDE (__data_start = .) ; } - *(.data) - *(.gnu.linkonce.d*) - ${RELOCATING+. = ALIGN(2);} - ${RELOCATING+ _edata = . ; } - } ${RELOCATING+ > data} - - .bss ${RELOCATING+ SIZEOF(.data) + ADDR(.data)} : - { - ${RELOCATING+ PROVIDE (__bss_start = .) ; } - *(.bss) - *(COMMON) - ${RELOCATING+ PROVIDE (__bss_end = .) ; } - ${RELOCATING+ _end = . ; } - } ${RELOCATING+ > data} - - .eeprom ${RELOCATING-0}: - ${RELOCATING+AT (ADDR (.text) + SIZEOF (.text) + SIZEOF (.data))} - { - *(.eeprom*) - ${RELOCATING+ __eeprom_end = . ; } - } ${RELOCATING+ > eeprom} - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - - PROVIDE (__stack = ${STACK}) ; -} -EOF - -- 2.7.4