aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorLoic Guegan <manzerbredes@mailbox.org>2021-04-08 13:07:17 +0200
committerLoic Guegan <manzerbredes@mailbox.org>2021-04-08 13:07:17 +0200
commit958e2dae042ca9e28f23e509d541730f30fa8502 (patch)
tree8911572335763866ed39cc7ec7855131929a0994 /src/Makefile
parentdb553d05824ae463752c8b528feac963e41d9f1c (diff)
Switch to multiboot2 and improve interrupt management
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile
index b95e38d..28081af 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,6 @@
EXEC := bringelle
CC := gcc -c -m32 -fno-pie -fno-builtin -fno-stack-protector
+LD_SCRIPT := linker.ld
# Note that BOOT_OBJ do not match boot.S
# Indeed boot.o generated by boot.S should appear
@@ -10,19 +11,19 @@ UTILS_OBJ := $(addsuffix .o,$(basename $(shell find ./utils -name "*.[c|S]")))
all: $(EXEC)
$(EXEC): boot/boot.o $(UTILS_OBJ) bringelle.o
- ld -Ttext=0x00100000 -melf_i386 -nostdlib --oformat=binary -o bringelle $^
+ ld -n -T $(LD_SCRIPT) -nostdlib -o bringelle $^
%.o: %.S
as --32 -o $@ $^ -mx86-used-note=no
%.o: %.c
$(CC) -o $@ $<
- objcopy --remove-section .note.gnu.property $@
-
+ #objcopy --remove-section .note.gnu.property $@
+
clean:
rm -f $(EXEC)
find ./ -name "*.o" -delete
-.PHONY: clean
+.PHONY: clean cdrom