From 6a2ae067fc577754bda60f5b4c2878bf9b0ae26c Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Mon, 6 Mar 2017 22:25:03 +0100 Subject: move architecture-specific compiler flags Architecture-specific compiler flags are now located in arch/*/config.mk instead of the main config.mk. --- arch/x86_64/config.mk | 4 ++++ config.mk | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86_64/config.mk b/arch/x86_64/config.mk index ecbef44..a0e27ab 100644 --- a/arch/x86_64/config.mk +++ b/arch/x86_64/config.mk @@ -1,2 +1,6 @@ +CFLAGS += -m32 +ASFLAGS += --32 +LDFLAGS += -melf_i386 + CPPFLAGS += -DCHAR_IS_INT8 -DSHORT_IS_INT16 -DINT_IS_INT32 CPPFLAGS += -DENABLE_VGA diff --git a/config.mk b/config.mk index a1c6379..42505e4 100644 --- a/config.mk +++ b/config.mk @@ -8,9 +8,7 @@ LD ?= $(CROSS_COMPILER)ld RM ?= rm -f CP ?= cp -v -CFLAGS += -m32 -nostdlib -fno-builtin -fno-leading-underscore -MMD -MP -Iinclude -ASFLAGS += --32 -LDFLAGS += -melf_i386 +CFLAGS += -nostdlib -fno-builtin -fno-leading-underscore -MMD -MP -Iinclude QEMU ?= qemu-system-$(ARCH) -- cgit v1.2.3