X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2FMakefile;h=f539e250146dde8176da68b1ae03deb81ea3d302;hb=a4a71f89713c34454ef254bbb1a1ea9ed773fa1b;hp=e4fe5ad4e6a152cb5fba9de1edd906ba260a59da;hpb=33bcf4b3feb0e5e4548548bf3d2a50c52ffb6115;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/Makefile b/Kernel/arch/x86_64/Makefile index e4fe5ad4..f539e250 100644 --- a/Kernel/arch/x86_64/Makefile +++ b/Kernel/arch/x86_64/Makefile @@ -3,17 +3,12 @@ # 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) +CFLAGS := $(KERNEL_CFLAGS) -mno-sse -mno-mmx ASFLAGS := -f elf64 -D MAX_CPUS=$(MAX_CPUS) +LDFLAGS := -nostdlib -nodefaultlibs ifeq ($(ARCH),amd64) ASFLAGS += -D AMD64=1 @@ -27,4 +22,5 @@ endif A_OBJ = start32.ao start64.ao desctab.ao -A_OBJ += main.o lib.o proc.o mm_virt.o mm_phys.o +A_OBJ += main.o lib.o proc.o mm_virt.o mm_phys.o vm8086.o +A_OBJ += kernelpanic.o errors.o