Switch over to using generic elf script rather than an fr30 specific one.

4 files changed, 25 insertions, 150 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index f5b565a..ce41657 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+1999-01-12  Nick Clifton  <nickc@cygnus.com>
+
+	* Makefile.am: Replace efr30.o with eelf32fr30.o.
+	* Makefile.in: Regenerate.
+
+	* configure.tgt: Replace fr30 with elf32fr30.
+
+	* emulparams/elf32fr30.sh: New file: Replaces fr30.sh, and uses
+	generic elf.sc script.
+
 1999-01-11  Nick Clifton  <nickc@cygnus.com>
 
 	* scripttempl/fr30.sc: Fill .init and .fini sections with NOP
diff --git a/ld/emulparams/elf32fr30.sh b/ld/emulparams/elf32fr30.sh
new file mode 100755
index 0000000..3b517aa
--- /dev/null
+++ b/ld/emulparams/elf32fr30.sh
@@ -0,0 +1,15 @@
+MACHINE=
+SCRIPT_NAME=elf
+OUTPUT_FORMAT="elf32-fr30"
+TEXT_START_ADDR=0x10000
+ARCH=fr30
+MAXPAGESIZE=256
+ENTRY=_start
+EMBEDDED=yes
+NOP=0x9fa0
+OTHER_SECTIONS='
+  .stack 0x200000 : {
+    *(.stack)
+    __stack = .;
+  }
+'
\ No newline at end of file
diff --git a/ld/emulparams/fr30.sh b/ld/emulparams/fr30.sh
deleted file mode 100755
index 8bf084c..0000000
--- a/ld/emulparams/fr30.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-MACHINE=
-SCRIPT_NAME=fr30
-OUTPUT_FORMAT="elf32-fr30"
-TEXT_START_ADDR=0x10000
-ZDATA_START_ADDR=0x160
-ROZDATA_START_ADDR="ALIGN (4)"
-SDATA_START_ADDR="ALIGN (4)"
-ROSDATA_START_ADDR="ALIGN (4)"
-TDATA_START_ADDR="ALIGN (4)"
-CALL_TABLE_START_ADDR="ALIGN (4)"
-ARCH=fr30
-MAXPAGESIZE=256
-ENTRY=_start
-EMBEDDED=yes
diff --git a/ld/scripttempl/fr30.sc b/ld/scripttempl/fr30.sc
deleted file mode 100644
index 1bae594..0000000
--- a/ld/scripttempl/fr30.sc
+++ /dev/null
@@ -1,136 +0,0 @@
-cat << EOF
-OUTPUT_FORMAT("elf32-fr30", "elf32-fr30",
-	      "elf32-fr30")
-OUTPUT_ARCH(fr30)
-ENTRY(_start)
-SEARCH_DIR(.);
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = ${TEXT_START_ADDR};
-  .interp	: { *(.interp) }
-  .hash		: { *(.hash) }
-  .dynsym	: { *(.dynsym) }
-  .dynstr	: { *(.dynstr) }
-  .rel.text	: { *(.rel.text) }
-  .rela.text	: { *(.rela.text) }
-  .rel.data	: { *(.rel.data) }
-  .rela.data	: { *(.rela.data) }
-  .rel.rodata	: { *(.rel.rodata) }
-  .rela.rodata	: { *(.rela.rodata) }
-  .rel.got	: { *(.rel.got) }
-  .rela.got	: { *(.rela.got) }
-  .rel.ctors	: { *(.rel.ctors) }
-  .rela.ctors	: { *(.rela.ctors) }
-  .rel.dtors	: { *(.rel.dtors) }
-  .rela.dtors	: { *(.rela.dtors) }
-  .rel.init	: { *(.rel.init) }
-  .rela.init	: { *(.rela.init) }
-  .rel.fini	: { *(.rel.fini) }
-  .rela.fini	: { *(.rela.fini) }
-  .rel.bss	: { *(.rel.bss) }
-  .rela.bss	: { *(.rela.bss) }
-  .rel.plt	: { *(.rel.plt) }
-  .rela.plt	: { *(.rela.plt) }
-  .init		: { KEEP (*(.init)) } =0x9fa0
-  .plt		: { *(.plt) }
-
-  .text		: {
-    *(.text)
-    ${RELOCATING+*(.text.*)}
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t*)
-  } =0
-
-  ${RELOCATING+_etext = .;}
-  ${RELOCATING+PROVIDE (etext = .);}
-
-  .fini		: { KEEP (*(.fini)) } =0x9fa0
-  .rodata	: { *(.rodata) ${RELOCATING+*(.rodata.*)} *(.gnu.linkonce.r*) }
-  .rodata1	: { *(.rodata1) }
-
-  .data		: {
-    *(.data)
-    ${RELOCATING+*(.data.*)}
-    *(.gnu.linkonce.d*)
-    CONSTRUCTORS
-  }
-  .data1	: { *(.data1) }
-  .ctors	: {
-    ${RELOCATING+___ctors = .;}
-    KEEP (*(.ctors))
-    ${RELOCATING+___ctors_end = .;}
-  }
-
-  .dtors	: {
-    ${RELOCATING+___dtors = .;}
-    KEEP (*(.dtors))
-    ${RELOCATING+___dtors_end = .;}
-  }
-
-  .got		: { *(.got.plt) *(.got) }
-  .dynamic	: { *(.dynamic) }
-
-  ${RELOCATING+_edata  = . ;}
-  ${RELOCATING+PROVIDE (edata = _edata);}
-
-  .bss       :
-  {
-	${RELOCATING+__bss_start = . ;}
-	*(.dynbss)
-	*(.bss)
-	*(COMMON)
-  }
-
-  ${RELOCATING+_end = . ;}
-  ${RELOCATING+PROVIDE (end = .);}
-
-  /* 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) }
-  .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) }
-
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0	: { *(.debug_weaknames) }
-  .debug_funcnames 0	: { *(.debug_funcnames) }
-  .debug_typenames 0	: { *(.debug_typenames) }
-  .debug_varnames  0	: { *(.debug_varnames) }
-
-  /* User stack */
-  .stack 0x200000	: {
-	${RELOCATING+__stack = .;}
-	*(.stack)
-  }
-  /* These must appear regardless of  .  */
-}
-EOF