Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Joel Sherrill
1997-12-22 18:23:58 +00:00
parent 608641e6d2
commit c257ec4eb4
3 changed files with 272 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

263
c/src/lib/libbsp/m68k/gen68360/startup/linkcmds
View File

@@ -1,131 +1,132 @@
/* /*
* This file contains GNU linker directives for a generic MC68360 board. * This file contains GNU linker directives for a generic MC68360 board.
* Variations in memory size and allocation can be made by * Variations in memory size and allocation can be made by
* overriding some values with linker command-line arguments. * overriding some values with linker command-line arguments.
* *
* Saskatchewan Accelerator Laboratory * Saskatchewan Accelerator Laboratory
* University of Saskatchewan * University of Saskatchewan
* Saskatoon, Saskatchewan, CANADA * Saskatoon, Saskatchewan, CANADA
* eric@skatter.usask.ca * eric@skatter.usask.ca
* *
* $Id$ * $Id$
*/ */
/* /*
* Declare some sizes. * Declare some sizes.
* XXX: The assignment of ". += XyzSize;" fails in older gld's if the * XXX: The assignment of ". += XyzSize;" fails in older gld's if the
* number used there is not constant. If this happens to you, edit * number used there is not constant. If this happens to you, edit
* the lines marked XXX below to use a constant value. * the lines marked XXX below to use a constant value.
*/ */
RamSize = DEFINED(RamSize) ? RamSize : 4M; RamSize = DEFINED(RamSize) ? RamSize : 4M;
HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000;
StackSize = DEFINED(StackSize) ? StackSize : 0x1000; StackSize = DEFINED(StackSize) ? StackSize : 0x1000;
/* /*
* Declare on-board memory. * Declare on-board memory.
* It would be nice if the ram length could be given as * 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. * values in the LENGTH expression.
*/ */
MEMORY { MEMORY {
ram : ORIGIN = 0x00000000, LENGTH = 64M ram : ORIGIN = 0x00000000, LENGTH = 64M
rom : ORIGIN = 0x0F000000, LENGTH = 1M rom : ORIGIN = 0x0F000000, LENGTH = 1M
dpram : ORIGIN = 0x0E000000, LENGTH = 8k dpram : ORIGIN = 0x0E000000, LENGTH = 8k
} }
/* /*
* Declare low-order three octets of Ethernet address. * Declare low-order three octets of Ethernet address.
*/ */
ETHERNET_ADDRESS = DEFINED(ETHERNET_ADDRESS) ? ETHERNET_ADDRESS : 0xDEAD12; ETHERNET_ADDRESS = DEFINED(ETHERNET_ADDRESS) ? ETHERNET_ADDRESS : 0xDEAD12;
/* /*
* Load objects * Load objects
*/ */
SECTIONS { SECTIONS {
/* /*
* Hardware variations * Hardware variations
*/ */
_RamSize = RamSize; _RamSize = RamSize;
__RamSize = RamSize; __RamSize = RamSize;
/* /*
* Boot PROM * Boot PROM
*/ */
rom : { rom : {
_RomBase = .; _RomBase = .;
__RomBase = .; __RomBase = .;
} >rom } >rom
/* /*
* Dynamic RAM * Dynamic RAM
*/ */
ram : { ram : {
_RamBase = .; _RamBase = .;
__RamBase = .; __RamBase = .;
} >ram } >ram
/* /*
* Text, data and bss segments * Text, data and bss segments
*/ */
.text : { .text : {
CREATE_OBJECT_SYMBOLS CREATE_OBJECT_SYMBOLS
*(.text) *(.text)
. = ALIGN (16); . = ALIGN (16);
etext = .;
_etext = .; /*
* C++ constructors
/* */
* C++ constructors __CTOR_LIST__ = .;
*/ LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2)
__CTOR_LIST__ = .; *(.ctors)
LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) LONG(0)
*(.ctors) __CTOR_END__ = .;
LONG(0) __DTOR_LIST__ = .;
__CTOR_END__ = .; LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2)
__DTOR_LIST__ = .; *(.dtors)
LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) LONG(0)
*(.dtors) __DTOR_END__ = .;
LONG(0)
__DTOR_END__ = .; etext = .;
} >ram _etext = .;
.data : { } >ram
copy_start = .; .data : {
*(.data) copy_start = .;
. = ALIGN (16); *(.data)
_edata = .; . = ALIGN (16);
copy_end = .; _edata = .;
} >ram copy_end = .;
.bss : { } >ram
M68Kvec = .; .bss : {
_M68Kvec = .; M68Kvec = .;
. += (256 * 4); _M68Kvec = .;
clear_start = .; . += (256 * 4);
*(.bss) clear_start = .;
*(COMMON) *(.bss)
. = ALIGN (16); *(COMMON)
_end = .; . = ALIGN (16);
_end = .;
_HeapStart = .;
__HeapStart = .; _HeapStart = .;
. += HeapSize; /* XXX -- Old gld can't handle this */ __HeapStart = .;
. += StackSize; /* XXX -- Old gld can't handle this */ . += HeapSize; /* XXX -- Old gld can't handle this */
/* . += 0x10000; */ /* HeapSize for old gld */ . += StackSize; /* XXX -- Old gld can't handle this */
/* . += 0x1000; */ /* StackSize for old gld */ /* . += 0x10000; */ /* HeapSize for old gld */
. = ALIGN (16); /* . += 0x1000; */ /* StackSize for old gld */
stack_init = .; . = ALIGN (16);
clear_end = .; stack_init = .;
clear_end = .;
_WorkspaceBase = .;
__WorkspaceBase = .; _WorkspaceBase = .;
} >ram __WorkspaceBase = .;
} >ram
/*
* On-chip memory/peripherals /*
*/ * On-chip memory/peripherals
dpram : { */
m360 = .; dpram : {
_m360 = .; m360 = .;
. += (8 * 1024); _m360 = .;
. += (8 * 1024);
} >dpram
} } >dpram
}

