Module Name: src
Committed By: maxv
Date: Sun Jan 21 08:33:46 UTC 2018
Modified Files:
src/sys/arch/xen/conf: Makefile.xen
Log Message:
Fix the build, on Xen too amd64_trap.S needs to be compiled independently.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/xen/conf/Makefile.xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/conf/Makefile.xen
diff -u src/sys/arch/xen/conf/Makefile.xen:1.44 src/sys/arch/xen/conf/Makefile.xen:1.45
--- src/sys/arch/xen/conf/Makefile.xen:1.44 Tue Dec 12 08:27:32 2017
+++ src/sys/arch/xen/conf/Makefile.xen Sun Jan 21 08:33:46 2018
@@ -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 @@ KERN_AS= obj
## (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 @@ MD_SFILES= $S/arch/${XEN_BUILD}/${XEN_BU
$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 @@ spl.o: $S/arch/${XEN_BUILD}/${XEN_BUILD}
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::
