X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2FMakefile;h=647a49afffb91b9f5d2dcc4521fe3e706d05180f;hb=a1b7b0fcbf99e2c53dd6d7ee5961772bf29bdb2b;hp=3820a691db69cfff3ecaa5e7d615c0f5d1885509;hpb=302b755a1a7b1d607774353b908e325e934aacdc;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/Makefile b/Kernel/arch/x86_64/Makefile index 3820a691..647a49af 100644 --- a/Kernel/arch/x86_64/Makefile +++ b/Kernel/arch/x86_64/Makefile @@ -3,15 +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 = -CFLAGS = -ASFLAGS = -f elf +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 @@ -24,5 +21,6 @@ else endif -A_OBJ = start32.ao start64.ao -A_OBJ += main.o lib.o +A_OBJ = start32.ao start64.ao desctab.ao +A_OBJ += main.o lib.o proc.o mm_virt.o mm_phys.o vm8086.o +A_OBJ += kernelpanic.o errors.o