X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2FMakefile;h=a72216a350d0f49dbf6f36e8a45c5aca0447030f;hb=e7dd0e094f0c23bb20ddb0025f41d1c0c28f5ab2;hp=3820a691db69cfff3ecaa5e7d615c0f5d1885509;hpb=b98fbd4e9c71447d81fc9bd643fb174c76346e0f;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/Makefile b/Kernel/arch/x86_64/Makefile
index 3820a691..a72216a3 100644
--- a/Kernel/arch/x86_64/Makefile
+++ b/Kernel/arch/x86_64/Makefile
@@ -3,26 +3,30 @@
 # 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	=
-CFLAGS		=
-ASFLAGS		= -f elf
+AS_SUFFIX = asm
+
+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
 	
 
-A_OBJ  = start32.ao start64.ao
-A_OBJ += main.o lib.o
+A_OBJ := start32.ao start64.ao desctab.ao proc.ao
+A_OBJ += main.o lib.o proc.o mm_virt.o mm_phys.o
+A_OBJ += kernelpanic.o errors.o time.o pci.o
+A_OBJ += vm8086.o
+# rme.o
+
+POSTBUILD = objcopy $(BIN) -F elf32-i386 $(BIN)