diff mbox

[U-Boot] u-boot/mpc85xx/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_ definition

Message ID 1445745530-3147-1-git-send-email-prabhakar@freescale.com
State Superseded
Delegated to: York Sun
Headers show

Commit Message

Prabhakar Kushwaha Oct. 25, 2015, 3:58 a.m. UTC 
From: Zhenhua Luo <zhenhua.luo@freescale.com>

In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in
u-boot.lds overrides the linker built-in symbols
(https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=b893397a4b1316610f49819344817715e4305de9),
so the linker is treating _GLOBAL_OFFSET_TABLE_ as a definition into the .reloc section.

To align with the change of binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbol
should not be defined in sections, and the symbols in linker generated .got
section should be used(https://sourceware.org/ml/binutils/2008-09/msg00122.html).

Fixed the following build errors with binutils-2.25:
| powerpc-poky-linux-gnuspe-ld.bfd: _GLOBAL_OFFSET_TABLE_ not defined in linker created .got

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
---
 arch/powerpc/cpu/mpc85xx/u-boot-nand.lds     | 1 -
 arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 1 -
 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds      | 1 -
 arch/powerpc/cpu/mpc85xx/u-boot.lds          | 1 -
 4 files changed, 4 deletions(-)

Comments

Tom Rini Oct. 25, 2015, 1:46 p.m. UTC | #1 
On Sun, Oct 25, 2015 at 09:28:50AM +0530, Prabhakar Kushwaha wrote:

> From: Zhenhua Luo <zhenhua.luo@freescale.com>
> 
> In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in
> u-boot.lds overrides the linker built-in symbols
> (https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=b893397a4b1316610f49819344817715e4305de9),
> so the linker is treating _GLOBAL_OFFSET_TABLE_ as a definition into the .reloc section.
> 
> To align with the change of binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbol
> should not be defined in sections, and the symbols in linker generated .got
> section should be used(https://sourceware.org/ml/binutils/2008-09/msg00122.html).
> 
> Fixed the following build errors with binutils-2.25:
> | powerpc-poky-linux-gnuspe-ld.bfd: _GLOBAL_OFFSET_TABLE_ not defined in linker created .got
> 
> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
> Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>

What happens when we use older binutils?  I'd like some run-time testing
too please :)  Thanks!
Zhenhua Luo Nov. 3, 2015, 6:40 a.m. UTC | #2 
Hi Tom, 

> -----Original Message-----
> From: Tom Rini [mailto:trini@konsulko.com]
> Sent: Sunday, October 25, 2015 9:46 PM
> To: Kushwaha Prabhakar-B32579 <prabhakar@freescale.com>
> Cc: u-boot@lists.denx.de; Sun York-R58495 <yorksun@freescale.com>; Luo
> Zhenhua-B19537 <zhenhua.luo@freescale.com>
> Subject: Re: [U-Boot] [PATCH] u-boot/mpc85xx/u-boot*.lds: remove
> _GLOBAL_OFFSET_TABLE_ definition
> 
> On Sun, Oct 25, 2015 at 09:28:50AM +0530, Prabhakar Kushwaha wrote:
> 
> > From: Zhenhua Luo <zhenhua.luo@freescale.com>
> >
> > In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE
> > in u-boot.lds overrides the linker built-in symbols
> > (https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff
> > ;h=b893397a4b1316610f49819344817715e4305de9),
> > so the linker is treating _GLOBAL_OFFSET_TABLE_ as a definition into
> the .reloc section.
> >
> > To align with the change of binutils-2.25, the _GLOBAL_OFFSET_TABLE_
> > symbol should not be defined in sections, and the symbols in linker
> > generated .got section should be
> used(https://sourceware.org/ml/binutils/2008-09/msg00122.html).
> >
> > Fixed the following build errors with binutils-2.25:
> > | powerpc-poky-linux-gnuspe-ld.bfd: _GLOBAL_OFFSET_TABLE_ not defined
> > | in linker created .got
> >
> > Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
> > Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
> 
> What happens when we use older binutils? 
[Luo Zhenhua-B19537] I verified the u-boot build for p4080ds(e500v2) with binutils-2.23.2, the build passed. 

 I'd like some run-time testing too please :)  Thanks!
[Luo Zhenhua-B19537] I did sanity test for the u-boot on p4080ds, it works normally. 

The log files are attached. 


Best Regards,

Zhenhua

> Tom
diff mbox

Patch

diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
index f933b21..0399f93 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
@@ -44,7 +44,6 @@  SECTIONS
     _GOT2_TABLE_ = .;
     KEEP(*(.got2))
     KEEP(*(.got))
-    PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
     _FIXUP_TABLE_ = .;
     KEEP(*(.fixup))
   }
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
index b83c553..f044564 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
@@ -22,7 +22,6 @@  SECTIONS
 		_GOT2_TABLE_ = .;
 		KEEP(*(.got2))
 		KEEP(*(.got))
-		PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
 		_FIXUP_TABLE_ = .;
 		KEEP(*(.fixup))
 	}
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
index 5ae7b3e..889a4c2 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
@@ -29,7 +29,6 @@  SECTIONS
 		_GOT2_TABLE_ = .;
 		KEEP(*(.got2))
 		KEEP(*(.got))
-		PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
 		_FIXUP_TABLE_ = .;
 		KEEP(*(.fixup))
 	}
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
index 2cf0b25..f15eaf3 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
@@ -50,7 +50,6 @@  SECTIONS
     _GOT2_TABLE_ = .;
     KEEP(*(.got2))
     KEEP(*(.got))
-    PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
     _FIXUP_TABLE_ = .;
     KEEP(*(.fixup))
   }