X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2FMakefile;h=d0d4f84861e3a8a4a134564b60c74b0d0d1616b4;hb=8a998da38a4eecface76749701079c833d64a7d8;hp=647a49afffb91b9f5d2dcc4521fe3e706d05180f;hpb=a1b7b0fcbf99e2c53dd6d7ee5961772bf29bdb2b;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/Makefile b/Kernel/arch/x86_64/Makefile index 647a49af..d0d4f848 100644 --- a/Kernel/arch/x86_64/Makefile +++ b/Kernel/arch/x86_64/Makefile @@ -14,13 +14,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 := 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 +A_OBJ += vm8086.o +# rme.o + +POSTBUILD = objcopy $(BIN) -F elf32-i386 $(BIN)