1 files changed, 63 insertions, 36 deletions

diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds
index 833af57579..da4bcd7295 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds
@@ -13,9 +13,6 @@
 
 /*
  * Declare some sizes.
- * XXX: The assignment of ". += XyzSize;" fails in older gld's if the
- *      number used there is not constant.  If this happens to you, edit
- *      the lines marked XXX below to use a constant value.
  */
 HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000;
 StackSize = DEFINED(StackSize) ? StackSize : 0x1000;
@@ -38,7 +35,6 @@ SECTIONS {
          */
         rom : {
                 _RomBase = .;
-                __RomBase = .;
         } >rom
 
         /*
@@ -46,55 +42,87 @@ SECTIONS {
          */
         ram : {
                 _RamBase = .;
-                __RamBase = .;
         } >ram
 
         /*
          * Text, data and bss segments
          */
         .text : {
-                CREATE_OBJECT_SYMBOLS
                 *(.text)
-                . = ALIGN (16);
 
+		/*
+		 * C++ constructors/destructors
+		 */
 		*(.gnu.linkonce.t.*)
-		*(.descriptors)
-		/* .gnu.warning sections are handled specially by elf32.em.  */
-		*(.gnu.warning)
 
-		*(.eh_fram)
-		. = ALIGN (16);
+		/*
+		 * Initialization and finalization code.
+     		 *
+     		 * Various files can provide initialization and finalization
+		 * functions.  crtbegin.o and crtend.o are two instances. The
+		 * body of these functions are in .init and .fini sections. We
+		 * accumulate the bodies here, and prepend function prologues
+		 * from crti.o and function epilogues from crtn.o. crti.o must
+		 * be linked first; crtn.o must be linked last.  Because these
+		 * are wildcards, it doesn't matter if the user does not
+		 * actually link against crti.o and crtn.o; the linker won't
+		 * look for a file to match a wildcard.  The wildcard also
+		 * means that it doesn't matter which directory crti.o and
+		 * crtn.o are in. 
+		 */
+		PROVIDE (_init = .);
+		*crti.o(.init)
+		*(.init)
+		*crtn.o(.init)
+		PROVIDE (_fini = .);
+		*crti.o(.fini)
+		*(.fini)
+		*crtn.o(.fini)
 
-		*(.gcc_exc)
 		/*
-		 * C++ constructors
+		 * C++ constructors/destructors
+     		 *
+     		 * gcc uses crtbegin.o to find the start of the constructors
+		 * and destructors so we make sure it is first.  Because this
+		 * is a wildcard, it doesn't matter if the user does not
+		 * actually link against crtbegin.o; the linker won't look for
+		 * a file to match a wildcard.  The wildcard also means that
+		 * it doesn't matter which directory crtbegin.o is in. The
+		 * constructor and destructor list are terminated in
+		 * crtend.o.  The same comments apply to it.
 		 */
-		__CTOR_LIST__ = .;
-		LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2)
+		. = ALIGN (16);
+		*crtbegin.o(.ctors)
 		*(.ctors)
-		LONG(0)
-		__CTOR_END__ = .;
-		__DTOR_LIST__ = .;
-		LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2)
+		*crtend.o(.ctors)
+		*crtbegin.o(.dtors)
 		*(.dtors)
-		LONG(0)
-		__DTOR_END__ = .;
+		*crtend.o(.dtors)
+
+		/*
+		 * Exception frame info
+		 */
+		. = ALIGN (16);
+		*(.eh_frame)
 
+		/*
+		 * Read-only data
+		 */
+		. = ALIGN (16);
 		_rodata_start = . ;
 		*(.rodata)
 		*(.gnu.linkonce.r*)
 
                  . = ALIGN (16);
-                etext = .;
-                _etext = .;
-        } >ram 
+                PROVIDE (etext = .);
+        } >ram
         .data : {
                 copy_start = .;
                 *(.data)
 		*(.gnu.linkonce.d*)
 		*(.gcc_except_table)
                 . = ALIGN (16);
-                _edata = .;
+                PROVIDE (_edata = .);
                 copy_end = .;
         } >ram
         .bss : {
@@ -105,20 +133,19 @@ SECTIONS {
                 *(.bss)
                 *(COMMON)
                 . = ALIGN (16);
-                _end = .;
-
-                _HeapStart = .;
-                __HeapStart = .;
-                . += HeapSize;  /* XXX -- Old gld can't handle this */
-                . += StackSize; /* XXX -- Old gld can't handle this */
-                /* . += 0x10000; */ /* HeapSize for old gld */
-                /* . += 0x1000;  */ /* StackSize for old gld */
+                PROVIDE (end = .);
+
+                . += StackSize;
+                PROVIDE (_stack_init = .);
+
                 . = ALIGN (16);
-                stack_init = .;
+                PROVIDE (_HeapStart = .);
+                . += HeapSize;
+                PROVIDE (_HeapEnd = .);
+
                 clear_end = .;
 
                 _WorkspaceBase = .;
-                __WorkspaceBase = .;
         } >ram
 
         /*