[src/trunk]: src/sys/arch/amd64/amd64 put the old and the very old syscall gl...

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

details:   https://anonhg.NetBSD.org/src/rev/b9d53181e861
branches:  trunk
changeset: 559779:b9d53181e861
user:      drochner <drochner%NetBSD.org@localhost>
date:      Tue Mar 23 19:39:42 2004 +0000

description:
put the old and the very old syscall glue into appropriate
COMPAT_ conditionals

diffstat:

 sys/arch/amd64/amd64/locore.S |  16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diffs (54 lines):

diff -r 659ab3d94340 -r b9d53181e861 sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Tue Mar 23 19:35:16 2004 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Tue Mar 23 19:39:42 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.11 2004/03/01 12:10:41 drochner Exp $     */
+/*     $NetBSD: locore.S,v 1.12 2004/03/23 19:39:42 drochner Exp $     */
 
 /*
  * Copyright-o-rama!
@@ -117,6 +117,10 @@
 #include "opt_lockdebug.h"
 #include "opt_realmem.h"
 
+#include "opt_compat_netbsd.h"
+#include "opt_compat_netbsd32.h"
+#include "opt_compat_ibcs2.h"
+
 #include "assym.h"
 #include "lapic.h"
 #include "ioapic.h"
@@ -1272,10 +1276,13 @@
        call    *%r12
        jmp     syscall_return
 
+#if defined(COMPAT_16) || defined(COMPAT_IBCS2) || defined(COMPAT_NETBSD32)
+
        .globl  _C_LABEL(osyscall_return)
 
+#if defined(COMPAT_10) || defined(COMPAT_IBCS2)
 /*
- * Old call gate entry for syscall. XXXfvdl: only needed if we're
+ * Old call gate entry for syscall. only needed if we're
  * going to support running old NetBSD or ibcs2 binaries, etc,
  * on NetBSD/amd64.
  */
@@ -1286,6 +1293,8 @@
        pushq   $7              # size of instruction for restart
        jmp     osyscall1
 
+#endif
+
 /*
  * Trap gate entry for int $80 syscall, also used by sigreturn.
  */
@@ -1312,6 +1321,9 @@
        movq    %rsp,%rdi
        call    _C_LABEL(trap)
        jmp     2b
+
+#endif
+
 iret_return:
 #ifndef DIAGNOSTIC
 1:     INTRFASTEXIT