From 910a0e10937ce7df1d55ef7076e193072e495057 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Fri, 1 Jun 2012 16:58:00 +0200 Subject: [PATCH] kernel: make sure mpx.S is linked early . for qemu multiboot detection --- kernel/Makefile | 5 +++-- kernel/arch/i386/Makefile.inc | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 8cc59213d..b85519743 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -3,7 +3,9 @@ PROG= kernel -SRCS= clock.c cpulocals.c interrupt.c main.c proc.c start.c system.c \ +.include "arch/${ARCH}/Makefile.inc" + +SRCS+= clock.c cpulocals.c interrupt.c main.c proc.c start.c system.c \ table.c utility.c DPADD+= ${LIBTIMERS} ${LIBSYS} ${LIBEXEC} @@ -29,7 +31,6 @@ BINDIR= /usr/sbin MAN= .include "system/Makefile.inc" -.include "arch/${ARCH}/Makefile.inc" .ifdef CONFIG_SMP SRCS+= smp.c diff --git a/kernel/arch/i386/Makefile.inc b/kernel/arch/i386/Makefile.inc index a53824aab..53bbfb13f 100644 --- a/kernel/arch/i386/Makefile.inc +++ b/kernel/arch/i386/Makefile.inc @@ -4,9 +4,9 @@ HERE=${.CURDIR}/arch/${ARCH} .PATH: ${HERE} -SRCS+= arch_clock.c arch_do_vmctl.c arch_system.c \ +SRCS+= mpx.S arch_clock.c arch_do_vmctl.c arch_system.c \ do_iopenable.c do_readbios.c do_sdevio.c exception.c i8259.c io_inb.S \ - io_inl.S io_intr.S io_inw.S io_outb.S io_outl.S io_outw.S klib.S klib16.S memory.c mpx.S multiboot.S \ + io_inl.S io_intr.S io_inw.S io_outb.S io_outl.S io_outw.S klib.S klib16.S memory.c multiboot.S \ oxpcie.c pre_init.c protect.c .if ${USE_ACPI} != "no" -- 2.44.0