Merge branch 'master' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / arch / mips / cpu / u-boot.lds

diff --git a/arch/mips/cpu/u-boot.lds b/arch/mips/cpu/u-boot.lds
index 16a9d6ac5797339913fa46a5782b242ae8315a9b..fd0f1b5d4f444a2b75f701d63ee2bbf5c47fd68e 100644 (file)
--- a/arch/mips/cpu/u-boot.lds
+++ b/arch/mips/cpu/u-boot.lds
@@ -1,16 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2003
  * Wolfgang Denk Engineering, <wd@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#if defined(CONFIG_64BIT)
-#define PTR_COUNT_SHIFT        3
-#else
-#define PTR_COUNT_SHIFT        2
-#endif
-
 OUTPUT_ARCH(mips)
 ENTRY(_start)
 SECTIONS
@@ -19,7 +12,9 @@ SECTIONS
 
        . = ALIGN(4);
        .text : {
+               __text_start = .;
                *(.text*)
+               __text_end = .;
        }
 
        . = ALIGN(4);
@@ -32,15 +27,6 @@ SECTIONS
                *(.data*)
        }
 
-       . = .;
-       _gp = ALIGN(16) + 0x7ff0;
-
-       .got : {
-               *(.got)
-       }
-
-       num_got_entries = SIZEOF(.got) >> PTR_COUNT_SHIFT;
-
        . = ALIGN(4);
        .sdata : {
                *(.sdata*)
@@ -53,36 +39,27 @@ SECTIONS
 
        . = ALIGN(4);
        __image_copy_end = .;
+       __init_end = .;
 
-       .rel.dyn : {
-               __rel_dyn_start = .;
-               *(.rel.dyn)
-               __rel_dyn_end = .;
-       }
-
-       .deadcode : {
+       .data.reloc : {
+               __rel_start = .;
                /*
-                * Workaround for a binutils feature (or bug?).
-                *
-                * The GNU ld from binutils puts the dynamic relocation
-                * entries into the .rel.dyn section. Sometimes it
-                * allocates more dynamic relocation entries than it needs
-                * and the unused slots are set to R_MIPS_NONE entries.
-                *
-                * However the size of the .rel.dyn section in the ELF
-                * section header does not cover the unused entries, so
-                * objcopy removes those during stripping.
-                *
-                * Create a small section here to avoid that.
+                * Space for relocation table
+                * This needs to be filled so that the
+                * mips-reloc tool can overwrite the content.
+                * An invalid value is left at the start of the
+                * section to abort relocation if the table
+                * has not been filled in.
                 */
-               LONG(0xffffffff);
+               LONG(0xFFFFFFFF);
+               FILL(0);
+               . += CONFIG_MIPS_RELOCATION_TABLE_SIZE - 4;
        }
 
-       .dynsym : {
-               *(.dynsym)
-       }
+       . = ALIGN(4);
+       _end = .;
 
-       .bss __rel_dyn_start (OVERLAY) : {
+       .bss __rel_start (OVERLAY) : {
                __bss_start = .;
                *(.sbss.*)
                *(.bss.*)
@@ -91,15 +68,39 @@ SECTIONS
                __bss_end = .;
        }
 
-       /DISCARD/ : {
+       .dynsym _end : {
+               *(.dynsym)
+       }
+
+       .dynbss : {
                *(.dynbss)
+       }
+
+       .dynstr : {
                *(.dynstr)
+       }
+
+       .dynamic : {
                *(.dynamic)
+       }
+
+       .plt : {
+               *(.plt)
+       }
+
+       .interp : {
                *(.interp)
+       }
+
+       .gnu : {
+               *(.gnu*)
+       }
+
+       .MIPS.stubs : {
+               *(.MIPS.stubs)
+       }
+
+       .hash : {
                *(.hash)
-               *(.gnu.*)
-               *(.plt)
-               *(.got.plt)
-               *(.rel.plt)
        }
 }