* [U-Boot] [PATCH] powerpc/85xx: fix NAND boot linker scripts for -fpic
@ 2012-05-01 21:45 Scott Wood
2012-05-02 8:06 ` Joakim Tjernlund
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Scott Wood @ 2012-05-01 21:45 UTC (permalink / raw)
To: u-boot
GOT is now handled the way the main u-boot.lds does it. Without this,
the boot hangs when built with newer GCC (since 4.6). Older toolchains
hid the issue by converting -fpic to -fPIC.
Signed-off-by: Scott Wood <scottwood@freescale.com>
---
arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 5 +++--
arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
index b1a1dac..8ba9399 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
@@ -51,13 +51,14 @@ SECTIONS
PROVIDE (erotext = .);
.reloc :
{
- KEEP(*(.got))
_GOT2_TABLE_ = .;
KEEP(*(.got2))
+ KEEP(*(.got))
+ PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
_FIXUP_TABLE_ = .;
KEEP(*(.fixup))
}
- __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2;
+ __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
__fixup_entries = (. - _FIXUP_TABLE_) >> 2;
.data :
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
index 852f9aa..668158f 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
@@ -37,10 +37,12 @@ SECTIONS
.reloc : {
_GOT2_TABLE_ = .;
KEEP(*(.got2))
+ KEEP(*(.got))
+ PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
_FIXUP_TABLE_ = .;
KEEP(*(.fixup))
}
- __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2;
+ __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
__fixup_entries = (. - _FIXUP_TABLE_) >> 2;
. = ALIGN(8);
--
1.7.7.rc3.4.g8d714
^ permalink raw reply related [flat|nested] 4+ messages in thread* [U-Boot] [PATCH] powerpc/85xx: fix NAND boot linker scripts for -fpic 2012-05-01 21:45 [U-Boot] [PATCH] powerpc/85xx: fix NAND boot linker scripts for -fpic Scott Wood @ 2012-05-02 8:06 ` Joakim Tjernlund 2012-05-03 3:09 ` Chunhe Lan 2012-05-18 23:00 ` Scott Wood 2 siblings, 0 replies; 4+ messages in thread From: Joakim Tjernlund @ 2012-05-02 8:06 UTC (permalink / raw) To: u-boot Scott Wood <scottwood@freescale.com> wrote on 2012/05/01 23:45:51: > > GOT is now handled the way the main u-boot.lds does it. Without this, > the boot hangs when built with newer GCC (since 4.6). Older toolchains > hid the issue by converting -fpic to -fPIC. > > Signed-off-by: Scott Wood <scottwood@freescale.com> Loks good Acked-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se> ^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] powerpc/85xx: fix NAND boot linker scripts for -fpic 2012-05-01 21:45 [U-Boot] [PATCH] powerpc/85xx: fix NAND boot linker scripts for -fpic Scott Wood 2012-05-02 8:06 ` Joakim Tjernlund @ 2012-05-03 3:09 ` Chunhe Lan 2012-05-18 23:00 ` Scott Wood 2 siblings, 0 replies; 4+ messages in thread From: Chunhe Lan @ 2012-05-03 3:09 UTC (permalink / raw) To: u-boot Scott Wood wrote: > GOT is now handled the way the main u-boot.lds does it. Without this, > the boot hangs when built with newer GCC (since 4.6). Older toolchains > hid the issue by converting -fpic to -fPIC. > > Signed-off-by: Scott Wood <scottwood@freescale.com> > Tested-by: Chunhe Lan <Chunhe.Lan@freescale.com> ^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] powerpc/85xx: fix NAND boot linker scripts for -fpic 2012-05-01 21:45 [U-Boot] [PATCH] powerpc/85xx: fix NAND boot linker scripts for -fpic Scott Wood 2012-05-02 8:06 ` Joakim Tjernlund 2012-05-03 3:09 ` Chunhe Lan @ 2012-05-18 23:00 ` Scott Wood 2 siblings, 0 replies; 4+ messages in thread From: Scott Wood @ 2012-05-18 23:00 UTC (permalink / raw) To: u-boot On 05/01/2012 04:45 PM, Scott Wood wrote: > GOT is now handled the way the main u-boot.lds does it. Without this, > the boot hangs when built with newer GCC (since 4.6). Older toolchains > hid the issue by converting -fpic to -fPIC. > > Signed-off-by: Scott Wood <scottwood@freescale.com> > --- > arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 5 +++-- > arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 4 +++- > 2 files changed, 6 insertions(+), 3 deletions(-) Applied to u-boot-nand-flash -Scott ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-18 23:00 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-05-01 21:45 [U-Boot] [PATCH] powerpc/85xx: fix NAND boot linker scripts for -fpic Scott Wood 2012-05-02 8:06 ` Joakim Tjernlund 2012-05-03 3:09 ` Chunhe Lan 2012-05-18 23:00 ` Scott Wood
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox