X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2FMakefile;h=1b0246bb51e33f344120fdaf1203f09c83f5711f;hb=3764c294f21229bdf700f436fa4884f5e76e0d3a;hp=e4fe5ad4e6a152cb5fba9de1edd906ba260a59da;hpb=33bcf4b3feb0e5e4548548bf3d2a50c52ffb6115;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/Makefile b/Kernel/arch/x86_64/Makefile
index e4fe5ad4..1b0246bb 100644
--- a/Kernel/arch/x86_64/Makefile
+++ b/Kernel/arch/x86_64/Makefile
@@ -3,28 +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	:= -DMAX_CPUS=$(MAX_CPUS)
-CFLAGS		:= $(KERNEL_CFLAGS)
-ASFLAGS		:= -f elf64 -D MAX_CPUS=$(MAX_CPUS)
+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 desctab.ao
+A_OBJ := start32.ao start64.ao desctab.ao
 A_OBJ += main.o lib.o proc.o mm_virt.o mm_phys.o
+A_OBJ += kernelpanic.o errors.o time.o
+A_OBJ += vm8086.o
+# rme.o
+
+POSTBUILD = objcopy $(BIN) -F elf32-i386 $(BIN)