273
c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.bootp
View File

@@ -1,136 +1,137 @@
/* /*
* This file contains GNU linker directives for a generic MC68360 board. * This file contains GNU linker directives for a generic MC68360 board.
* Variations in hardware type and dynamic memory size can be made * Variations in hardware type and dynamic memory size can be made
* by overriding some values with linker command-line arguments. * by overriding some values with linker command-line arguments.
* *
* These linker directives are for producing a PROM version. * These linker directives are for producing a PROM version.
* The data segment is placed at the end of the text segment in the PROM. * The data segment is placed at the end of the text segment in the PROM.
* The start-up code takes care of copying this region to RAM. * The start-up code takes care of copying this region to RAM.
* *
* Saskatchewan Accelerator Laboratory * Saskatchewan Accelerator Laboratory
* University of Saskatchewan * University of Saskatchewan
* Saskatoon, Saskatchewan, CANADA * Saskatoon, Saskatchewan, CANADA
* eric@skatter.usask.ca * eric@skatter.usask.ca
* *
* $Id$ * $Id$
*/ */
/* /*
* Declare some sizes. * Declare some sizes.
* XXX: The assignment of ". += XyzSize;" fails in older gld's if the * XXX: The assignment of ". += XyzSize;" fails in older gld's if the
* number used there is not constant. If this happens to you, edit * number used there is not constant. If this happens to you, edit
* the lines marked XXX below to use a constant value. * the lines marked XXX below to use a constant value.
*/ */
RamSize = DEFINED(RamSize) ? RamSize : 4M; RamSize = DEFINED(RamSize) ? RamSize : 4M;
HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000;
StackSize = DEFINED(StackSize) ? StackSize : 0x1000; StackSize = DEFINED(StackSize) ? StackSize : 0x1000;
/* /*
* Declare on-board memory. * Declare on-board memory.
* It would be nice if the ram length could be given as * 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. * values in the LENGTH expression.
*/ */
MEMORY { MEMORY {
ram : ORIGIN = 0x00000000, LENGTH = 64M ram : ORIGIN = 0x00000000, LENGTH = 64M
myram : ORIGIN = 4M-512k, LENGTH = 512k myram : ORIGIN = 4M-512k, LENGTH = 512k
rom : ORIGIN = 0x0F000000, LENGTH = 1M rom : ORIGIN = 0x0F000000, LENGTH = 1M
dpram : ORIGIN = 0x0E000000, LENGTH = 8k dpram : ORIGIN = 0x0E000000, LENGTH = 8k
} }
/* /*
* Declare low-order three octets of Ethernet address. * Declare low-order three octets of Ethernet address.
*/ */
ETHERNET_ADDRESS = DEFINED(ETHERNET_ADDRESS) ? ETHERNET_ADDRESS : 0xDEAD12; ETHERNET_ADDRESS = DEFINED(ETHERNET_ADDRESS) ? ETHERNET_ADDRESS : 0xDEAD12;
/* /*
* Load objects * Load objects
*/ */
SECTIONS { SECTIONS {
/* /*
* Hardware variations * Hardware variations
*/ */
_RamSize = RamSize; _RamSize = RamSize;
__RamSize = RamSize; __RamSize = RamSize;
/* /*
* Boot PROM * Boot PROM
*/ */
rom : { rom : {
_RomBase = .; _RomBase = .;
__RomBase = .; __RomBase = .;
} >rom } >rom
/* /*
* Dynamic RAM * Dynamic RAM
*/ */
ram : { ram : {
_RamBase = .; _RamBase = .;
__RamBase = .; __RamBase = .;
} >ram } >ram
/* /*
* Text, data and bss segments * Text, data and bss segments
*/ */
.text : AT (0x00000000) { .text : AT (0x00000000) {
CREATE_OBJECT_SYMBOLS CREATE_OBJECT_SYMBOLS
*(.text) *(.text)
. = ALIGN (16); . = ALIGN (16);
etext = .;
_etext = .; /*
* C++ constructors
/* */
* C++ constructors __CTOR_LIST__ = .;
*/ LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2)
__CTOR_LIST__ = .; *(.ctors)
LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) LONG(0)
*(.ctors) __CTOR_END__ = .;
LONG(0) __DTOR_LIST__ = .;
__CTOR_END__ = .; LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2)
__DTOR_LIST__ = .; *(.dtors)
LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) LONG(0)
*(.dtors) __DTOR_END__ = .;
LONG(0)
__DTOR_END__ = .; etext = .;
} >rom _etext = .;
.data : AT(SIZEOF(.text)) { } >rom
copy_start = .; .data : AT(SIZEOF(.text)) {
*(.data) copy_start = .;
. = ALIGN (16); *(.data)
_edata = .; . = ALIGN (16);
copy_end = .; _edata = .;
} >myram copy_end = .;
.bss : { } >myram
M68Kvec = .; .bss : {
_M68Kvec = .; M68Kvec = .;
. += (256 * 4); _M68Kvec = .;
clear_start = .; . += (256 * 4);
*(.bss) clear_start = .;
*(COMMON) *(.bss)
. = ALIGN (16); *(COMMON)
_end = .; . = ALIGN (16);
_end = .;
_HeapStart = .;
__HeapStart = .; _HeapStart = .;
. += HeapSize; /* XXX -- Old gld can't handle this */ __HeapStart = .;
. += StackSize; /* XXX -- Old gld can't handle this */ . += HeapSize; /* XXX -- Old gld can't handle this */
/* . += 0x10000; */ /* HeapSize for old gld */ . += StackSize; /* XXX -- Old gld can't handle this */
/* . += 0x1000; */ /* StackSize for old gld */ /* . += 0x10000; */ /* HeapSize for old gld */
. = ALIGN (16); /* . += 0x1000; */ /* StackSize for old gld */
stack_init = .; . = ALIGN (16);
clear_end = .; stack_init = .;
clear_end = .;
_WorkspaceBase = .;
__WorkspaceBase = .; _WorkspaceBase = .;
} >myram __WorkspaceBase = .;
} >myram
/*
* On-chip memory/peripherals /*
*/ * On-chip memory/peripherals
dpram : { */
m360 = .; dpram : {
_m360 = .; m360 = .;
. += (8 * 1024); _m360 = .;
. += (8 * 1024);
} >dpram
} } >dpram
}

