Fixes from Eric Norum. C++ support added in previous version was broken:

   1) In my haste to add C++ constructor/destructors to the 68360
   linkcmds scripts I managed to break all existing 68360 programs.
   Linker scripts which actually produce a working executable are
   contained below.  The problem was that the constructor/destructors
   weren't included before the etext symbol.

On top of that Eric and I appear to have problems with attachments:

   2) In deciphering the above problem I think I stumbled across the
   reason you've had with patches mailed from me.  I noticed that the
   linkcmds (and linkcmds.bootp) scripts in the latest distribution have
   a control-M (carriage return) at the end of each line.  Could you
   check the files below before installing them in the distribution and
   see that there aren't returns in the files?  Maybe if I send
   everything as a tar attatchment things will work better.

1 files changed, 3 insertions, 24 deletions

diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.prom b/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.prom
index 1d5db6006b..b01a99cd0a 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.prom
+++ b/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.prom
@@ -33,13 +33,6 @@ HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000;
 StackSize = DEFINED(StackSize) ? StackSize : 0x1000;
 
 /*
- * Declare hardware type
- */
-MC68360HardwareTypeMotorolaGeneric = 0; 
-MC68360HardwareTypeAtlasHSB = 1; 
-MC68360HardwareType = DEFINED(MC68360HardwareType) ? MC68360HardwareType : 0;
-
-/*
  * Declare on-board memory.
  * It would be nice if the ram length could be given as
  * LENGTH=RamSize, but gld doesn't allow non-constant
@@ -57,15 +50,6 @@ MEMORY {
 ETHERNET_ADDRESS = DEFINED(ETHERNET_ADDRESS) ? ETHERNET_ADDRESS : 0xDEAD12;
 
 /*
- * Declare hardware type.
- * Acceptable values are:
- *	0 - Generic system as described in the MC68360 User's Manual
- *	    (MC68360UM/AD Rev. 1).
- *	1 - ATLAS Computer Equipment Incorporated ACE360/HSB.
- */
-MC68360HardwareType = DEFINED(MC68360HardwareType) ? MC68360HardwareType : 0;
-
-/*
  * Load objects
  */
 SECTIONS {
@@ -74,12 +58,6 @@ SECTIONS {
 	 */
 	_RamSize = RamSize;
 	__RamSize = RamSize;
-	_MC68360HardwareType = MC68360HardwareType;
-	__MC68360HardwareType = MC68360HardwareType;
-	_MC68360HardwareTypeMotorolaGeneric = MC68360HardwareTypeMotorolaGeneric; 
-	__MC68360HardwareTypeMotorolaGeneric = MC68360HardwareTypeMotorolaGeneric; 
-	_MC68360HardwareTypeAtlasHSB = MC68360HardwareTypeAtlasHSB; 
-	__MC68360HardwareTypeAtlasHSB = MC68360HardwareTypeAtlasHSB; 
 
         /*
          * Boot PROM
@@ -104,8 +82,6 @@ SECTIONS {
                 CREATE_OBJECT_SYMBOLS
                 *(.text)
                 . = ALIGN (16);
-                etext = .;
-                _etext = .;
 
 		/*
 		 * C++ constructors
@@ -120,6 +96,9 @@ SECTIONS {
 		*(.dtors)
 		LONG(0)
 		__DTOR_END__ = .;
+
+                etext = .;
+                _etext = .;
         } >rom 
         .data : {
                 copy_start = .;