diff options
26 files changed, 1420 insertions, 761 deletions
diff --git a/c/src/lib/libbsp/m68k/dmv152/bsp_specs b/c/src/lib/libbsp/m68k/dmv152/bsp_specs index 61dac86b53..078f4054fb 100644 --- a/c/src/lib/libbsp/m68k/dmv152/bsp_specs +++ b/c/src/lib/libbsp/m68k/dmv152/bsp_specs @@ -16,8 +16,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds b/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds index 168794cd92..8372c2daee 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds @@ -12,62 +12,123 @@ * $Id$ */ +/* + * Declare some sizes. + */ +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; StackSize = DEFINED(StackSize) ? StackSize : 0x1000; MEMORY - { - ram : org = 0x12800, l = 1M - } +{ + ram : org = 0x0, l = 1M +} SECTIONS { - .text 0x12800 : - { - text_start = . ; - _text_start = . ; - *(.text) - . = ALIGN (16); + ram : { + . = 0x12800; + } >ram - *(.eh_fram) - . = ALIGN (16); + /* + * Text, data and bss segments + */ + .text : { + *(.text) - . = ALIGN (16); - *(.gcc_exc) + /* + * C++ constructors/destructors + */ + *(.gnu.linkonce.t.*) + + /* + * 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) + + /* + * 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. + */ + . = ALIGN (16); + *crtbegin.o(.ctors) + *(.ctors) + *crtend.o(.ctors) + *crtbegin.o(.dtors) + *(.dtors) + *crtend.o(.dtors) - /* - * C++ constructors - */ - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; - __DTOR_LIST__ = .; - LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) - *(.dtors) - LONG(0) - __DTOR_END__ = .; - etext = ALIGN( 0x10 ) ; - _etext = .; - } + /* + * Exception frame info + */ + . = ALIGN (16); + *(.eh_frame) + /* + * Read-only data + */ + . = ALIGN (16); + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) + . = ALIGN (16); + PROVIDE (etext = .); + } >ram .data : { - data_start = . ; - _data_start = . ; - *(.data) - edata = ALIGN( 0x10 ) ; - _edata = .; - } + copy_start = .; + *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) + . = ALIGN (16); + PROVIDE (_edata = .); + copy_end = .; + } >ram .bss : { - bss_start = . ; - _bss_start = . ; - *(.bss) - *(COMMON) - . += StackSize; /* XXX -- Old gld can't handle this */ - . = ALIGN (16); - stack_init = .; - end = . ; - _end = . ; - } + bss_start = .; + . += (256 * 4); + clear_start = .; + *(.bss) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); + + . += StackSize; + PROVIDE (_stack_init = .); + + . = ALIGN (16); + PROVIDE (_HeapStart = .); + . += HeapSize; + PROVIDE (_HeapEnd = .); + + clear_end = .; + + _WorkspaceBase = .; + } >ram } diff --git a/c/src/lib/libbsp/m68k/efi332/bsp_specs b/c/src/lib/libbsp/m68k/efi332/bsp_specs index 61dac86b53..078f4054fb 100644 --- a/c/src/lib/libbsp/m68k/efi332/bsp_specs +++ b/c/src/lib/libbsp/m68k/efi332/bsp_specs @@ -16,8 +16,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/efi332/startup/linkcmds b/c/src/lib/libbsp/m68k/efi332/startup/linkcmds index 58c90b64a9..ead7ebbe3e 100644 --- a/c/src/lib/libbsp/m68k/efi332/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/efi332/startup/linkcmds @@ -30,6 +30,12 @@ __DYNAMIC = 0; * +--------------------+ <- high memory */ +/* + * Declare some sizes. + */ +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; +StackSize = DEFINED(StackSize) ? StackSize : 0x1000; + MEMORY { ram : ORIGIN = 0x80000, LENGTH = 512K @@ -43,69 +49,109 @@ _copy_data_from_rom = 0; */ SECTIONS { - .text : - { - CREATE_OBJECT_SYMBOLS - text_start = .; - _text_start = .; - - *(.text) - . = ALIGN (16); - - *(.eh_fram) - . = ALIGN (16); - - etext = ALIGN(0x10); - _etext = .; - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; - __DTOR_LIST__ = .; - LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) - *(.dtors) - LONG(0) - __DTOR_END__ = .; - *(.lit) - *(.shdata) - _endtext = .; - } > ram - .gcc_exc : - { - *(.gcc_exc) - } > ram - .data : - { - data_start = .; - _data_start = .; - _sdata = . ; - *(.data) - CONSTRUCTORS - edata = ALIGN(0x10); - _edata = .; - } > ram - .shbss : - { - *(.shbss) - } > ram - .bss : - { - __bss_start = ALIGN(0x8); - bss_start = .; - _bss_start = .; - *(.bss) - *(COMMON) - end = .; - _end = ALIGN(0x8); - __end = ALIGN(0x8); - } > ram - .stab . (NOLOAD) : - { - [ .stab ] - } - .stabstr . (NOLOAD) : - { - [ .stabstr ] - } + ram : { + . = .; + } >ram + + /* + * Text, data and bss segments + */ + .text : { + *(.text) + + /* + * C++ constructors/destructors + */ + *(.gnu.linkonce.t.*) + + /* + * 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) + + /* + * 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. + */ + . = ALIGN (16); + *crtbegin.o(.ctors) + *(.ctors) + *crtend.o(.ctors) + *crtbegin.o(.dtors) + *(.dtors) + *crtend.o(.dtors) + + /* + * Exception frame info + */ + . = ALIGN (16); + *(.eh_frame) + + /* + * Read-only data + */ + . = ALIGN (16); + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) + + . = ALIGN (16); + PROVIDE (_etext = .); + } >ram + .data : { + PROVIDE (_copy_start = .); + *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) + . = ALIGN (16); + PROVIDE (_edata = .); + PROVIDE (_copy_end = .); + } >ram + .bss : { + PROVIDE (_bss_start = .); + PROVIDE (_clear_start = .); + *(.bss) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); + + . += StackSize; + PROVIDE (_stack_init = .); + + . = ALIGN (16); + PROVIDE (_HeapStart = .); + . += HeapSize; + PROVIDE (_HeapEnd = .); + + clear_end = .; + + PROVIDE (_WorkspaceBase = .); + } >ram } diff --git a/c/src/lib/libbsp/m68k/efi68k/bsp_specs b/c/src/lib/libbsp/m68k/efi68k/bsp_specs index 61dac86b53..078f4054fb 100644 --- a/c/src/lib/libbsp/m68k/efi68k/bsp_specs +++ b/c/src/lib/libbsp/m68k/efi68k/bsp_specs @@ -16,8 +16,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/efi68k/startup/linkcmds b/c/src/lib/libbsp/m68k/efi68k/startup/linkcmds index 5fabd9d11b..c01b91a331 100644 --- a/c/src/lib/libbsp/m68k/efi68k/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/efi68k/startup/linkcmds @@ -47,67 +47,120 @@ __end_of_ram = 0x240000; _copy_data_from_rom = 0; /* + * Declare some sizes. + */ +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; +StackSize = DEFINED(StackSize) ? StackSize : 0x1000; + +/* * stick everything in ram (of course) */ + SECTIONS { - .text : - { - CREATE_OBJECT_SYMBOLS - text_start = .; - _text_start = .; - *(.text) - . = ALIGN (16); - *(.eh_fram) - . = ALIGN (16); - - etext = ALIGN(0x10); - _etext = .; - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; - __DTOR_LIST__ = .; - LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) - *(.dtors) - LONG(0) - __DTOR_END__ = .; - *(.lit) - *(.shdata) - _endtext = .; - } > ram - .data : - { - data_start = .; - _data_start = .; - _sdata = . ; - *(.data) - CONSTRUCTORS - edata = ALIGN(0x10); - _edata = .; - } > ram - .shbss : - { - *(.shbss) - } > ram - .bss : - { - __bss_start = ALIGN(0x8); - bss_start = .; - _bss_start = .; - *(.bss) - *(COMMON) - end = .; - _end = ALIGN(0x8); - __end = ALIGN(0x8); - } > ram - .stab . (NOLOAD) : - { - [ .stab ] - } - .stabstr . (NOLOAD) : - { - [ .stabstr ] - } + ram : { + . = .; + } >ram + + /* + * Text, data and bss segments + */ + .text : { + *(.text) + + /* + * C++ constructors/destructors + */ + *(.gnu.linkonce.t.*) + + /* + * 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) + + /* + * 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. + */ + . = ALIGN (16); + *crtbegin.o(.ctors) + *(.ctors) + *crtend.o(.ctors) + *crtbegin.o(.dtors) + *(.dtors) + *crtend.o(.dtors) + + /* + * Exception frame info + */ + . = ALIGN (16); + *(.eh_frame) + + /* + * Read-only data + */ + . = ALIGN (16); + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) + + . = ALIGN (16); + PROVIDE (_etext = .); + } >ram + .data : { + PROVIDE (_copy_start = .); + *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) + . = ALIGN (16); + PROVIDE (_edata = .); + PROVIDE (_copy_end = .); + } >ram + .bss : { + PROVIDE (_bss_start = .); + PROVIDE (_clear_start = .); + *(.bss) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); + + . += StackSize; + PROVIDE (_stack_init = .); + + . = ALIGN (16); + PROVIDE (_HeapStart = .); + . += HeapSize; + PROVIDE (_HeapEnd = .); + + clear_end = .; + + PROVIDE (_WorkspaceBase = .); + } >ram } diff --git a/c/src/lib/libbsp/m68k/gen68302/bsp_specs b/c/src/lib/libbsp/m68k/gen68302/bsp_specs index 61dac86b53..078f4054fb 100644 --- a/c/src/lib/libbsp/m68k/gen68302/bsp_specs +++ b/c/src/lib/libbsp/m68k/gen68302/bsp_specs @@ -16,8 +16,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds index 43d20060a4..8937b8640d 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds @@ -13,63 +13,124 @@ */ MEMORY - { +{ ram : org = 0x0000, l = 16M - } +} m302 = 0xf7f000; _VBR = 0x000000; /* location of the VBR table (in RAM) */ +/* + * Declare some sizes. + */ +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; +StackSize = DEFINED(StackSize) ? StackSize : 0x1000; + SECTIONS { - .text 0xc00000 : - { - text_start = . ; - *(.text) - . = ALIGN (16); - *(.gnu.linkonce.t.*) - *(.descriptors) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) + ram : { + . = 0xc00000; + } >ram + + /* + * Text, data and bss segments + */ + .text : { + *(.text) + + /* + * C++ constructors/destructors + */ + *(.gnu.linkonce.t.*) + + /* + * 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) + + /* + * 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. + */ + . = ALIGN (16); + *crtbegin.o(.ctors) + *(.ctors) + *crtend.o(.ctors) + *crtbegin.o(.dtors) + *(.dtors) + *crtend.o(.dtors) + + /* + * Exception frame info + */ + . = ALIGN (16); + *(.eh_frame) + + /* + * Read-only data + */ + . = ALIGN (16); + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) + + . = ALIGN (16); + PROVIDE (_etext = .); + } >ram + .data : { + PROVIDE (_copy_start = .); + *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) + . = ALIGN (16); + PROVIDE (_edata = .); + PROVIDE (_copy_end = .); + } >ram + .bss : { + PROVIDE (_bss_start = .); + PROVIDE (_clear_start = .); + *(.bss) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); - *(.eh_fram) - . = ALIGN (16); + . += StackSize; + PROVIDE (_stack_init = .); - /* - * C++ constructors - */ - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; - __DTOR_LIST__ = .; - LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) - *(.dtors) - LONG(0) - __DTOR_END__ = .; + . = ALIGN (16); + PROVIDE (_HeapStart = .); + . += HeapSize; + PROVIDE (_HeapEnd = .); - _rodata_start = . ; - *(.rodata) - *(.gnu.linkonce.r*) - _erodata = ALIGN( 0x10 ) ; + clear_end = .; - etext = ALIGN( 0x10 ) ; - } - .data 0x010000 : - { - data_start = . ; - *(.data) - *(.gnu.linkonce.d.*) - *(.gcc_except_table) - edata = ALIGN( 0x10 ) ; - } - .bss ADDR( .data ) + SIZEOF( .data ): - { - bss_start = . ; - *(.bss) - *(COMMON) - end = . ; - _end = . ; - } + PROVIDE (_WorkspaceBase = .); + } >ram } diff --git a/c/src/lib/libbsp/m68k/gen68340/bsp_specs b/c/src/lib/libbsp/m68k/gen68340/bsp_specs index 61dac86b53..078f4054fb 100644 --- a/c/src/lib/libbsp/m68k/gen68340/bsp_specs +++ b/c/src/lib/libbsp/m68k/gen68340/bsp_specs @@ -16,8 +16,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds index 4dbfa37084..a767a348e0 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds @@ -24,9 +24,6 @@ OUTPUT_FORMAT(coff-m68k) /* * 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. */ RamSize = DEFINED(RamSize) ? RamSize : 4M; HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; @@ -79,77 +76,115 @@ SECTIONS { * Text, data and bss segments */ .text : { - CREATE_OBJECT_SYMBOLS *(.text) - . = ALIGN (16); /* - * C++ constructors + * C++ constructors/destructors + */ + *(.gnu.linkonce.t.*) + + /* + * 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) + + /* + * 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) - etext = .; - _etext = .; - } >rom - - .eh_fram : { + /* + * Exception frame info + */ . = ALIGN (16); - *(.eh_fram) - } >ram + *(.eh_frame) - .gcc_exc : { + /* + * Read-only data + */ . = ALIGN (16); - *(.gcc_exc) - } >ram + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) - /* - * On-chip memory/peripherals - * - */ - dpram : { - m340 = .; - _m340 = .; - . += (8 * 1024); + . = ALIGN (16); + PROVIDE (_etext = .); } >ram - .data : { - copy_start = .; + PROVIDE (_copy_start = .); *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) . = ALIGN (16); - _edata = .; - copy_end = .; + PROVIDE (_edata = .); + PROVIDE (_copy_end = .); } >ram - .bss : { - M68Kvec = .; - _M68Kvec = .; - . += (256 * 4); - clear_start = .; + M68Kvec = .; + _M68Kvec = .; + . += (256 * 4); + PROVIDE (_bss_start = .); + PROVIDE (_clear_start = .); *(.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 = .; + PROVIDE (_WorkspaceBase = .); + } >ram + + /* + * On-chip memory/peripherals + * + */ + dpram : { + m340 = .; + _m340 = .; + . += (8 * 1024); } >ram + } diff --git a/c/src/lib/libbsp/m68k/gen68360/bsp_specs b/c/src/lib/libbsp/m68k/gen68360/bsp_specs index 61dac86b53..078f4054fb 100644 --- a/c/src/lib/libbsp/m68k/gen68360/bsp_specs +++ b/c/src/lib/libbsp/m68k/gen68360/bsp_specs @@ -16,8 +16,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + 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 /* diff --git a/c/src/lib/libbsp/m68k/idp/bsp_specs b/c/src/lib/libbsp/m68k/idp/bsp_specs index 61dac86b53..078f4054fb 100644 --- a/c/src/lib/libbsp/m68k/idp/bsp_specs +++ b/c/src/lib/libbsp/m68k/idp/bsp_specs @@ -16,8 +16,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/idp/startup/linkcmds b/c/src/lib/libbsp/m68k/idp/startup/linkcmds index 8ffdb3f40d..9a30f57c94 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/idp/startup/linkcmds @@ -12,60 +12,122 @@ * both the rom68k and the mon68k monitors. */ -StackSize = DEFINED(StackSize) ? StackSize : 0x1000; - MEMORY { ram : org = 0x10000, l = 2M } +/* + * Declare some sizes. + */ +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; +StackSize = DEFINED(StackSize) ? StackSize : 0x1000; + SECTIONS { - .text 0x10000: - { - text_start = . ; - _text_start = . ; - *(.text) - . = ALIGN (16); + ram : { + . = .; + } >ram + + /* + * Text, data and bss segments + */ + .text : { + *(.text) + + /* + * C++ constructors/destructors + */ + *(.gnu.linkonce.t.*) + + /* + * 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) + + /* + * 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. + */ + . = ALIGN (16); + *crtbegin.o(.ctors) + *(.ctors) + *crtend.o(.ctors) + *crtbegin.o(.dtors) + *(.dtors) + *crtend.o(.dtors) + + /* + * Exception frame info + */ + . = ALIGN (16); + *(.eh_frame) + + /* + * Read-only data + */ + . = ALIGN (16); + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) + + . = ALIGN (16); + PROVIDE (_etext = .); + } >ram + .data : { + PROVIDE (_copy_start = .); + *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) + . = ALIGN (16); + PROVIDE (_edata = .); + PROVIDE (_copy_end = .); + } >ram + .bss : { + PROVIDE (_bss_start = .); + PROVIDE (_clear_start = .); + *(.bss) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); + + . += StackSize; + PROVIDE (_stack_init = .); - *(.eh_fram) - . = ALIGN (16); + . = ALIGN (16); + PROVIDE (_HeapStart = .); + . += HeapSize; + PROVIDE (_HeapEnd = .); - . = ALIGN (16); - *(.gcc_exc) + clear_end = .; - /* - * C++ constructors - */ - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; - __DTOR_LIST__ = .; - LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) - *(.dtors) - LONG(0) - __DTOR_END__ = .; - etext = ALIGN( 0x10 ) ; - _etext = .; - } - .data : { - data_start = . ; - _data_start = .; - *(.data) - edata = ALIGN( 0x10 ) ; - _edata = .; - } - .bss : { - bss_start = . ; - _bss_start = . ; - *(.bss) - *(COMMON) - . += StackSize; /* XXX -- Old gld can't handle this */ - . = ALIGN (16); - stack_init = .; - end = . ; - _end = . ; - } + PROVIDE (_WorkspaceBase = .); + } >ram } diff --git a/c/src/lib/libbsp/m68k/mvme136/bsp_specs b/c/src/lib/libbsp/m68k/mvme136/bsp_specs index 61dac86b53..078f4054fb 100644 --- a/c/src/lib/libbsp/m68k/mvme136/bsp_specs +++ b/c/src/lib/libbsp/m68k/mvme136/bsp_specs @@ -16,8 +16,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds index 2ed2ee97fa..f24329fdcc 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds @@ -12,56 +12,122 @@ * $Id$ */ +/* + * Declare some sizes. + */ +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; StackSize = DEFINED(StackSize) ? StackSize : 0x1000; + MEMORY - { - ram : org = 0x3000, l = 1M - } +{ + ram : org = 0x0, l = 1M +} SECTIONS { - .text 0x3000 : - { - text_start = . ; - _text_start = . ; - *(.text) - . = ALIGN (16); + ram : { + . = 0x3000; + } >ram + + /* + * Text, data and bss segments + */ + .text : { + *(.text) + + /* + * C++ constructors/destructors + * + * 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. + */ + *(.gnu.linkonce.t.*) + + /* + * Initialization and finalization code. + * + * 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. + */ + PROVIDE (_init = .); + *crti.o(.init) + *(.init) + *crtn.o(.init) + PROVIDE (_fini = .); + *crti.o(.fini) + *(.fini) + *crtn.o(.fini) - *(.eh_fram) - . = ALIGN (16); + /* + * C++ constructors/destructors + */ + . = ALIGN (16); + *crtbegin.o(.ctors) + *(.ctors) + *crtend.o(.ctors) + *crtbegin.o(.dtors) + *(.dtors) + *crtend.o(.dtors) - /* - * C++ constructors - */ - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; - __DTOR_LIST__ = .; - LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) - *(.dtors) - LONG(0) - __DTOR_END__ = .; - etext = ALIGN( 0x10 ) ; - _etext = .; - } + /* + * Exception frame info + */ + . = ALIGN (16); + *(.eh_frame) + + /* + * Read-only data + */ + . = ALIGN (16); + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) + + . = ALIGN (16); + PROVIDE (_etext = .); + } >ram .data : { - data_start = . ; - _data_start = .; - *(.data) - edata = ALIGN( 0x10 ) ; - _edata = .; - } + PROVIDE (_copy_start = .); + *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) + . = ALIGN (16); + PROVIDE (_edata = .); + PROVIDE (_copy_end = .); + } >ram .bss : { - bss_start = . ; - _bss_start = . ; - *(.bss) - *(COMMON) - . += StackSize; /* XXX -- Old gld can't handle this */ + PROVIDE (_bss_start = .); + PROVIDE (_clear_start = .); + *(.bss) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); + + . += StackSize; + PROVIDE (_stack_init = .); + . = ALIGN (16); - stack_init = .; - end = . ; - _end = . ; - } + PROVIDE (_HeapStart = .); + . += HeapSize; + PROVIDE (_HeapEnd = .); + + clear_end = .; + + PROVIDE (_WorkspaceBase = .); + } >ram } diff --git a/c/src/lib/libbsp/m68k/mvme147/bsp_specs b/c/src/lib/libbsp/m68k/mvme147/bsp_specs index 61dac86b53..078f4054fb 100644 --- a/c/src/lib/libbsp/m68k/mvme147/bsp_specs +++ b/c/src/lib/libbsp/m68k/mvme147/bsp_specs @@ -16,8 +16,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme147/startup/linkcmds index 2437da1fe6..9a3a1b705d 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme147/startup/linkcmds @@ -16,57 +16,122 @@ * $Id$ */ +/* + * Declare some sizes. + */ +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; StackSize = DEFINED(StackSize) ? StackSize : 0x1000; MEMORY - { - ram : org = 0x5000, l = 0x3fafff - } +{ + ram : org = 0x0, l = 0x400000 +} SECTIONS { - .text 0x5000 : - { - text_start = . ; - _text_start = . ; - *(.text) - . = ALIGN (16); + ram : { + . = 0x5000; + } >ram + + /* + * Text, data and bss segments + */ + .text : { + *(.text) + + /* + * C++ constructors/destructors + */ + *(.gnu.linkonce.t.*) + + /* + * 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) - *(.eh_fram) - . = ALIGN (16); + /* + * 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. + */ + . = ALIGN (16); + *crtbegin.o(.ctors) + *(.ctors) + *crtend.o(.ctors) + *crtbegin.o(.dtors) + *(.dtors) + *crtend.o(.dtors) - /* - * C++ constructors - */ - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; - __DTOR_LIST__ = .; - LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) - *(.dtors) - LONG(0) - __DTOR_END__ = .; - etext = ALIGN( 0x10 ) ; - _etext = .; - } + /* + * Exception frame info + */ + . = ALIGN (16); + *(.eh_frame) + + /* + * Read-only data + */ + . = ALIGN (16); + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) + + . = ALIGN (16); + PROVIDE (_etext = .); + } >ram .data : { - data_start = . ; - _data_start = .; - *(.data) - edata = ALIGN( 0x10 ) ; - _edata = .; - } + PROVIDE (_copy_start = .); + *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) + . = ALIGN (16); + PROVIDE (_edata = .); + PROVIDE (_copy_end = .); + } >ram .bss : { - bss_start = . ; - _bss_start = . ; - *(.bss) - *(COMMON) - . += StackSize; /* XXX -- Old gld can't handle this */ - . = ALIGN (16); - stack_init = .; - end = . ; - _end = . ; - } + PROVIDE (_bss_start = .); + PROVIDE (_clear_start = .); + *(.bss) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); + + . += StackSize; + PROVIDE (_stack_init = .); + + . = ALIGN (16); + PROVIDE (_HeapStart = .); + . += HeapSize; + PROVIDE (_HeapEnd = .); + + clear_end = .; + + PROVIDE (_WorkspaceBase = .); + } >ram } diff --git a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs b/c/src/lib/libbsp/m68k/mvme147s/bsp_specs index 61dac86b53..078f4054fb 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs +++ b/c/src/lib/libbsp/m68k/mvme147s/bsp_specs @@ -16,8 +16,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds index 325b77c485..f4cccbd241 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds @@ -16,72 +16,122 @@ * $Id$ */ +/* + * Declare some sizes. + */ +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; StackSize = DEFINED(StackSize) ? StackSize : 0x1000; MEMORY - { - ram : org = 0x7000, l = 0x3d8fff - } +{ + ram : org = 0x0, l = 0x400000 +} SECTIONS { - .text 0x7000 : - { - text_start = . ; - _text_start = . ; - *(.text) - . = ALIGN (16); + ram : { + . = 0x7000; + } >ram + + /* + * Text, data and bss segments + */ + .text : { + *(.text) + + /* + * C++ constructors/destructors + */ + *(.gnu.linkonce.t.*) + + /* + * 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) + + /* + * 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. + */ + . = ALIGN (16); + *crtbegin.o(.ctors) + *(.ctors) + *crtend.o(.ctors) + *crtbegin.o(.dtors) + *(.dtors) + *crtend.o(.dtors) + + /* + * Exception frame info + */ + . = ALIGN (16); + *(.eh_frame) + + /* + * Read-only data + */ + . = ALIGN (16); + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) - *(.gnu.linkonce.t.*) - *(.descriptors) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) + . = ALIGN (16); + PROVIDE (_etext = .); + } >ram + .data : { + PROVIDE (_copy_start = .); + *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) + . = ALIGN (16); + PROVIDE (_edata = .); + PROVIDE (_copy_end = .); + } >ram + .bss : { + PROVIDE (_bss_start = .); + PROVIDE (_clear_start = .); + *(.bss) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); - *(.eh_fram) - . = ALIGN (16); + . += StackSize; + PROVIDE (_stack_init = .); - /* - * C++ constructors - */ - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; - __DTOR_LIST__ = .; - LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) - *(.dtors) - LONG(0) - __DTOR_END__ = .; + . = ALIGN (16); + PROVIDE (_HeapStart = .); + . += HeapSize; + PROVIDE (_HeapEnd = .); - _rodata_start = . ; - *(.rodata) - *(.gnu.linkonce.r*) - _erodata = ALIGN( 0x10 ) ; + clear_end = .; - etext = ALIGN( 0x10 ) ; - _etext = .; - } - .data ADDR( .text ) + SIZEOF( .text ): - { - data_start = . ; - _data_start = .; - *(.data) - *(.gnu.linkonce.d*) - *(.gcc_except_table) - edata = ALIGN( 0x10 ) ; - _edata = .; - } - .bss ADDR( .data ) + SIZEOF( .data ): - { - bss_start = . ; - _bss_start = . ; - *(.bss) - *(COMMON) - . += StackSize; /* XXX -- Old gld can't handle this */ - . = ALIGN (16); - stack_init = .; - end = . ; - _end = . ; - } + PROVIDE (_WorkspaceBase = .); + } >ram } diff --git a/c/src/lib/libbsp/m68k/mvme162/bsp_specs b/c/src/lib/libbsp/m68k/mvme162/bsp_specs index 2ee8ccda4d..286948ee54 100644 --- a/c/src/lib/libbsp/m68k/mvme162/bsp_specs +++ b/c/src/lib/libbsp/m68k/mvme162/bsp_specs @@ -19,8 +19,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds index 2dc8090e80..3037eda84d 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds @@ -19,52 +19,122 @@ * $Id$ */ +/* + * Declare some sizes. + */ +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; StackSize = DEFINED(StackSize) ? StackSize : 0x1000; MEMORY - { +{ ram : org = 0x100000, l = 1M - } +} SECTIONS { - .text 0x100000 : - { - text_start = . ; - *(.text) - . = ALIGN (16); + ram : { + . = .; + } >ram + + /* + * Text, data and bss segments + */ + .text : { + *(.text) + + /* + * C++ constructors/destructors + */ + *(.gnu.linkonce.t.*) + + /* + * 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) - *(.eh_fram) - . = ALIGN (16); + /* + * 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. + */ + . = ALIGN (16); + *crtbegin.o(.ctors) + *(.ctors) + *crtend.o(.ctors) + *crtbegin.o(.dtors) + *(.dtors) + *crtend.o(.dtors) - /* - * C++ constructors - */ - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; - __DTOR_LIST__ = .; - LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) - *(.dtors) - LONG(0) - __DTOR_END__ = .; - etext = ALIGN( 0x10 ) ; - } + /* + * Exception frame info + */ + . = ALIGN (16); + *(.eh_frame) + + /* + * Read-only data + */ + . = ALIGN (16); + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) + + . = ALIGN (16); + PROVIDE (_etext = .); + } >ram .data : { - data_start = . ; - *(.data) - edata = ALIGN( 0x10 ) ; - } + PROVIDE (_copy_start = .); + *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) + . = ALIGN (16); + PROVIDE (_edata = .); + PROVIDE (_copy_end = .); + } >ram .bss : { - bss_start = . ; - *(.bss) - *(COMMON) - . += StackSize; /* XXX -- Old gld can't handle this */ - . = ALIGN (16); - stack_init = .; - end = . ; - _end = . ; - } + PROVIDE (_bss_start = .); + PROVIDE (_clear_start = .); + *(.bss) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); + + . += StackSize; + PROVIDE (_stack_init = .); + + . = ALIGN (16); + PROVIDE (_HeapStart = .); + . += HeapSize; + PROVIDE (_HeapEnd = .); + + clear_end = .; + + PROVIDE (_WorkspaceBase = .); + } >ram } diff --git a/c/src/lib/libbsp/m68k/mvme167/bsp_specs b/c/src/lib/libbsp/m68k/mvme167/bsp_specs index d59875e3e6..615f7c8b44 100644 --- a/c/src/lib/libbsp/m68k/mvme167/bsp_specs +++ b/c/src/lib/libbsp/m68k/mvme167/bsp_specs @@ -20,8 +20,12 @@ elflinkcmds%s}}} *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s} %{qelf crti.o%s crtbegin.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme167/startup/linkcmds index 739552c670..8ddee103c5 100644 --- a/c/src/lib/libbsp/m68k/mvme167/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme167/startup/linkcmds @@ -29,9 +29,6 @@ RAM_END = RAM_START + RAM_SIZE; /* * 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; @@ -49,175 +46,108 @@ MEMORY SECTIONS { - /* - * We want the entry point to be the first thing in memory. - * Merge all read-only data into the .text section. - */ - .text 0x00800000 : - { - text_start = . ; - - *(.text) - *(.text.*) - *(.stub) - - /* C++ constructors/destructors */ - *(.gnu.linkonce.t*) - - /* 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(.init) - - . = ALIGN (16); - - /* C++ constructors and destructors for static objects. - * - * 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. - */ - PROVIDE (__CTOR_LIST__ = .); - *crtbegin.o(.ctors) - *(.ctors) - *crtend.o(.ctors) - PROVIDE (__CTOR_END__ = .); - - PROVIDE (__DTOR_LIST__ = .); - *crtbegin.o(.dtors) - *(.dtors) - *crtend.o(.dtors) - PROVIDE (__DTOR_END__ = .); - - . = ALIGN (16); - - /* Exception frame info */ - *(.eh_frame) - - . = ALIGN (16); - - /* Do we have any of these with egcs-1.x and higher? */ - *(.gcc_exc) - - . = ALIGN (16); - - _rodata_start = . ; - *(.rodata) - *(.rodata.*) - *(.gnu.linkonce.r*) - *(.rodata1) - _erodata = .; - - _etext = .; - PROVIDE (etext = .); - - } >ram =0x4e75 - - . = ALIGN (16); - - .data : - { - data_start = .; - - *(.data) - *(.data.*) - *(.data1) - *(.sdata) - *(.gnu.linkonce.d*) - *(.gcc_except_table) - - . = ALIGN (16); - _edata = .; - PROVIDE (edata = .); - } >ram - - .bss : - { - bss_start = .; - *(.dynbss) - *(.bss) - *(COMMON) - *(.sbss) - *(.scommon) - - . = ALIGN (16); - _end = .; - PROVIDE (end = .); - } >ram - - _HeapStart = .; - . += HeapSize; /* XXX -- Old gld can't handle this */ - _HeapEnd = .; - _StackStart = .; - . += StackSize; /* XXX -- Old gld can't handle this */ - /* . += 0x10000; */ /* HeapSize for old gld */ - /* . += 0x1000; */ /* StackSize for old gld */ - . = ALIGN (16); - _StackEnd = .; - stack_init = .; - clear_end = .; - - _WorkspaceBase = .; - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - /* These must appear regardless of . */ -} + ram : { + . = .; + } >ram + + /* + * Text, data and bss segments + */ + .text : { + *(.text) + + /* + * C++ constructors/destructors + */ + *(.gnu.linkonce.t.*) + + /* + * 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) + + /* + * 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. + */ + . = ALIGN (16); + *crtbegin.o(.ctors) + *(.ctors) + *crtend.o(.ctors) + *crtbegin.o(.dtors) + *(.dtors) + *crtend.o(.dtors) + + /* + * Exception frame info + */ + . = ALIGN (16); + *(.eh_frame) + /* + * Read-only data + */ + . = ALIGN (16); + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) + + . = ALIGN (16); + PROVIDE (_etext = .); + } >ram + .data : { + PROVIDE (_copy_start = .); + *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) + . = ALIGN (16); + PROVIDE (_edata = .); + PROVIDE (_copy_end = .); + } >ram + .bss : { + PROVIDE (_bss_start = .); + PROVIDE (_clear_start = .); + *(.bss) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); + + . += StackSize; + PROVIDE (_stack_init = .); + + . = ALIGN (16); + PROVIDE (_HeapStart = .); + . += HeapSize; + PROVIDE (_HeapEnd = .); + PROVIDE (_clear_end = .); + + PROVIDE (_WorkspaceBase = .); + } >ram +} diff --git a/c/src/lib/libbsp/m68k/ods68302/bsp_specs b/c/src/lib/libbsp/m68k/ods68302/bsp_specs index 61dac86b53..078f4054fb 100644 --- a/c/src/lib/libbsp/m68k/ods68302/bsp_specs +++ b/c/src/lib/libbsp/m68k/ods68302/bsp_specs @@ -16,8 +16,12 @@ *startfile: %{!qrtems: %(old_startfile)} %{qrtems: \ %{!qrtems_debug: start.o%s} \ -%{qrtems_debug: start_g.o%s}} +%{qrtems_debug: start_g.o%s} \ +crti.o%s crtbegin.o%s} *link: %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds b/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds index e0a884992c..eff2edd706 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds @@ -5,52 +5,133 @@ * */ +/* + * Declare some sizes. + */ +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; +StackSize = DEFINED(StackSize) ? StackSize : 0x1000; + +/* + * Declare on-board memory. + */ +MEMORY { + ram : ORIGIN = 0x00000000, LENGTH = 1M +} SECTIONS { - .vtable 0 : - { - vtable_start = .; - *(.vtable) - evtable = .; - } - - .text . : - { - text_start = .; - *(.text) - . = ALIGN (16); - - *(.eh_fram) - . = ALIGN (16); - - etext = .; - . = ALIGN(4); - __CTOR_LIST__ = .; - LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2) - *(.ctors) - LONG(0) - __CTOR_END__ = .; - . = ALIGN(4); - __DTOR_LIST__ = .; - LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2) - *(.dtors) - LONG(0) - __DTOR_END__ = .; - } - - .data : { - data_start = .; - *(.data) - *(.rodata) - edata = .; - } - .bss : { - bss_start = .; - *(.bss) - *(COMMON) - end = . ; - _end = . ; - } + ram : { + . = .; + } >ram + + .vtable : + { + vtable_start = .; + *(.vtable) + evtable = .; + } >ram + + + /* + * Text, data and bss segments + */ + .text : { + *(.text) + + /* + * C++ constructors/destructors + */ + *(.gnu.linkonce.t.*) + + /* + * 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) + + /* + * 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. + */ + . = ALIGN (16); + *crtbegin.o(.ctors) + *(.ctors) + *crtend.o(.ctors) + *crtbegin.o(.dtors) + *(.dtors) + *crtend.o(.dtors) + + /* + * Exception frame info + */ + . = ALIGN (16); + *(.eh_frame) + + /* + * Read-only data + */ + . = ALIGN (16); + _rodata_start = . ; + *(.rodata) + *(.gnu.linkonce.r*) + + . = ALIGN (16); + PROVIDE (_etext = .); + } >ram + .data : { + PROVIDE (_copy_start = .); + *(.data) + *(.gnu.linkonce.d*) + *(.gcc_except_table) + . = ALIGN (16); + PROVIDE (_edata = .); + PROVIDE (_copy_end = .); + } >ram + .bss : { + PROVIDE (_bss_start = .); + PROVIDE (_clear_start = .); + *(.bss) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); + + . += StackSize; + PROVIDE (_stack_init = .); + + . = ALIGN (16); + PROVIDE (_HeapStart = .); + . += HeapSize; + PROVIDE (_HeapEnd = .); + + clear_end = .; + + PROVIDE (_WorkspaceBase = .); + } >ram } m302 = MC68302_BASE; |