X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2FMakefile;h=27a2ec023c735bbb1d28b5ea24dde8be3bad501c;hb=046980a1afd982af07dc97aaadb186e31eebb340;hp=319c8f6f29926b20c0425a5cedb3c27af02ec8a9;hpb=d52a53f035af92941c0cafe5f81888fed16d2462;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/Makefile b/Kernel/arch/x86/Makefile
index 319c8f6f..27a2ec02 100644
--- a/Kernel/arch/x86/Makefile
+++ b/Kernel/arch/x86/Makefile
@@ -3,32 +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)
-	ASFLAGS += -D USE_MP=0 -D USE_PAE=0
-	CPPFLAGS += -DUSE_MP=0 -DUSE_PAE=0
-else
-	ifeq ($(ARCH),i486)
-		ASFLAGS += -D USE_MP=1 -D USE_PAE=0
-		CPPFLAGS += -DUSE_MP=1 -DUSE_PAE=0
-	else
-		ifeq ($(ARCH),i586)
-			ASFLAGS += -D USE_MP=1 -D USE_PAE=1
-			CPPFLAGS += -DUSE_MP=1 -DUSE_PAE=1
-		endif
-	endif
+	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