arm: move image_copy_start/end to linker symbols

image_copy_start/end are defined as c variables in order to force the compiler
emit relative references. However, defining those within a section definition
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 within
a section.

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

Suggested-by: Sam Edwards <CFSworks@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Sam Edwards <CFSworks@gmail.com> # Binary output identical
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

diff --git a/arch/arm/cpu/armv8/u-boot-spl.lds b/arch/arm/cpu/armv8/u-boot-spl.lds
index 8998c49..ef8af67 100644 (file)
--- a/arch/arm/cpu/armv8/u-boot-spl.lds
+++ b/arch/arm/cpu/armv8/u-boot-spl.lds
@@ -21,9 +21,9 @@ OUTPUT_ARCH(aarch64)
 ENTRY(_start)
 SECTIONS
 {
+       __image_copy_start = ADDR(.text);
        .text : {
                . = ALIGN(8);
-               __image_copy_start = .;
                CPUDIR/start.o (.text*)
                *(.text*)
        } >.sram
@@ -51,10 +51,8 @@ SECTIONS
                KEEP(*(SORT(__u_boot_list*)));
        } >.sram
 
-       .image_copy_end : {
-               . = ALIGN(8);
-               *(.__image_copy_end)
-       } >.sram
+       . = ALIGN(8);
+       __image_copy_end = .;
 
        .end : {
                . = ALIGN(8);

diff --git a/arch/arm/cpu/armv8/u-boot.lds b/arch/arm/cpu/armv8/u-boot.lds
index 5ba54dc..147a6e8 100644 (file)
--- a/arch/arm/cpu/armv8/u-boot.lds
+++ b/arch/arm/cpu/armv8/u-boot.lds
@@ -21,9 +21,9 @@ SECTIONS
        . = 0x00000000;
 
        . = ALIGN(8);
+       __image_copy_start = ADDR(.text);
        .text :
        {
-               *(.__image_copy_start)
                CPUDIR/start.o (.text*)
        }
 
@@ -123,11 +123,7 @@ SECTIONS
        }
 
        . = ALIGN(8);
-
-       .image_copy_end :
-       {
-               *(.__image_copy_end)
-       }
+       __image_copy_end = .;
 
        .rela.dyn ALIGN(8) : {
                __rel_dyn_start = .;

diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds
index fb2189d..9ed6239 100644 (file)
--- a/arch/arm/cpu/u-boot-spl.lds
+++ b/arch/arm/cpu/u-boot-spl.lds
@@ -14,9 +14,9 @@ SECTIONS
        . = 0x00000000;
 
        . = ALIGN(4);
+       __image_copy_start = ADDR(.text);
        .text :
        {
-               __image_copy_start = .;
                *(.vectors)
                CPUDIR/start.o (.text*)
                *(.text*)

diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds
index 6813d8a..798858e 100644 (file)
--- a/arch/arm/cpu/u-boot.lds
+++ b/arch/arm/cpu/u-boot.lds
@@ -35,9 +35,9 @@ SECTIONS
        . = 0x00000000;
 
        . = ALIGN(4);
+       __image_copy_start = ADDR(.text);
        .text :
        {
-               *(.__image_copy_start)
                *(.vectors)
                CPUDIR/start.o (.text*)
        }
@@ -154,11 +154,7 @@ SECTIONS
        }
 
        . = ALIGN(4);
-
-       .image_copy_end :
-       {
-               *(.__image_copy_end)
-       }
+       __image_copy_end = .;
 
        .rel.dyn ALIGN(4) : {
                __rel_dyn_start = .;

diff --git a/arch/arm/lib/sections.c b/arch/arm/lib/sections.c
index a4d4202..db5463b 100644 (file)
--- a/arch/arm/lib/sections.c
+++ b/arch/arm/lib/sections.c
@@ -19,8 +19,6 @@
  * aliasing warnings.
  */
 
-char __image_copy_start[0] __section(".__image_copy_start");
-char __image_copy_end[0] __section(".__image_copy_end");
 char __secure_start[0] __section(".__secure_start");
 char __secure_end[0] __section(".__secure_end");
 char __secure_stack_start[0] __section(".__secure_stack_start");

diff --git a/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds b/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds
index 37f0ccd..ada6570 100644 (file)
--- a/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds
+++ b/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds
@@ -22,9 +22,9 @@ SECTIONS
        . = 0x00000000;
 
        . = ALIGN(4);
+       __image_copy_start = ADDR(.text);
        .text :
        {
-               __image_copy_start = .;
                *(.vectors)
                CPUDIR/start.o (.text*)
                *(.text*)

diff --git a/arch/arm/mach-rockchip/u-boot-tpl-v8.lds b/arch/arm/mach-rockchip/u-boot-tpl-v8.lds
index 712c485..ad32654 100644 (file)
--- a/arch/arm/mach-rockchip/u-boot-tpl-v8.lds
+++ b/arch/arm/mach-rockchip/u-boot-tpl-v8.lds
@@ -22,9 +22,9 @@ SECTIONS
 {
        . = 0x00000000;
 
+       __image_copy_start = ADDR(.text);
        .text : {
                . = ALIGN(8);
-               *(.__image_copy_start)
                CPUDIR/start.o (.text*)
                *(.text*)
        }
@@ -44,10 +44,8 @@ SECTIONS
                KEEP(*(SORT(__u_boot_list*)));
        }
 
-       .image_copy_end : {
-               . = ALIGN(8);
-               *(.__image_copy_end)
-       }
+       . = ALIGN(8);
+       __image_copy_end = .;
 
        .end : {
                . = ALIGN(8);

diff --git a/arch/arm/mach-zynq/u-boot-spl.lds b/arch/arm/mach-zynq/u-boot-spl.lds
index 8c18d3f..d96a577 100644 (file)
--- a/arch/arm/mach-zynq/u-boot-spl.lds
+++ b/arch/arm/mach-zynq/u-boot-spl.lds
@@ -18,9 +18,9 @@ ENTRY(_start)
 SECTIONS
 {
        . = ALIGN(4);
+       __image_copy_start = ADDR(.text);
        .text :
        {
-               __image_copy_start = .;
                *(.vectors)
                CPUDIR/start.o (.text*)
                *(.text*)

diff --git a/arch/arm/mach-zynq/u-boot.lds b/arch/arm/mach-zynq/u-boot.lds
index 9eac7de..f6c99a8 100644 (file)
--- a/arch/arm/mach-zynq/u-boot.lds
+++ b/arch/arm/mach-zynq/u-boot.lds
@@ -14,9 +14,9 @@ SECTIONS
        . = 0x00000000;
 
        . = ALIGN(4);
+       __image_copy_start = ADDR(.text);
        .text :
        {
-               *(.__image_copy_start)
                *(.vectors)
                CPUDIR/start.o (.text*)
        }
@@ -60,10 +60,7 @@ SECTIONS
        }
 
        . = ALIGN(8);
-       .image_copy_end :
-       {
-               *(.__image_copy_end)
-       }
+       __image_copy_end = .;
 
        .rel.dyn ALIGN(8) : {
                __rel_dyn_start = .;