Kernel: Move Boot/ into Arch/i386/Boot (#667)

2026-01-06 16:45:03 +00:00 · 2019-10-20 06:15:39 +00:00
parent 8b07025145
commit d09a28856f
3 changed files with 2 additions and 2 deletions
--- a/Kernel/Arch/i386/Boot/boot.S
+++ b/Kernel/Arch/i386/Boot/boot.S
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -105,7 +105,7 @@ AK_OBJS = \
    ../AK/ELF/ELFLoader.o

 CXX_OBJS = $(KERNEL_OBJS) $(VFS_OBJS) $(AK_OBJS)
-OBJS = $(CXX_OBJS) Boot/boot.ao
+OBJS = $(CXX_OBJS) Arch/i386/Boot/boot.ao

 KERNEL = kernel
 CXXFLAGS += -ffreestanding -mregparm=3 -mno-80387 -mno-mmx -mno-sse -mno-sse2
--- a/Kernel/linker.ld
+++ b/Kernel/linker.ld
@@ -6,7 +6,7 @@ SECTIONS

 	.text BLOCK(4K) : ALIGN(4K)
 	{
-        Boot/boot.ao
+        Arch/i386/Boot/boot.ao
 		*(.multiboot)
 		*(.text)
 	}