Add panic facility

[nameless-os.git] / Makefile

diff --git a/Makefile b/Makefile
index 8ffcdf86123bb9b1acee0fe0ab3746d4d339cfbb..0e56c23ed6081d925a3a0299a6f32c6a6c0a7e92 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,13 @@ export AS = yasm
 export CC = i686-elf-gcc
 QEMU = qemu-system-i386 -monitor stdio
 
-GIT_REV = $(shell git rev-parse --short HEAD)
+export GIT_REV = $(shell git describe --long HEAD)
 
-CFLAGS = -std=gnu89 -g -Iinclude/arch/x86 -ffreestanding -DGIT_COMMIT=\"$(GIT_REV)\"
+CFLAGS = -g -fgnu89-inline -Iinclude/arch/x86 -ffreestanding -DGIT_COMMIT=\"$(GIT_REV)\"
 
 KERNEL_OBJ = kernel/entry.o kernel/arch/x86/tty/tty.o kernel/drivers/irq/i8259a.o kernel/arch/x86/irq/idt.o kernel/arch/x86/irq/sample_handler.o kernel/kernel.o
-BOOTLOADER_OBJ = boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN
+
+BOOTLOADER_OBJ = boot/x86/mbr boot/x86/vbr-fat32 boot/x86/stage3/LOADER.BIN boot/x86/stage3/loader.elf
 
 default: kernel/kernel.elf bootloader
 
@@ -18,9 +19,13 @@ bootloader: $(BOOTLOADER_OBJ)
 run: all
        $(QEMU) boot/x86/disk.img
 
+debug: all
+       $(QEMU) -s -S boot/x86/disk.img
+
 boot/x86/mbr: boot/x86/mbr.s
 boot/x86/vbr-fat32: boot/x86/vbr-fat32.s boot/x86/fat32/*.s 
-boot/x86/stage3/LOADER.BIN: boot/x86/stage3/*.s boot/x86/fat32/*.s
+boot/x86/stage3/LOADER.BIN: boot/x86/stage3/*.s boot/x86/stage3/*.c boot/x86/fat32/*.s
+boot/x86/stage3/loader.elf: boot/x86/stage3/*.s boot/x86/stage3/*.c boot/x86/fat32/*.s
 $(BOOTLOADER_OBJ):
        $(MAKE) -C boot/x86
 
@@ -52,4 +57,4 @@ clean:
        -rm kernel/kernel.{bin,dbg,elf} ${KERNEL_OBJ}
        cd boot/x86 && $(MAKE) clean
 
-.PHONY: default all clean run bootloader
+.PHONY: default all clean run debug bootloader