Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/xen/conf Fix the build, on Xen too amd64_trap.S nee...



details:   https://anonhg.NetBSD.org/src/rev/29da84aef87d
branches:  trunk
changeset: 829183:29da84aef87d
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun Jan 21 08:33:46 2018 +0000

description:
Fix the build, on Xen too amd64_trap.S needs to be compiled independently.

diffstat:

 sys/arch/xen/conf/Makefile.xen |  15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r db5d9a946936 -r 29da84aef87d sys/arch/xen/conf/Makefile.xen
--- a/sys/arch/xen/conf/Makefile.xen    Sun Jan 21 08:20:30 2018 +0000
+++ b/sys/arch/xen/conf/Makefile.xen    Sun Jan 21 08:33:46 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xen,v 1.44 2017/12/12 08:27:32 pgoyette Exp $
+#      $NetBSD: Makefile.xen,v 1.45 2018/01/21 08:33:46 maxv Exp $
 #      NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp 
 
 # Makefile for NetBSD
@@ -66,6 +66,9 @@
 ## (4) local objects, compile rules, and dependencies
 ##
 MD_OBJS=       locore.o spl.o copy.o vector.o
+.if ${XEN_BUILD} == amd64
+MD_OBJS+=      amd64_trap.o
+.endif
 MD_CFILES=
 
 MD_SFILES=     $S/arch/${XEN_BUILD}/${XEN_BUILD}/locore.S \
@@ -73,6 +76,10 @@
                $S/arch/${XEN_BUILD}/${XEN_BUILD}/vector.S \
                $S/arch/${XEN_BUILD}/${XEN_BUILD}/copy.S
 
+.if ${XEN_BUILD} == amd64
+MD_SFILES+=    $S/arch/${XEN_BUILD}/${XEN_BUILD}/amd64_trap.S
+.endif
+
 copy.o: $S/arch/${XEN_BUILD}/${XEN_BUILD}/copy.S assym.h
        ${NORMAL_S}
 
@@ -84,6 +91,12 @@
 
 vector.o: $S/arch/${XEN_BUILD}/${XEN_BUILD}/vector.S assym.h
        ${NORMAL_S}
+
+.if ${XEN_BUILD} == amd64
+amd64_trap.o: $S/arch/${XEN_BUILD}/${XEN_BUILD}/amd64_trap.S assym.h
+       ${NORMAL_S}
+.endif
+
 .ifndef noBEGIN
 .if !make(obj) && !make(clean) && !make(cleandir)
 .BEGIN::



Home | Main Index | Thread Index | Old Index