Changeset f2cb80a in mainline for kernel/arch/arm64/_link.ld.in

Timestamp:

2024-02-23T17:57:23Z (11 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• kernel/arch/arm64/_link.ld.in (modified) (2 diffs)

kernel/arch/arm64/_link.ld.in

@@ -19 +19 @@
         kernel_load_address = LOAD_ADDRESS_V;
 
-        .image (LOAD_ADDRESS_V + SIZEOF_HEADERS) : AT (LOAD_ADDRESS_P + SIZEOF_HEADERS) {
+        .text (LOAD_ADDRESS_V + SIZEOF_HEADERS) : AT (LOAD_ADDRESS_P + SIZEOF_HEADERS) {
                 . = ALIGN(16);
                 ktext_start = .;
@@ -25 +25 @@
                 *(.text .text.*);
                 ktext_end = .;
+        }
 
+        /* stack unwinding data */
+        .eh_frame_hdr : {
+                eh_frame_hdr_start = .;
+                *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*);
+                eh_frame_hdr_end = .;
+        }
+
+        .eh_frame : {
+                eh_frame_start = .;
+                KEEP(*(.eh_frame .eh_frame.*));
+                eh_frame_end = .;
+        }
+
+        .data : {
                 kdata_start = .;
                 KEEP(*(K_DATA_START))
+                *(.rodata .rodata.*);
                 *(.data .data.*);                       /* initialized data */
                 *(.bss .bss.*);                        /* uninitialized static variables */
                 *(COMMON);                      /* global variables */
-
-                *(.rodata .rodata.*);
-                *(.eh_frame .eh_frame.*);       /* stack unwinding data */
-                *(.eh_frame_hdr .eh_frame_hdr.*);
-
                 kdata_end = .;
         }