diff options
| author | Robin Krahl <robin.krahl@ireas.org> | 2017-03-06 22:25:03 +0100 |
|---|---|---|
| committer | Robin Krahl <robin.krahl@ireas.org> | 2017-03-06 22:25:03 +0100 |
| commit | 6a2ae067fc577754bda60f5b4c2878bf9b0ae26c (patch) | |
| tree | 04be25939fc0b2e2e03ba660defca3ba44be0a60 | |
| parent | 05b9ca73793047e795e46a2ae13db02c34b8a7c3 (diff) | |
| download | garmos-6a2ae067fc577754bda60f5b4c2878bf9b0ae26c.tar.gz garmos-6a2ae067fc577754bda60f5b4c2878bf9b0ae26c.tar.bz2 | |
Architecture-specific compiler flags are now located in arch/*/config.mk
instead of the main config.mk.
| -rw-r--r-- | arch/x86_64/config.mk | 4 | ||||
| -rw-r--r-- | 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 @@ -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) |