[Minios-devel] [UNIKRAFT PATCH 3/3] plat/*: Move ctortab before rodata on all platforms

[Vlad-Andrei BĂDOIU (78692) <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>]

In order to be consistent in the linker scripts we move the ctortab section
before rodata section on all platforms.

Signed-off-by: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
---
 plat/kvm/arm/link64.lds.S    | 5 +++--
 plat/linuxu/arm/link.lds.S   | 2 +-
 plat/linuxu/x86/link64.lds.S | 2 +-
 plat/xen/arm/link32.lds.S    | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plat/kvm/arm/link64.lds.S b/plat/kvm/arm/link64.lds.S
index d08abe48..b07a8979 100644
--- a/plat/kvm/arm/link64.lds.S
+++ b/plat/kvm/arm/link64.lds.S
@@ -71,7 +71,10 @@ SECTIONS {
 
        EXCEPTION_SECTIONS
 
+       CTORTAB_SECTION
+
        /* Read-only data */
+       . = ALIGN(__PAGE_SIZE);
        _rodata = .;
        .rodata :
        {
@@ -82,8 +85,6 @@ SECTIONS {
 
        _erodata = .;
 
-       CTORTAB_SECTION
-
        /* Constructor tables (read-only) */
        . = ALIGN(0x8);
        _ctors = .;
diff --git a/plat/linuxu/arm/link.lds.S b/plat/linuxu/arm/link.lds.S
index 8a731c5c..5c9a4f3c 100644
--- a/plat/linuxu/arm/link.lds.S
+++ b/plat/linuxu/arm/link.lds.S
@@ -4,4 +4,4 @@ SECTIONS
 {
        CTORTAB_SECTION
 }
-INSERT AFTER .rodata
+INSERT BEFORE .rodata
diff --git a/plat/linuxu/x86/link64.lds.S b/plat/linuxu/x86/link64.lds.S
index b6f581ce..a6a56ad2 100644
--- a/plat/linuxu/x86/link64.lds.S
+++ b/plat/linuxu/x86/link64.lds.S
@@ -6,7 +6,7 @@ SECTIONS
 
        CTORTAB_SECTION
 }
-INSERT AFTER .rodata
+INSERT BEFORE .rodata
 
 SECTIONS
 {
diff --git a/plat/xen/arm/link32.lds.S b/plat/xen/arm/link32.lds.S
index cade70a1..3737d1cc 100644
--- a/plat/xen/arm/link32.lds.S
+++ b/plat/xen/arm/link32.lds.S
@@ -51,6 +51,8 @@ SECTIONS
 
        EXCEPTION_SECTIONS
 
+       CTORTAB_SECTION
+
        /* Read-only data */
        _rodata = .;
        .rodata :
@@ -61,8 +63,6 @@ SECTIONS
        . = ALIGN(__PAGE_SIZE);
        _erodata = .;
 
-       CTORTAB_SECTION
-
        . = ALIGN(0x8);
        _ctors = .;
        .preinit_array : {
-- 
2.20.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel