mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2025-12-05 15:15:44 +00:00
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.
This commit is contained in:
@@ -71,8 +71,6 @@ SECTIONS {
|
||||
CREATE_OBJECT_SYMBOLS
|
||||
*(.text)
|
||||
. = ALIGN (16);
|
||||
etext = .;
|
||||
_etext = .;
|
||||
|
||||
/*
|
||||
* C++ constructors
|
||||
@@ -87,6 +85,9 @@ SECTIONS {
|
||||
*(.dtors)
|
||||
LONG(0)
|
||||
__DTOR_END__ = .;
|
||||
|
||||
etext = .;
|
||||
_etext = .;
|
||||
} >ram
|
||||
.data : {
|
||||
copy_start = .;
|
||||
|
||||
@@ -76,8 +76,6 @@ SECTIONS {
|
||||
CREATE_OBJECT_SYMBOLS
|
||||
*(.text)
|
||||
. = ALIGN (16);
|
||||
etext = .;
|
||||
_etext = .;
|
||||
|
||||
/*
|
||||
* C++ constructors
|
||||
@@ -92,6 +90,9 @@ SECTIONS {
|
||||
*(.dtors)
|
||||
LONG(0)
|
||||
__DTOR_END__ = .;
|
||||
|
||||
etext = .;
|
||||
_etext = .;
|
||||
} >rom
|
||||
.data : AT(SIZEOF(.text)) {
|
||||
copy_start = .;
|
||||
|
||||
@@ -32,13 +32,6 @@ RamSize = DEFINED(RamSize) ? RamSize : 4M;
|
||||
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
|
||||
@@ -56,15 +49,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
|
||||
*/
|
||||
@@ -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 = .;
|
||||
|
||||
Reference in New Issue
Block a user