kernel: Enable -O2 and LTO again

[nameless-os.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index 48115dd74f927a8246a1ec9edc2804a482350682..0290ee11eda0df03ad558bc69c4d7fab590ca8bc 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,16 +1,15 @@
-KERNEL_OBJ = kernel.o entry.o
-
-include drivers/Makefile
 include arch/x86/Makefile
+include drivers/Makefile
+include kernel/Makefile
 
 ASFLAGS_BASE = -f elf -g dwarf2
 CFLAGS_BASE = -fgnu89-inline -ffreestanding -nostdlib -Iinclude \
              -Iinclude/arch/x86 -g -DGIT_COMMIT=\"$(GIT_REV)\" \
              -O2 -flto
-LDFLAGS_BASE = -ffreestanding -nostdlib -lgcc -g -flto
+LDFLAGS_BASE = -ffreestanding -nostdlib -lgcc -g -O2 -flto -T arch/x86/linker.ld
 
 kernel.elf kernel.dbg: $(KERNEL_OBJ)
-       $(REAL_CC) $(LDFLAGS_BASE) $(LDFLAGS) -T linker.ld $^ -o $@
+       $(REAL_CC) $(LDFLAGS_BASE) $(LDFLAGS) $^ -o $@
        $(CROSS_COMPILE)objcopy --only-keep-debug kernel.elf kernel.dbg
        $(CROSS_COMPILE)objcopy --add-gnu-debuglink=kernel.dbg kernel.elf
        $(CROSS_COMPILE)strip --strip-unneeded kernel.elf