From 3bfcaeaf015ffe0d92937c023e9a0086909a0161 Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Sat, 29 Sep 2018 08:30:50 -0400 Subject: Make sysexit and trapret paths the same, so that forkret can return through either path. This helped tracking down a bug: use 144 instead of 32 to find cs in trapframe so that gs is correctly saved and restored. For good measure update linker script, because newer versions of GCC sometimes places symbols passed end. --- kernel.ld | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'kernel.ld') diff --git a/kernel.ld b/kernel.ld index e78fd38..11dc98f 100644 --- a/kernel.ld +++ b/kernel.ld @@ -41,9 +41,10 @@ SECTIONS .data : { *(.data) } - PROVIDE(edata = .); - .bss : { + bss : { + PROVIDE(edata = .); *(.bss) + *(COMMON) + PROVIDE(end = .); } - PROVIDE(end = .); } -- cgit v1.2.3