X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2FMakefile;h=22ad8c93c375f5ca09e42edf9b92bbbdb7c46015;hb=18b264927674c480481466c40368554fb72f560f;hp=6bc6419b960b633834c459b65f5dd090ddb7785d;hpb=eecce4b7a55315f6c385ad8be35c25dbb12d43d8;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/Makefile b/Kernel/arch/x86_64/Makefile index 6bc6419b..22ad8c93 100644 --- a/Kernel/arch/x86_64/Makefile +++ b/Kernel/arch/x86_64/Makefile @@ -3,26 +3,20 @@ # i386 Architecture Makefile # arch/i386/Makefile -# Assuming build machine is 32-bit ELF -#CC = gcc -#AS = nasm -#LD = ld -#OBJDUMP = objdump - MAX_CPUS := 4 -CPPFLAGS := -DMAX_CPUS=$(MAX_CPUS) -CFLAGS := $(KERNEL_CFLAGS) -ASFLAGS := -f elf64 -D MAX_CPUS=$(MAX_CPUS) +CPPFLAGS := -DMAX_CPUS=$(MAX_CPUS) -D USE_MP=0 +CFLAGS := $(KERNEL_CFLAGS) -mno-sse -mno-mmx +ASFLAGS := -f elf64 -D MAX_CPUS=$(MAX_CPUS) -D USE_MP=0 LDFLAGS := -nostdlib -nodefaultlibs ifeq ($(ARCH),amd64) ASFLAGS += -D AMD64=1 CPPFLAGS += -DAMD64=1 else - ifeq ($(ARCH),ia64) - ASFLAGS += -D AMD64=0 -D IA64=1 - CPPFLAGS += -DAMD64=0 -DIA64=1 + ifeq ($(ARCH),x86_64) + ASFLAGS += -D AMD64=0 -D X86_64=1 + CPPFLAGS += -DAMD64=0 -DX86_64=1 endif endif