[src/trunk]: src/sys/arch/amd64/amd64 Fix build without XEN

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4b7d06ae614b
branches:  trunk
changeset: 932231:4b7d06ae614b
user:      christos <christos%NetBSD.org@localhost>
date:      Sat May 02 19:01:08 2020 +0000

description:
Fix build without XEN

diffstat:

 sys/arch/amd64/amd64/locore.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r bce42d878da8 -r 4b7d06ae614b sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Sat May 02 18:49:57 2020 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Sat May 02 19:01:08 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.206 2020/05/02 16:44:34 bouyer Exp $      */
+/*     $NetBSD: locore.S,v 1.207 2020/05/02 19:01:08 christos Exp $    */
 
 /*
  * Copyright-o-rama!
@@ -1005,7 +1005,8 @@
        call    _C_LABEL(main)
 END(start)
 
-#ifndef XENPV
+#if defined(XEN)
+# if !defined(XENPV)
 /* entry point for Xen PVH */
        .code32
 ENTRY(start_xen32)
@@ -1062,8 +1063,7 @@
        jmp .Lbiosbasemem_finished
 END(start_xen32)
        .code64
-#endif /* XENPV */
-#if defined(XEN)
+# endif /* !XENPV */
 /* space for the hypercall call page */
 #define HYPERCALL_PAGE_OFFSET 0x1000
 .align HYPERCALL_PAGE_OFFSET