2003-01-28 Joel Sherrill <joel@OARcorp.com>

	* startup/Makefile.am, startup/linkcmds, startup/linkcmds-le,
	startup/linkcmds-le.coff: Fix to work around truncated section names.

5 files changed, 43 insertions, 19 deletions

diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog
index 0728db49a7..23e0749d42 100644
--- a/c/src/lib/libbsp/sh/simsh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-28	Joel Sherrill <joel@OARcorp.com>
+
+	* startup/Makefile.am, startup/linkcmds, startup/linkcmds-le,
+	startup/linkcmds-le.coff: Fix to work around truncated section names.
+
 2003-01-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* wrapup/Makefile.am: Fix typo in CPU_PIECES handling.
diff --git a/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am b/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am
index 9158808a96..8648333d74 100644
--- a/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am
@@ -20,24 +20,29 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-bsplib_DATA = linkcmds
+bsplib_DATA = linkcmds linkcmds-le linkcmds-le.coff
 
-$(PROJECT_RELEASE)/lib/linkcmds: linkcmds linkcmds-le
+$(PROJECT_RELEASE)/lib/linkcmds: linkcmds
 	$(INSTALL_DATA) $< $@
 
 $(PROJECT_RELEASE)/lib/linkcmds-le: linkcmds-le
 	$(INSTALL_DATA) $< $@
 
+$(PROJECT_RELEASE)/lib/linkcmds-le.coff: linkcmds-le.coff
+	$(INSTALL_DATA) $< $@
+
 $(PGM): $(OBJS)
 	$(make-rel)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \
-                    $(PROJECT_RELEASE)/lib/linkcmds-le
+                    $(PROJECT_RELEASE)/lib/linkcmds-le \
+                    $(PROJECT_RELEASE)/lib/linkcmds-le.coff
 
 all-local: $(ARCH) $(TMPINSTALL_FILES) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
-EXTRA_DIST = bspclean.c bspstart.c hw_init.c linkcmds linkcmds-le
+EXTRA_DIST = bspclean.c bspstart.c hw_init.c linkcmds linkcmds-le \
+    linkcmds-le.coff
 
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/simsh4/startup/linkcmds b/c/src/lib/libbsp/sh/simsh4/startup/linkcmds
index e869b7016a..fec6a0ee09 100644
--- a/c/src/lib/libbsp/sh/simsh4/startup/linkcmds
+++ b/c/src/lib/libbsp/sh/simsh4/startup/linkcmds
@@ -86,10 +86,10 @@ SECTIONS
      * Special FreeBSD sysctl sections.
      */
     . = ALIGN (16);
-    __start_set_sysctl_set = .;
-    *(set_sysctl_*);
-    __stop_set_sysctl_set = ABSOLUTE(.);
-    *(set_domain_*);
+    ___start_set_sysctl_set = .;
+    *(set_sysc*);   /* set_sysctl_* but name is truncated by SH-coff */
+    ___stop_set_sysctl_set = ABSOLUTE(.);
+    *(set_doma*);   /* set_domain_* but name is truncated by SH-coff */
     *(set_pseudo_*);
 
     /* .gnu.warning sections are handled specially by elf32.em.  */
@@ -107,7 +107,11 @@ SECTIONS
   .data  .  :
   {
     *(.data)
-    *(.gcc_exc)
+    *(.gcc_exc*)
+    ___EH_FRAME_BEGIN__ = .;
+    *(.eh_fram*)
+    ___EH_FRAME_END__ = .;
+    LONG(0);
     *(.gcc_except_table)
     *(.gnu.linkonce.d*)
     CONSTRUCTORS
diff --git a/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le b/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le
index a3023c2e5f..4382173ce1 100644
--- a/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le
+++ b/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le
@@ -108,10 +108,10 @@ SECTIONS
      * Special FreeBSD sysctl sections.
      */
     . = ALIGN (16);
-    __start_set_sysctl_set = .;
-    *(set_sysctl_*);
-    __stop_set_sysctl_set = ABSOLUTE(.);
-    *(set_domain_*);
+    ___start_set_sysctl_set = .;
+    *(set_sysc*);   /* set_sysctl_* but name is truncated by SH-coff */
+    ___stop_set_sysctl_set = ABSOLUTE(.);
+    *(set_doma*);   /* set_domain_* but name is truncated by SH-coff */
     *(set_pseudo_*);
 
     /* .gnu.warning sections are handled specially by elf32.em.  */
@@ -133,12 +133,16 @@ SECTIONS
   {
     *(.data)
     *(.data.*)
+    *(.gcc_exc)
+    ___EH_FRAME_BEGIN__ = .;
+    *(.eh_fram*)
+    ___EH_FRAME_END__ = .;
+    LONG(0);
+    *(.gcc_except_table)
     *(.gnu.linkonce.d*)
     SORT(CONSTRUCTORS)
   } > ram
   .data1   : { *(.data1) } > ram
-  .eh_frame : { *(.eh_frame) } > ram
-  .gcc_except_table : { *(.gcc_except_table) } > ram
   .ctors   : 
   {
     ___ctors = .;
diff --git a/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le.coff b/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le.coff
index f461121230..928bc93bf1 100644
--- a/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le.coff
+++ b/c/src/lib/libbsp/sh/simsh4/startup/linkcmds-le.coff
@@ -85,10 +85,10 @@ SECTIONS
      * Special FreeBSD sysctl sections.
      */
     . = ALIGN (16);
-    __start_set_sysctl_set = .;
-    *(set_sysctl_*);
-    __stop_set_sysctl_set = ABSOLUTE(.);
-    *(set_domain_*);
+    ___start_set_sysctl_set = .;
+    *(set_sysc*);   /* set_sysctl_* but name is truncated by SH-coff */
+    ___stop_set_sysctl_set = ABSOLUTE(.);
+    *(set_doma*);   /* set_domain_* but name is truncated by SH-coff */
     *(set_pseudo_*);
 
     /* .gnu.warning sections are handled specially by elf32.em.  */
@@ -106,6 +106,12 @@ SECTIONS
   .data  .  :
   {
     *(.data)
+    *(.gcc_exc)
+    ___EH_FRAME_BEGIN__ = .;
+    *(.eh_fram*)
+    ___EH_FRAME_END__ = .;
+    LONG(0);
+    *(.gcc_except_table)
     *(.gnu.linkonce.d*)
     CONSTRUCTORS
   } > ram