summaryrefslogtreecommitdiffstats
path: root/board/gaisler
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2009-02-18 15:22:05 -0800
committerWolfgang Denk <wd@denx.de>2009-03-20 22:39:12 +0100
commitf62fb99941c625605aa16a0097b396a5c16d2c88 (patch)
treea0269ee7e9fa0efacf18d9b6b2a44000c731aa0f /board/gaisler
parent566b652c7cdb0e5e0529bb3d1eaffbd2bf45a032 (diff)
downloadblackbird-obmc-uboot-f62fb99941c625605aa16a0097b396a5c16d2c88.tar.gz
blackbird-obmc-uboot-f62fb99941c625605aa16a0097b396a5c16d2c88.zip
Fix all linker script to handle all rodata sections
A recent gcc added a new unaligned rodata section called '.rodata.str1.1', which needs to be added the the linker script. Instead of just adding this one section, we use a wildcard ".rodata*" to get all rodata linker section gcc has now and might add in the future. However, '*(.rodata*)' by itself will result in sub-optimal section ordering. The sections will be sorted by object file, which causes extra padding between the unaligned rodata.str.1.1 of one object file and the aligned rodata of the next object file. This is easy to fix by using the SORT_BY_ALIGNMENT command. This patch has not be tested one most of the boards modified. Some boards have a linker script that looks something like this: *(.text) . = ALIGN(16); *(.rodata) *(.rodata.str1.4) *(.eh_frame) I change this to: *(.text) . = ALIGN(16); *(.eh_frame) *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) This means the start of rodata will no longer be 16 bytes aligned. However, the boundary between text and rodata/eh_frame is still aligned to 16 bytes, which is what I think the real purpose of the ALIGN call is. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'board/gaisler')
-rw-r--r--board/gaisler/gr_cpci_ax2000/u-boot.lds4
-rw-r--r--board/gaisler/gr_ep2s60/u-boot.lds4
-rw-r--r--board/gaisler/gr_xc3s_1500/u-boot.lds4
-rw-r--r--board/gaisler/grsim/u-boot.lds4
-rw-r--r--board/gaisler/grsim_leon2/u-boot.lds4
5 files changed, 5 insertions, 15 deletions
diff --git a/board/gaisler/gr_cpci_ax2000/u-boot.lds b/board/gaisler/gr_cpci_ax2000/u-boot.lds
index a0876310cf..d5d7842157 100644
--- a/board/gaisler/gr_cpci_ax2000/u-boot.lds
+++ b/board/gaisler/gr_cpci_ax2000/u-boot.lds
@@ -77,10 +77,8 @@ SECTIONS
*(.gnu.warning)
/* *(.got1)*/
. = ALIGN(16);
- *(.rodata)
- *(.rodata1)
- *(.rodata.*)
*(.eh_frame)
+ *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
. = ALIGN(4);
_etext = .;
diff --git a/board/gaisler/gr_ep2s60/u-boot.lds b/board/gaisler/gr_ep2s60/u-boot.lds
index e461a36fa4..99aa0addaf 100644
--- a/board/gaisler/gr_ep2s60/u-boot.lds
+++ b/board/gaisler/gr_ep2s60/u-boot.lds
@@ -77,10 +77,8 @@ SECTIONS
*(.gnu.warning)
/* *(.got1)*/
. = ALIGN(16);
- *(.rodata)
- *(.rodata1)
- *(.rodata.*)
*(.eh_frame)
+ *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
. = ALIGN(4);
_etext = .;
diff --git a/board/gaisler/gr_xc3s_1500/u-boot.lds b/board/gaisler/gr_xc3s_1500/u-boot.lds
index ddd27d455e..3b13190cb0 100644
--- a/board/gaisler/gr_xc3s_1500/u-boot.lds
+++ b/board/gaisler/gr_xc3s_1500/u-boot.lds
@@ -77,10 +77,8 @@ SECTIONS
*(.gnu.warning)
/* *(.got1)*/
. = ALIGN(16);
- *(.rodata)
- *(.rodata1)
- *(.rodata.*)
*(.eh_frame)
+ *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
. = ALIGN(4);
_etext = .;
diff --git a/board/gaisler/grsim/u-boot.lds b/board/gaisler/grsim/u-boot.lds
index a9cc7ca4b0..0fa6627df5 100644
--- a/board/gaisler/grsim/u-boot.lds
+++ b/board/gaisler/grsim/u-boot.lds
@@ -76,10 +76,8 @@ SECTIONS
*(.gnu.warning)
/* *(.got1)*/
. = ALIGN(16);
- *(.rodata)
- *(.rodata1)
- *(.rodata.*)
*(.eh_frame)
+ *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
. = ALIGN(4);
_etext = .;
diff --git a/board/gaisler/grsim_leon2/u-boot.lds b/board/gaisler/grsim_leon2/u-boot.lds
index b3462d463e..c5311a6c1f 100644
--- a/board/gaisler/grsim_leon2/u-boot.lds
+++ b/board/gaisler/grsim_leon2/u-boot.lds
@@ -76,10 +76,8 @@ SECTIONS
*(.gnu.warning)
/* *(.got1)*/
. = ALIGN(16);
- *(.rodata)
- *(.rodata1)
- *(.rodata.*)
*(.eh_frame)
+ *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
. = ALIGN(4);
_etext = .;
OpenPOWER on IntegriCloud