diff options
| author | Matteo Gmür <matteo.gmuer1@ost.ch> | 2025-06-06 17:15:32 +0200 |
|---|---|---|
| committer | Matteo Gmür <matteo.gmuer1@ost.ch> | 2025-06-06 17:15:32 +0200 |
| commit | c4ced070ab057e4be6552b2f10ec1bf35509e245 (patch) | |
| tree | 91602a7732d216bff3fbaf2d6158e965460019e5 /arch/x86_64/scripts/kernel.ld | |
| parent | 3fb836101a2032e93f7b82c924ce208d7377a5ea (diff) | |
| parent | 1031a69ca5e23f2087148ad57e57506735872617 (diff) | |
| download | teachos-c4ced070ab057e4be6552b2f10ec1bf35509e245.tar.xz teachos-c4ced070ab057e4be6552b2f10ec1bf35509e245.zip | |
Merge branch 'feat_inital_context_switching' into 'develop_ba'
Implement Context Switching
See merge request teachos/kernel!6
Diffstat (limited to 'arch/x86_64/scripts/kernel.ld')
| -rw-r--r-- | arch/x86_64/scripts/kernel.ld | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/x86_64/scripts/kernel.ld b/arch/x86_64/scripts/kernel.ld index cc07896..3d9a7ae 100644 --- a/arch/x86_64/scripts/kernel.ld +++ b/arch/x86_64/scripts/kernel.ld @@ -85,9 +85,20 @@ SECTIONS KEEP(*crtn.s.o*(.fini)) } + .stl_text ALIGN(4K) : AT(ADDR (.stl_text)) + { + *(.stl_text .stl_text*) + KEEP(*libstdc++.a:*(.text .text.*)) + } + .text ALIGN(4K) : AT(ADDR (.text)) { - *(.text*) + *(.text .text.*) + } + + .user_text ALIGN(4K) : AT(ADDR (.user_text)) + { + *(.user_text .user_text.*) } .rodata ALIGN(4K) : AT (ADDR (.rodata)) @@ -123,6 +134,11 @@ SECTIONS *(.data*) } + .user_data ALIGN(4K) : AT (ADDR (.user_data)) + { + *(.user_data .user_data.*) + } + /*************************************************************************** * In accordance with the symbol definitions at the start, we generate some * symbols to mark the end of our loaded image. |
