On Thu, 11 Apr 2013 17:43:21 +0200, Albert ARIBAUD <[email protected]> wrote:
> Commit 3ebd1cbc introduced compiler-generated __bss_start > and __bss_end__ and commit c23561e7 rewrote all __bss_end__ > as __bss_end. Their merge caused silent and harmless but > potentially bug-inducing clashes between compiler- and linker- > enerated __bss_end symbols. > > Make __bss_end and __bss_start compiler-only, and create > __bss_base and __bss_limit for linker-only use. > > Signed-off-by: Albert ARIBAUD <[email protected]> > Reported-by: Benoît Thébaudeau <[email protected]> > --- > Changes in v2: > - remove HIDDEN(), not supported by binutils < 2.23 > > arch/arm/cpu/ixp/u-boot.lds | 14 ++++++++++---- > arch/arm/cpu/u-boot.lds | 14 ++++++++++---- > board/actux1/u-boot.lds | 14 ++++++++++---- > board/actux2/u-boot.lds | 14 ++++++++++---- > board/actux3/u-boot.lds | 14 ++++++++++---- > board/dvlhost/u-boot.lds | 14 ++++++++++---- > board/freescale/mx31ads/u-boot.lds | 14 ++++++++++---- > 7 files changed, 70 insertions(+), 28 deletions(-) > > diff --git a/arch/arm/cpu/ixp/u-boot.lds b/arch/arm/cpu/ixp/u-boot.lds > index 388a67f..553589c 100644 > --- a/arch/arm/cpu/ixp/u-boot.lds > +++ b/arch/arm/cpu/ixp/u-boot.lds > @@ -69,17 +69,23 @@ SECTIONS > > _end = .; > > +/* > + * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c > + * __bss_base and __bss_limit are for linker only (overlay ordering) > + */ > + > .bss_start __rel_dyn_start (OVERLAY) : { > KEEP(*(.__bss_start)); > + __bss_base = .; > } > > - .bss __bss_start (OVERLAY) : { > + .bss __bss_base (OVERLAY) : { > *(.bss*) > . = ALIGN(4); > - __bss_end = .; > + __bss_limit = .; > } > - .bss_end __bss_end (OVERLAY) : { > - KEEP(*(__bss_end)); > + .bss_end __bss_limit (OVERLAY) : { > + KEEP(*(.__bss_end)); > } > > /DISCARD/ : { *(.dynstr*) } > diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds > index 3a1083d..d5e42d3a 100644 > --- a/arch/arm/cpu/u-boot.lds > +++ b/arch/arm/cpu/u-boot.lds > @@ -81,18 +81,24 @@ SECTIONS > *(.mmutable) > } > > +/* > + * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c > + * __bss_base and __bss_limit are for linker only (overlay ordering) > + */ > + > .bss_start __rel_dyn_start (OVERLAY) : { > KEEP(*(.__bss_start)); > + __bss_base = .; > } > > - .bss __bss_start (OVERLAY) : { > + .bss __bss_base (OVERLAY) : { > *(.bss*) > . = ALIGN(4); > - __bss_end = .; > + __bss_limit = .; > } > > - .bss_end __bss_end (OVERLAY) : { > - KEEP(*(__bss_end)); > + .bss_end __bss_limit (OVERLAY) : { > + KEEP(*(.__bss_end)); > } > > /DISCARD/ : { *(.dynstr*) } > diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds > index 52fc9fc..ef4a25b 100644 > --- a/board/actux1/u-boot.lds > +++ b/board/actux1/u-boot.lds > @@ -77,17 +77,23 @@ SECTIONS > > _end = .; > > +/* > + * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c > + * __bss_base and __bss_limit are for linker only (overlay ordering) > + */ > + > .bss_start __rel_dyn_start (OVERLAY) : { > KEEP(*(.__bss_start)); > + __bss_base = .; > } > > - .bss __bss_start (OVERLAY) : { > + .bss __bss_base (OVERLAY) : { > *(.bss*) > . = ALIGN(4); > - __bss_end = .; > + __bss_limit = .; > } > - .bss_end __bss_end (OVERLAY) : { > - KEEP(*(__bss_end)); > + .bss_end __bss_limit (OVERLAY) : { > + KEEP(*(.__bss_end)); > } > > /DISCARD/ : { *(.dynstr*) } > diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds > index cafd3d8..00ad8b7 100644 > --- a/board/actux2/u-boot.lds > +++ b/board/actux2/u-boot.lds > @@ -77,17 +77,23 @@ SECTIONS > > _end = .; > > +/* > + * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c > + * __bss_base and __bss_limit are for linker only (overlay ordering) > + */ > + > .bss_start __rel_dyn_start (OVERLAY) : { > KEEP(*(.__bss_start)); > + __bss_base = .; > } > > - .bss __bss_start (OVERLAY) : { > + .bss __bss_base (OVERLAY) : { > *(.bss*) > . = ALIGN(4); > - __bss_end = .; > + __bss_limit = .; > } > - .bss_end __bss_end (OVERLAY) : { > - KEEP(*(__bss_end)); > + .bss_end __bss_limit (OVERLAY) : { > + KEEP(*(.__bss_end)); > } > > /DISCARD/ : { *(.dynstr*) } > diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds > index 168fe17..44b990e 100644 > --- a/board/actux3/u-boot.lds > +++ b/board/actux3/u-boot.lds > @@ -77,17 +77,23 @@ SECTIONS > > _end = .; > > +/* > + * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c > + * __bss_base and __bss_limit are for linker only (overlay ordering) > + */ > + > .bss_start __rel_dyn_start (OVERLAY) : { > KEEP(*(.__bss_start)); > + __bss_base = .; > } > > - .bss __bss_start (OVERLAY) : { > + .bss __bss_base (OVERLAY) : { > *(.bss*) > . = ALIGN(4); > - __bss_end = .; > + __bss_limit = .; > } > - .bss_end __bss_end (OVERLAY) : { > - KEEP(*(__bss_end)); > + .bss_end __bss_limit (OVERLAY) : { > + KEEP(*(.__bss_end)); > } > > /DISCARD/ : { *(.dynstr*) } > diff --git a/board/dvlhost/u-boot.lds b/board/dvlhost/u-boot.lds > index dd50bdb..6d4b187 100644 > --- a/board/dvlhost/u-boot.lds > +++ b/board/dvlhost/u-boot.lds > @@ -77,17 +77,23 @@ SECTIONS > > _end = .; > > +/* > + * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c > + * __bss_base and __bss_limit are for linker only (overlay ordering) > + */ > + > .bss_start __rel_dyn_start (OVERLAY) : { > KEEP(*(.__bss_start)); > + __bss_base = .; > } > > - .bss __bss_start (OVERLAY) : { > + .bss __bss_base (OVERLAY) : { > *(.bss*) > . = ALIGN(4); > - __bss_end = .; > + __bss_limit = .; > } > - .bss_end __bss_end (OVERLAY) : { > - KEEP(*(__bss_end)); > + .bss_end __bss_limit (OVERLAY) : { > + KEEP(*(.__bss_end)); > } > > /DISCARD/ : { *(.dynstr*) } > diff --git a/board/freescale/mx31ads/u-boot.lds > b/board/freescale/mx31ads/u-boot.lds > index f48fda1..4969960 100644 > --- a/board/freescale/mx31ads/u-boot.lds > +++ b/board/freescale/mx31ads/u-boot.lds > @@ -80,17 +80,23 @@ SECTIONS > > _end = .; > > +/* > + * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c > + * __bss_base and __bss_limit are for linker only (overlay ordering) > + */ > + > .bss_start __rel_dyn_start (OVERLAY) : { > KEEP(*(.__bss_start)); > + __bss_base = .; > } > > - .bss __bss_start (OVERLAY) : { > + .bss __bss_base (OVERLAY) : { > *(.bss*) > . = ALIGN(4); > - __bss_end = .; > + __bss_limit = .; > } > - .bss_end __bss_end (OVERLAY) : { > - KEEP(*(__bss_end)); > + .bss_end __bss_limit (OVERLAY) : { > + KEEP(*(.__bss_end)); > } > > /DISCARD/ : { *(.bss*) } Applied to u-boot-arm/master. Amicalement, -- Albert. _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
