X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2FMakefile;h=27a2ec023c735bbb1d28b5ea24dde8be3bad501c;hb=c53f11b9694ec833b145cfa9660eaca17a4732d7;hp=051d126e0d068d04bbbcc90b149c40efaf01848b;hpb=9d3800f60f2212432e550a4e003ae65b498a4d36;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/Makefile b/Kernel/arch/x86/Makefile
index 051d126e..27a2ec02 100644
--- a/Kernel/arch/x86/Makefile
+++ b/Kernel/arch/x86/Makefile
@@ -3,16 +3,29 @@
 # i386 Architecture Makefile
 # arch/i386/Makefile
 
-# Assuming build machine is 32-bit ELF
-#CC = gcc
-#AS = nasm
-#LD = ld
-#OBJDUMP = objdump
+AS_SUFFIX = asm
 
 CPPFLAGS	=
 CFLAGS		=
 ASFLAGS		= -f elf
 
+USE_MP=0
+USE_PAE=0
+
+ifeq ($(ARCH),i386)
+	USE_MP=0
+	USE_PAE=0
+else ifeq ($(ARCH),i486)
+	USE_MP=1
+else ifeq ($(ARCH),i586)
+	USE_MP=1
+	USE_PAE=1
+endif
+
+ASFLAGS += -D USE_MP=$(USE_MP) -D USE_PAE=$(USE_PAE)
+CPPFLAGS += -DUSE_MP=$(USE_MP) -DUSE_PAE=$(USE_PAE)
+
 A_OBJ  = start.ao main.o lib.o desctab.ao errors.o irq.o
 A_OBJ += mm_phys.o mm_virt.o
-A_OBJ += proc.o time.o
+A_OBJ += proc.o proc.ao time.o vm8086.o
+A_OBJ += kpanic.o