aboutsummaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-09-08 22:12:01 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-09-09 15:33:11 -0400
commit0b7c5419a6825ac411cd8534358d0862e8ab01a5 (patch)
treed9f4008db1571bc8a4e4fc1a0e3dc7160b325756 /support
parentab37174002c767fafa69b8ef65b4477871279b17 (diff)
downloadlibrambutan-0b7c5419a6825ac411cd8534358d0862e8ab01a5.tar.gz
librambutan-0b7c5419a6825ac411cd8534358d0862e8ab01a5.zip
Linker scripts: Rename section targets.
Use region aliases in common_ram.inc, common_rom.inc. These are provided by the individual board scripts which include these. Note that the aliases have horrible names. We'll need to fix that up.
Diffstat (limited to 'support')
-rw-r--r--support/ld/common_ram.inc12
-rw-r--r--support/ld/common_rom.inc7
2 files changed, 5 insertions, 14 deletions
diff --git a/support/ld/common_ram.inc b/support/ld/common_ram.inc
index c157c34..ea51a9f 100644
--- a/support/ld/common_ram.inc
+++ b/support/ld/common_ram.inc
@@ -12,7 +12,6 @@ SECTIONS
{
CREATE_OBJECT_SYMBOLS
__cs3_region_start_ram = .;
- *(.cs3.region-head.ram)
/*
* STM32 vector table
@@ -78,7 +77,7 @@ SECTIONS
LONG (__cs3_region_start_ram)
LONG (__cs3_region_init_size_ram)
LONG (__cs3_region_zero_size_ram)
- } > ram
+ } > REGION_TEXT
/*
* .ARM.exidx exception unwinding
@@ -87,7 +86,7 @@ SECTIONS
.ARM.exidx :
{
*(.ARM.exidx* .gnu.linkonce.armexidx.*)
- } > ram
+ } > REGION_TEXT
__exidx_end = .;
/*
@@ -97,12 +96,11 @@ SECTIONS
{
. = ALIGN(8);
_etext = .;
- } > ram
+ } > REGION_TEXT
.cs3.rom :
{
__cs3_region_start_rom = .;
- *(.cs3.region-head.rom)
*(.rom)
. = ALIGN (8);
} > ram
@@ -132,7 +130,7 @@ SECTIONS
*(.ram)
. = ALIGN (8);
_edata = .;
- } > ram
+ } > REGION_DATA
.bss :
{
@@ -143,7 +141,7 @@ SECTIONS
. = ALIGN (8);
_end = .;
__end = .;
- } > ram
+ } > REGION_BSS
/* __cs3_region_end_ram is deprecated */
__cs3_region_end_ram = __cs3_region_start_ram + LENGTH(ram);
diff --git a/support/ld/common_rom.inc b/support/ld/common_rom.inc
index 533981c..d0dcd6f 100644
--- a/support/ld/common_rom.inc
+++ b/support/ld/common_rom.inc
@@ -12,7 +12,6 @@ SECTIONS
{
CREATE_OBJECT_SYMBOLS
__cs3_region_start_rom = .;
- *(.cs3.region-head.rom)
/*
* STM32 vector table
@@ -28,8 +27,6 @@ SECTIONS
/*
* Program code and vague linking
*/
- *(.rom)
- *(.rom.b)
*(.text .text.* .gnu.linkonce.t.*)
*(.plt)
*(.gnu.warning)
@@ -120,11 +117,7 @@ SECTIONS
*/
.data :
{
- ram_begin = DEFINED(RAM_BUILD) ? . : . ;
- *(.cs3.region-head.ram_begin)
-
__cs3_region_start_ram = .;
- *(.cs3.region-head.ram)
KEEP(*(.jcr))
*(.got.plt) *(.got)