arm: move _end to linker symbols

commit 6e2228fb052b ("Merge patch series "Clean up arm linker scripts")
was cleaning up linker scripts for armv7 and v8 but was leaving
_end and __secure_stack_start/end.

commit d0b5d9da5de2 ("arm: make _end compiler-generated")
was moving _end to be compiler generated. _end is defined as c variable
in its own section to force the compiler emit relative a reference.
However, defining those in the linker script will do the same thing
since [0].

So let's remove the special sections from the linker scripts, the
variable definitions from sections.c and define them as a symbols.
It's worth noting that _image_binary_end symbol is now redundant and
can be removed in the future.

- SPL

The .end section has been removed from the new binary
[ 5] .end
     PROGBITS         00000000fffdf488  000000000002f488  0
     0000000000000000 0000000000000000  0                 1
     [0000000000000003]: WRITE, ALLOC

$~ bloat-o-meter kria_old/spl/u-boot-spl krina_new/spl/u-boot-spl
add/remove: 0/0 grow/shrink: 0/0 up/down: 0/0 (0)
Function                                     old     new   delta
Total: Before=115980, After=115980, chg +0.00%

$~ readelf -sW kria_old/u-boot kria_new/u-boot | grep -w _end
 12047: 000000000813a0f0     0 OBJECT  GLOBAL DEFAULT   11 _end
 12047: 000000000813a118     0 NOTYPE  GLOBAL DEFAULT   11 _end

$~ readelf -sW kria_old/spl/u-boot-spl kria_new/spl/u-boot-spl | grep -w _end
  1605: 00000000fffdf488     0 OBJECT  GLOBAL DEFAULT    5 _end
  1603: 00000000fffdf498     0 NOTYPE  GLOBAL DEFAULT    4 _end

$~ readelf -sW old/u-boot new/u-boot | grep -w _end
  8847: 0000000000103710     0 OBJECT  GLOBAL DEFAULT   11 _end
  8847: 0000000000103738     0 NOTYPE  GLOBAL DEFAULT   11 _end

$~ readelf -sW old_v7/u-boot new_v7/u-boot | grep -w _end
 10638: 000da824     0 OBJECT  GLOBAL DEFAULT   10 _end
 10637: 000da84c     0 NOTYPE  GLOBAL DEFAULT   10 _end

- For both QEMU instances
$~ bloat-o-meter old/u-boot new/u-boot
add/remove: 0/0 grow/shrink: 1/0 up/down: 20/0 (20)
Function                                     old     new   delta
version_string                                50      70     +20
Total: Before=656915, After=656935, chg +0.00%

[0] binutils commit 6b3b0ab89663 ("Make linker assigned symbol dynamic only for shared object")

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

diff --git a/arch/arm/cpu/arm1136/u-boot-spl.lds b/arch/arm/cpu/arm1136/u-boot-spl.lds
index f83988fd7e6a1182e991ef2d76e037d8598ea053..b7af29183a97c0c012c2107c93dcf0032c535431 100644 (file)
--- a/arch/arm/cpu/arm1136/u-boot-spl.lds
+++ b/arch/arm/cpu/arm1136/u-boot-spl.lds
@@ -33,11 +33,7 @@ SECTIONS
        .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
        . = ALIGN(4);
        __image_copy_end = .;
-
-       .end :
-       {
-               *(.__end)
-       }
+       _end = .;
 
        .bss :
        {

diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
index 7e20448f81080469d50e45b9a7e28268a94a1bf7..7c6309246f8b68fb46d77ab761e42b4940b9d93b 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
+++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds
@@ -49,11 +49,7 @@ SECTIONS
                __bss_end = .;
        }
 
-       .end :
-       {
-               *(.__end)
-       }
-
+       _end = .;
        _image_binary_end = .;
 
        .dynsym _image_binary_end : { *(.dynsym) }

diff --git a/arch/arm/cpu/armv8/u-boot-spl.lds b/arch/arm/cpu/armv8/u-boot-spl.lds
index ef8af67e11c35878cc29942f6bbceb6eea0c8490..215cedd69a8cde72eed9e5ddae43eb12c3edc986 100644 (file)
--- a/arch/arm/cpu/armv8/u-boot-spl.lds
+++ b/arch/arm/cpu/armv8/u-boot-spl.lds
@@ -53,12 +53,7 @@ SECTIONS
 
        . = ALIGN(8);
        __image_copy_end = .;
-
-       .end : {
-               . = ALIGN(8);
-               *(.__end)
-       } >.sram
-
+       _end = .;
        _image_binary_end = .;
 
        .bss : {

diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds
index 9ed62395a9c5e953ddafda2e776f24e2061f0712..eee463a1b1c6f8ace4808f74f709cfdc6a37674b 100644 (file)
--- a/arch/arm/cpu/u-boot-spl.lds
+++ b/arch/arm/cpu/u-boot-spl.lds
@@ -53,12 +53,8 @@ SECTIONS
                __rel_dyn_end = .;
        }
 
-       .end :
-       {
-               *(.__end)
-       }
-
        _image_binary_end = .;
+       _end = .;
 
        .bss __rel_dyn_start (OVERLAY) : {
                __bss_start = .;

diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds
index 707b19795f08594c420e9544eb9e75bf4c02b44c..2f50087f57a95bf186de1832bfa145fdf9beb710 100644 (file)
--- a/arch/arm/cpu/u-boot.lds
+++ b/arch/arm/cpu/u-boot.lds
@@ -166,11 +166,7 @@ SECTIONS
                __rel_dyn_end = .;
        }
 
-       .end :
-       {
-               *(.__end)
-       }
-
+       _end = .;
        _image_binary_end = .;
 
        /*

diff --git a/arch/arm/lib/sections.c b/arch/arm/lib/sections.c
index db5463b2bbbce8b4a7ab7c5d3106df48420ee6ad..07efabaa7dc8f7b6795292d56867629ca35b44ad 100644 (file)
--- a/arch/arm/lib/sections.c
+++ b/arch/arm/lib/sections.c
@@ -23,4 +23,3 @@ char __secure_start[0] __section(".__secure_start");
 char __secure_end[0] __section(".__secure_end");
 char __secure_stack_start[0] __section(".__secure_stack_start");
 char __secure_stack_end[0] __section(".__secure_stack_end");
-char _end[0] __section(".__end");

diff --git a/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds b/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds
index ada6570d9712c3c0360d6060800a28823d570d4a..9502a7384b53b4e2260b63d41e70f0dfd0780a9e 100644 (file)
--- a/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds
+++ b/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds
@@ -61,11 +61,7 @@ SECTIONS
                __rel_dyn_end = .;
        } > .nor
 
-       .end :
-       {
-               *(.__end)
-       } > .nor
-
+       _end = .;
        _image_binary_end = .;
 
        .bss : {

diff --git a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
index 1a8bf94dee0c88dd64e6833f9e2ad650957e0baa..09cf838cf96e6bafeea97506f4c18a9d692ca24e 100644 (file)
--- a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
+++ b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
@@ -33,12 +33,7 @@ SECTIONS
 
        . = ALIGN(4);
        __image_copy_end = .;
-
-       .end :
-       {
-               *(.__end)
-       } >.sram
-
+       _end = .;
        _image_binary_end = .;
 
        .bss :

diff --git a/arch/arm/mach-at91/armv7/u-boot-spl.lds b/arch/arm/mach-at91/armv7/u-boot-spl.lds
index 6ca725fc4ce0cca04c4dd190ff1b23637f475097..460a91d93ec47ec81e630b1b2cb6853f9dd43fbc 100644 (file)
--- a/arch/arm/mach-at91/armv7/u-boot-spl.lds
+++ b/arch/arm/mach-at91/armv7/u-boot-spl.lds
@@ -40,12 +40,7 @@ SECTIONS
 
        . = ALIGN(4);
        __image_copy_end = .;
-
-       .end :
-       {
-               *(.__end)
-       } >.sram
-
+       _end = .;
        _image_binary_end = .;
 
        .bss :

diff --git a/arch/arm/mach-omap2/u-boot-spl.lds b/arch/arm/mach-omap2/u-boot-spl.lds
index 1d6e5d45b4689567d3209063d17508c9252cbaf2..3bb759d8a1c8d4e2a183f23556d58e7102568656 100644 (file)
--- a/arch/arm/mach-omap2/u-boot-spl.lds
+++ b/arch/arm/mach-omap2/u-boot-spl.lds
@@ -39,12 +39,7 @@ SECTIONS
 
        . = ALIGN(4);
        __image_copy_end = .;
-
-       .end :
-       {
-               *(.__end)
-       }
-
+       _end = .;
        _image_binary_end = .;
 
        .bss :

diff --git a/arch/arm/mach-rockchip/u-boot-tpl-v8.lds b/arch/arm/mach-rockchip/u-boot-tpl-v8.lds
index ad32654085b35015a394db074e143307f292a6af..958a1b70aefe95b18927743a0c327aa9aa91e905 100644 (file)
--- a/arch/arm/mach-rockchip/u-boot-tpl-v8.lds
+++ b/arch/arm/mach-rockchip/u-boot-tpl-v8.lds
@@ -46,12 +46,7 @@ SECTIONS
 
        . = ALIGN(8);
        __image_copy_end = .;
-
-       .end : {
-               . = ALIGN(8);
-               *(.__end)
-       }
-
+       _end = .;
        _image_binary_end = .;
 
        .bss ALIGN(8) : {

diff --git a/arch/arm/mach-zynq/u-boot.lds b/arch/arm/mach-zynq/u-boot.lds
index 3e0c96c5055616e44c9511d496ae1bd2f61a6593..f52523edf49055880e27a2bb233b810905b30718 100644 (file)
--- a/arch/arm/mach-zynq/u-boot.lds
+++ b/arch/arm/mach-zynq/u-boot.lds
@@ -68,11 +68,7 @@ SECTIONS
                __rel_dyn_end = .;
        }
 
-       .end :
-       {
-               *(.__end)
-       }
-
+       _end = .;
        _image_binary_end = .;
 
 /*

diff --git a/board/davinci/da8xxevm/u-boot-spl-da850evm.lds b/board/davinci/da8xxevm/u-boot-spl-da850evm.lds
index 7e0f09f3b5b17478a5883c648619e1cc76daff4f..56d6f4f114b9c6ea427c74d8809b0b30891b8104 100644 (file)
--- a/board/davinci/da8xxevm/u-boot-spl-da850evm.lds
+++ b/board/davinci/da8xxevm/u-boot-spl-da850evm.lds
@@ -46,12 +46,7 @@ SECTIONS
        } >.sram
 
        __image_copy_end = .;
-
-       .end :
-       {
-               *(.__end)
-       }
-
+       _end = .;
        _image_binary_end = .;
 
        .bss :

diff --git a/board/samsung/common/exynos-uboot-spl.lds b/board/samsung/common/exynos-uboot-spl.lds
index 73cd97a1b1de2cb78651b789b6ae0b383522b7bb..9d3b57e98dbb71875372fca578b6b9a6b348e152 100644 (file)
--- a/board/samsung/common/exynos-uboot-spl.lds
+++ b/board/samsung/common/exynos-uboot-spl.lds
@@ -41,11 +41,7 @@ SECTIONS
        . = ALIGN(4);
 
        __image_copy_end = .;
-
-       .end :
-       {
-               *(.__end)
-       } >.sram
+       _end = .;
 
        .bss :
        {