custom.lds: move .tbl back out to its own section

Now that we've demoed the binary let's stick to something
that would look more like we would use upstream on Linux.

We'd want its own section, perhaps right after .iommu_table
or eventually extending / enhancing it by making it more
generic.

For now we keep SORT_BY_INIT_PRIORITY() but annotate that
we may just want SORT() for now. While at it, add an ALIGN(8).

Now the fun begins -- extending our init struct to match
more of our needs. This will be to match requirements of the
kernels' iommu_table hacks (dependencies), but we're also
shooting to make it very generic.

Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>

1 files changed, 11 insertions, 1 deletions

diff --git a/custom.lds b/custom.lds
index 9b3aa21..38375ab 100644
--- a/custom.lds
+++ b/custom.lds
@@ -59,7 +59,6 @@ SECTIONS
     *(.text.startup .text.startup.*)
     *(.text.hot .text.hot.*)
     *(.text .stub .text.* .gnu.linkonce.t.*)
-    *(SORT_BY_INIT_PRIORITY(.tbl.*))
     /* .gnu.warning sections are handled specially by elf32.em.  */
     *(.gnu.warning)
   }
@@ -153,6 +152,17 @@ SECTIONS
   _edata = .; PROVIDE (edata = .);
   . = .;
 
+  /*
+   * XXX: Linux already uses SORT() on vmlinux.lds,
+   * but SORT_BY_INIT_PRIORITY() seems more well suited
+   * for being able to annotate priorities, as SORT() seems
+   * to sort lexicographically. SORT_BY_INIT_PRIORITY() may
+   * only be available on newer binutils though, we should
+   * look into the pros/cons of both.
+   */
+  .tbl            : { *(SORT_BY_INIT_PRIORITY(.tbl.*)) }
+  . = ALIGN(8);
+
   __bss_start = .;
   .bss            :
   {