All m68k BSPs now build with new ELF style linkcmds.

5 files changed, 16 insertions, 73 deletions

diff --git a/c/src/lib/libbsp/m68k/gen68340/start/start.S b/c/src/lib/libbsp/m68k/gen68340/start/start.S
index 3569118a8b..471cf7ab68 100644
--- a/c/src/lib/libbsp/m68k/gen68340/start/start.S
+++ b/c/src/lib/libbsp/m68k/gen68340/start/start.S
@@ -851,14 +851,6 @@ SYM(_mainDone):
 	bra.l	SYM(_mainDone)					| Stuck forever
 
         .align 2
-	PUBLIC (_HeapSize)
-SYM (_HeapSize):
-        .long  HeapSize
-	PUBLIC (_StackSize)
-SYM (_StackSize):
-        .long  StackSize
-END_CODE
-
 BEGIN_DATA_DCL
         .align 2
 	PUBLIC (environ)
diff --git a/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.S b/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.S
index 37cd6feb29..5c9572b0fd 100644
--- a/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.S
+++ b/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.S
@@ -476,13 +476,6 @@ SYM(_mainDone):
 	bra.s	SYM(_mainDone)		| Stuck forever
 
         .align 2
-	PUBLIC (_HeapSize)
-SYM (_HeapSize):
-        .long  HeapSize
-	PUBLIC (_StackSize)
-SYM (_StackSize):
-        .long  StackSize
-END_CODE
 
 BEGIN_DATA_DCL
         .align 2
diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.in b/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.in
index 2ec8e02d72..bdba0774e6 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.in
@@ -16,8 +16,8 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
 PGM = ${ARCH}/startup.rel
 
 # C source names, if any, go here -- minus the .c
-C_PIECES = bspclean bsplibc bsppost bspstart init68340 bootcard main sbrk \
-    setvec dumpanic gnatinstallhandler
+C_PIECES = bspclean bsplibc bsppost bspstart init68340 bootcard \
+    m68kpretaskinghook main sbrk setvec dumpanic gnatinstallhandler
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c
index 2b65db460a..23f5a13bf5 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c
@@ -44,32 +44,7 @@ char *rtems_progname;
  */
 void bsp_postdriver_hook(void);
 void bsp_libc_init( void *, unsigned32, int );
-
-/*
- *  Function:   bsp_pretasking_hook
- *  Created:    95/03/10
- *
- *  Description:
- *      BSP pretasking hook.  Called just before drivers are initialized.
- *      Used to setup libc and install any BSP extensions.
- *
- *  NOTES:
- *      Must not use libc (to do io) from here, since drivers are
- *      not yet initialized.
- *
- */
- 
-void bsp_pretasking_hook(void)
-{
-    extern void *_HeapStart;
-    extern rtems_unsigned32 _HeapSize;
-
-    bsp_libc_init(&_HeapStart, _HeapSize, 0);
- 
-#ifdef RTEMS_DEBUG
-    rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
-#endif
-}
+void bsp_pretasking_hook(void);               /* m68k version */
 
 /*
  *  bsp_start
diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds
index 0a716924c1..297579ce25 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds
@@ -18,21 +18,17 @@
  */
 
 /*
- * a.out format doesn't handle prom images very well
- */
-OUTPUT_FORMAT(coff-m68k)
-
-/*
  * Declare some sizes.
  */
-RamSize = DEFINED(RamSize) ? RamSize : 4M;
-HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000;
-StackSize = DEFINED(StackSize) ? StackSize : 0x1000;
+_RamBase = 0x10000000;
+_RamSize = DEFINED(_RamSize) ? _RamSize : 4M;
+_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
+_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
 
 /*
  * 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
+ * LENGTH=_RamSize, but gld doesn't allow non-constant
  * values in the LENGTH expression.  
  */
 MEMORY {
@@ -50,11 +46,6 @@ ETHERNET_ADDRESS = DEFINED(ETHERNET_ADDRESS) ? ETHERNET_ADDRESS : 0xDEAD12;
  * Load objects
  */
 SECTIONS {
-	/*
-	 * Hardware variations
-	 */
-	_RamSize = RamSize;
-	__RamSize = RamSize;
 
         /*
          * Boot PROM
@@ -68,8 +59,7 @@ SECTIONS {
          * Dynamic RAM
          */
         ram : {
-                _RamBase = .;
-                __RamBase = .;
+                . = .;
         } >ram
 
         /*
@@ -154,27 +144,20 @@ SECTIONS {
                 PROVIDE (_copy_end = .);
         } >ram
         .bss : {
-		M68Kvec = .;
-		_M68Kvec = .;
-		. += (256 * 4);
-                PROVIDE (_bss_start = .);
-                PROVIDE (_clear_start = .);
+                M68Kvec = .;
+                . += (256 * 4);
+                _clear_start = .;
                 *(.bss)
                 *(COMMON)
                 . = ALIGN (16);
                 PROVIDE (end = .);
 
-                . += StackSize;
-                PROVIDE (_stack_init = .);
-
+                . += _StackSize;
                 . = ALIGN (16);
-                PROVIDE (_HeapStart = .);
-                . += HeapSize;
-                PROVIDE (_HeapEnd = .);
-
-                PROVIDE (_clear_end = .);
+                _stack_init = .;
+                _clear_end = .;
 
-                PROVIDE (_WorkspaceBase = .);
+                _WorkspaceBase = .;
         } >ram
 
        /*