From 983c5d6e276f7ecaa400b8c1d9cd08deef03e818 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Thu, 17 May 2018 17:07:15 +0200 Subject: [PATCH] qemu i386 hardcoded --- kernel-rs/mk/qemu.mk | 2 +- kernel-rs/src/arch/x86/linker.ld | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/kernel-rs/mk/qemu.mk b/kernel-rs/mk/qemu.mk index 44fce0d2..db0f170c 100644 --- a/kernel-rs/mk/qemu.mk +++ b/kernel-rs/mk/qemu.mk @@ -6,7 +6,7 @@ else PORTG := 4344 endif -QEMU := qemu-system-$(ARCH)\ +QEMU := qemu-system-i386\ -gdb tcp::$(PORTG)\ -S\ -enable-kvm\ diff --git a/kernel-rs/src/arch/x86/linker.ld b/kernel-rs/src/arch/x86/linker.ld index 4b3004c1..96419d19 100644 --- a/kernel-rs/src/arch/x86/linker.ld +++ b/kernel-rs/src/arch/x86/linker.ld @@ -34,6 +34,14 @@ SECTIONS { . = ALIGN(4K); } + /* NOT A GOOD IDEA TO GROUP debug_* SYMBOLS ! */ + /* .debug : */ + /* { */ + /* /1* KEEP(*(.debug_*)) *1/ */ + /* *(.debug_*) */ + /* . = ALIGN(4K); */ + /* } */ + .gdt : { *(.gdt)