Load ELF kernel instead of flat binary

[nameless-os.git] / boot / x86 / Makefile

diff --git a/boot/x86/Makefile b/boot/x86/Makefile
index a5bad92491c5763fbdc74b3cd95b48f66d55d446..e75e8dc23573c664b7cbeb8de2ab66ae69720b39 100644 (file)
--- a/boot/x86/Makefile
+++ b/boot/x86/Makefile
@@ -1,10 +1,10 @@
 default: mbr vbr-fat32 stage3/LOADER.BIN stage3/loader.elf
 
-CFLAGS=-g -ffreestanding
+CFLAGS=-g -ffreestanding -Istage3
 LD=i686-elf-gcc
-LDFLAGS=-T stage3/stage3.ld -nostdlib -g
+LDFLAGS=-T stage3/stage3.ld -ffreestanding -nostdlib -g
 
-STAGE3_OBJ=stage3/loader.o stage3/paging.o
+STAGE3_OBJ=stage3/loader.o stage3/paging.o stage3/elf.o stage3/prekernel.o
 
 mbr: mbr.s
        $(AS) $(ASFLAGS) -w-zeroing -o $@ $<
@@ -13,10 +13,10 @@ vbr-fat32: vbr-fat32.s fat32/*.s
        $(AS) $(ASFLAGS) -o $@ $<
 
 stage3/loader.elf: $(STAGE3_OBJ)
-       $(CC) $(LDFLAGS) -o $@ $^ -Wl,--oformat=elf32-i386
+       $(CC) $(LDFLAGS) -o $@ $^ -lgcc -Wl,--oformat=elf32-i386
 
 stage3/LOADER.BIN: $(STAGE3_OBJ)
-       $(CC) $(LDFLAGS) -o $@ $^
+       $(CC) $(LDFLAGS) -o $@ $^ -lgcc
 
 stage3/loader.o: stage3/loader.s stage3/*.s
        $(AS) $(ASFLAGS) -f elf -g dwarf2 -DGIT_REVISION=\"$(GIT_REV)\" -o $@ $<