X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2FMakefile;h=6d9d14b901d8266205478a97d94016c55b226c12;hb=717454930aa0e255517c68c837927deac49bd78e;hp=0c442882e69979bb48dbc5222d0eab88e413c747;hpb=814b2d0009da73b56c6def5d70a9dd97c7b17e2e;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/Makefile b/Kernel/arch/x86/Makefile
index 0c442882..6d9d14b9 100644
--- a/Kernel/arch/x86/Makefile
+++ b/Kernel/arch/x86/Makefile
@@ -3,33 +3,30 @@
 # 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 ARCH=\"$(ARCH)\" -D ARCHDIR=\"$(ARCHDIR)\"
+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 proc.ao time.o vm8086.o
-A_OBJ += kpanic.o
+A_OBJ += kpanic.o pci.o