27
c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.prom
View File

@@ -32,13 +32,6 @@ RamSize = DEFINED(RamSize) ? RamSize : 4M;
HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000;
StackSize = DEFINED(StackSize) ? StackSize : 0x1000; StackSize = DEFINED(StackSize) ? StackSize : 0x1000;
/*
* Declare hardware type
*/
MC68360HardwareTypeMotorolaGeneric = 0;
MC68360HardwareTypeAtlasHSB = 1;
MC68360HardwareType = DEFINED(MC68360HardwareType) ? MC68360HardwareType : 0;
/* /*
* Declare on-board memory. * Declare on-board memory.
* It would be nice if the ram length could be given as * It would be nice if the ram length could be given as
@@ -56,15 +49,6 @@ MEMORY {
*/ */
ETHERNET_ADDRESS = DEFINED(ETHERNET_ADDRESS) ? ETHERNET_ADDRESS : 0xDEAD12; 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 * Load objects
*/ */
@@ -74,12 +58,6 @@ SECTIONS {
*/ */
_RamSize = RamSize; _RamSize = RamSize;
__RamSize = RamSize; __RamSize = RamSize;
_MC68360HardwareType = MC68360HardwareType;
__MC68360HardwareType = MC68360HardwareType;
_MC68360HardwareTypeMotorolaGeneric = MC68360HardwareTypeMotorolaGeneric;
__MC68360HardwareTypeMotorolaGeneric = MC68360HardwareTypeMotorolaGeneric;
_MC68360HardwareTypeAtlasHSB = MC68360HardwareTypeAtlasHSB;
__MC68360HardwareTypeAtlasHSB = MC68360HardwareTypeAtlasHSB;
/* /*
* Boot PROM * Boot PROM
@@ -104,8 +82,6 @@ SECTIONS {
CREATE_OBJECT_SYMBOLS CREATE_OBJECT_SYMBOLS
*(.text) *(.text)
. = ALIGN (16); . = ALIGN (16);
etext = .;
_etext = .;
/* /*
* C++ constructors * C++ constructors
@@ -120,6 +96,9 @@ SECTIONS {
*(.dtors) *(.dtors)
LONG(0) LONG(0)
__DTOR_END__ = .; __DTOR_END__ = .;
etext = .;
_etext = .;
} >rom } >rom
.data : { .data : {
copy_start = .; copy_start = .;