From 1b5a771a34743a2973a82de5ebdfd22da030b841 Mon Sep 17 00:00:00 2001 From: Fabian Imhof Date: Sun, 18 May 2025 13:21:42 +0000 Subject: update linker file and improve section parsing --- arch/x86_64/scripts/kernel.ld | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'arch/x86_64/scripts') diff --git a/arch/x86_64/scripts/kernel.ld b/arch/x86_64/scripts/kernel.ld index 23f9681..3d9a7ae 100644 --- a/arch/x86_64/scripts/kernel.ld +++ b/arch/x86_64/scripts/kernel.ld @@ -87,9 +87,8 @@ SECTIONS .stl_text ALIGN(4K) : AT(ADDR (.stl_text)) { - *(.stl_text) + *(.stl_text .stl_text*) KEEP(*libstdc++.a:*(.text .text.*)) - KEEP(*libatomic.a:*(.text .text.*)) /* TODO: Attempt to move atomic stl into stl_text as well, doesn't work */ } .text ALIGN(4K) : AT(ADDR (.text)) @@ -99,7 +98,7 @@ SECTIONS .user_text ALIGN(4K) : AT(ADDR (.user_text)) { - *(.user_text) + *(.user_text .user_text.*) } .rodata ALIGN(4K) : AT (ADDR (.rodata)) @@ -137,7 +136,7 @@ SECTIONS .user_data ALIGN(4K) : AT (ADDR (.user_data)) { - *(.user_data*) + *(.user_data .user_data.*) } /*************************************************************************** -- cgit v1.2.3