Changeset 47b2d7e3 in mainline for uspace/lib/c/arch/riscv64/_link.ld.in

Timestamp:

2018-03-30T21:35:15Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1433ecda

Parents:

5b8f731

Message:

Always load ELF headers as part of the text segment.

This forces us to align the start of the text segment to its
declared alignment, otherwise the linker would be forced to allocate
address 0, which the kernel doesn't allow.

Instead of setting the start differently based on each platform's
declared text alignment, set it always to 0x400000 (4 MB),
which is greater than the largest alignment among the currently
supported platforms (amd64, 2MB alignment), and also aligns with
large pages on all platforms that support them.

File:

• uspace/lib/c/arch/riscv64/_link.ld.in (modified) (2 diffs)

uspace/lib/c/arch/riscv64/_link.ld.in

@@ -5 +5 @@
 #ifdef LOADER
         interp PT_INTERP;
+#endif
         text PT_LOAD FILEHDR PHDRS FLAGS(5);
-#else
-        text PT_LOAD FLAGS(5);
-#endif
         data PT_LOAD FLAGS(6);
         debug PT_NOTE;
@@ -15 +13 @@
 SECTIONS {
 #ifdef LOADER
-        . = 0x70001000 + SIZEOF_HEADERS;
+        . = SEGMENT_START("text-segment", 0x70400000);
 #else
-        . = 0x1000 + SIZEOF_HEADERS;
+        . = SEGMENT_START("text-segment", 0x400000);
 #endif
+#ifndef SHLIB
+        PROVIDE (__executable_start = .);
+#endif
+        . = . + SIZEOF_HEADERS;
 
         .text : {