Changeset f2cb80a in mainline for kernel/arch/arm32/_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/arm32/_link.ld.in (modified) (3 diffs)

kernel/arch/arm32/_link.ld.in

@@ -26 +26 @@
         kernel_load_address = .;
         . = . + SIZEOF_HEADERS;
+
         .text : {
                 ktext_start = .;
@@ -31 +32 @@
                 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 = .;
@@ -38 +53 @@
 
                 *(.rodata .rodata.*);
-                *(.eh_frame .eh_frame.*);       /* stack unwinding data */
-                *(.eh_frame_hdr .eh_frame_hdr.*);
                 *(.sdata .sdata.*);
-        }
-        .sbss : {
                 *(.sbss .sbss.*);
                 *(.scommon .scommon.*);
+                kdata_end = .;
         }
-
-        kdata_end = .;
 
         .comment 0 : { *(.comment); }