X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2FMakefile;h=1b0246bb51e33f344120fdaf1203f09c83f5711f;hb=3764c294f21229bdf700f436fa4884f5e76e0d3a;hp=647a49afffb91b9f5d2dcc4521fe3e706d05180f;hpb=a1b7b0fcbf99e2c53dd6d7ee5961772bf29bdb2b;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/Makefile b/Kernel/arch/x86_64/Makefile index 647a49af..1b0246bb 100644 --- a/Kernel/arch/x86_64/Makefile +++ b/Kernel/arch/x86_64/Makefile @@ -5,6 +5,8 @@ MAX_CPUS := 4 +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 @@ -14,13 +16,17 @@ 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 += main.o lib.o proc.o mm_virt.o mm_phys.o vm8086.o -A_OBJ += kernelpanic.o errors.o +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)