+2003-10-19 Marek Michalkiewicz <marekm@amelek.gda.pl>
+
+ * 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 <schwab@suse.de>
* emultempl/ticoff.em (gld_${EMULATION_NAME}_list_options): Add
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 \
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)"
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 \
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)"
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 ;;
+++ /dev/null
-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
+++ /dev/null
-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
-
+++ /dev/null
-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
-
+++ /dev/null
-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
-
+++ /dev/null
-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
-
+++ /dev/null
-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
+++ /dev/null
-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
-
+++ /dev/null
-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
+++ /dev/null
-cat <<EOF
-OUTPUT_FORMAT("${OUTPUT_FORMAT}","${OUTPUT_FORMAT}","${OUTPUT_FORMAT}")
-OUTPUT_ARCH(${ARCH})
-
-MEMORY
-{
- text (rx) : ORIGIN = 0, LENGTH = $TEXT_LENGTH
- data (rw!x) : ORIGIN = (0x800000 + $DATA_START), LENGTH = $DATA_LENGTH
- eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = $EEPROM_LENGTH
-}
-
-SECTIONS
-{
- /* Read-only sections, merged into text segment: */
- ${TEXT_DYNAMIC+${DYNAMIC}}
- .hash ${RELOCATING-0} : { *(.hash) }
- .dynsym ${RELOCATING-0} : { *(.dynsym) }
- .dynstr ${RELOCATING-0} : { *(.dynstr) }
- .gnu.version ${RELOCATING-0} : { *(.gnu.version) }
- .gnu.version_d ${RELOCATING-0} : { *(.gnu.version_d) }
- .gnu.version_r ${RELOCATING-0} : { *(.gnu.version_r) }
-
- .rel.init ${RELOCATING-0} : { *(.rel.init) }
- .rela.init ${RELOCATING-0} : { *(.rela.init) }
- .rel.text ${RELOCATING-0} :
- {
- *(.rel.text)
- ${RELOCATING+*(.rel.text.*)}
- ${RELOCATING+*(.rel.gnu.linkonce.t*)}
- }
- .rela.text ${RELOCATING-0} :
- {
- *(.rela.text)
- ${RELOCATING+*(.rela.text.*)}
- ${RELOCATING+*(.rela.gnu.linkonce.t*)}
- }
- .rel.fini ${RELOCATING-0} : { *(.rel.fini) }
- .rela.fini ${RELOCATING-0} : { *(.rela.fini) }
- .rel.rodata ${RELOCATING-0} :
- {
- *(.rel.rodata)
- ${RELOCATING+*(.rel.rodata.*)}
- ${RELOCATING+*(.rel.gnu.linkonce.r*)}
- }
- .rela.rodata ${RELOCATING-0} :
- {
- *(.rela.rodata)
- ${RELOCATING+*(.rela.rodata.*)}
- ${RELOCATING+*(.rela.gnu.linkonce.r*)}
- }
- .rel.data ${RELOCATING-0} :
- {
- *(.rel.data)
- ${RELOCATING+*(.rel.data.*)}
- ${RELOCATING+*(.rel.gnu.linkonce.d*)}
- }
- .rela.data ${RELOCATING-0} :
- {
- *(.rela.data)
- ${RELOCATING+*(.rela.data.*)}
- ${RELOCATING+*(.rela.gnu.linkonce.d*)}
- }
- .rel.ctors ${RELOCATING-0} : { *(.rel.ctors) }
- .rela.ctors ${RELOCATING-0} : { *(.rela.ctors) }
- .rel.dtors ${RELOCATING-0} : { *(.rel.dtors) }
- .rela.dtors ${RELOCATING-0} : { *(.rela.dtors) }
- .rel.got ${RELOCATING-0} : { *(.rel.got) }
- .rela.got ${RELOCATING-0} : { *(.rela.got) }
- .rel.bss ${RELOCATING-0} : { *(.rel.bss) }
- .rela.bss ${RELOCATING-0} : { *(.rela.bss) }
- .rel.plt ${RELOCATING-0} : { *(.rel.plt) }
- .rela.plt ${RELOCATING-0} : { *(.rela.plt) }
-
- /* Internal text space or external memory */
- .text :
- {
- *(.init)
- *(.progmem.gcc*)
- *(.progmem*)
- ${RELOCATING+. = ALIGN(2);}
- *(.text)
- ${RELOCATING+. = ALIGN(2);}
- *(.text.*)
- ${RELOCATING+. = ALIGN(2);}
- *(.fini)
- ${RELOCATING+ _etext = . ; }
- } ${RELOCATING+ > 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
-