RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 11:47:35 +00:00
Code Issues Activity Actions

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

Browse source
This commit is contained in:
Tidux 2019-10-20 06:15:39 +00:00 • committed by Andreas Kling
parent 8b07025145
commit d09a28856f
3 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

0
Kernel/Boot/boot.S → Kernel/Arch/i386/Boot/boot.S
View file

2
Kernel/Makefile
View file

@ -105,7 +105,7 @@ AK_OBJS = \
../AK/ELF/ELFLoader.o ../AK/ELF/ELFLoader.o
CXX_OBJS = $(KERNEL_OBJS) $(VFS_OBJS) $(AK_OBJS) CXX_OBJS = $(KERNEL_OBJS) $(VFS_OBJS) $(AK_OBJS)
OBJS = $(CXX_OBJS) Boot/boot.ao OBJS = $(CXX_OBJS) Arch/i386/Boot/boot.ao
KERNEL = kernel KERNEL = kernel
CXXFLAGS += -ffreestanding -mregparm=3 -mno-80387 -mno-mmx -mno-sse -mno-sse2 CXXFLAGS += -ffreestanding -mregparm=3 -mno-80387 -mno-mmx -mno-sse -mno-sse2

2
Kernel/linker.ld
View file

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