X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2FMakefile;h=6bc6419b960b633834c459b65f5dd090ddb7785d;hb=eecce4b7a55315f6c385ad8be35c25dbb12d43d8;hp=3820a691db69cfff3ecaa5e7d615c0f5d1885509;hpb=b98fbd4e9c71447d81fc9bd643fb174c76346e0f;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/Makefile b/Kernel/arch/x86_64/Makefile index 3820a691..6bc6419b 100644 --- a/Kernel/arch/x86_64/Makefile +++ b/Kernel/arch/x86_64/Makefile @@ -9,9 +9,12 @@ #LD = ld #OBJDUMP = objdump -CPPFLAGS = -CFLAGS = -ASFLAGS = -f elf +MAX_CPUS := 4 + +CPPFLAGS := -DMAX_CPUS=$(MAX_CPUS) +CFLAGS := $(KERNEL_CFLAGS) +ASFLAGS := -f elf64 -D MAX_CPUS=$(MAX_CPUS) +LDFLAGS := -nostdlib -nodefaultlibs ifeq ($(ARCH),amd64) ASFLAGS += -D AMD64=1 @@ -24,5 +27,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