Module Name: src
Committed By: thorpej
Date: Tue Jan 16 15:38:59 UTC 2024
Modified Files:
src/sys/arch/amiga/amiga: locore.s
src/sys/arch/atari/atari: locore.s
src/sys/arch/cesfic/cesfic: locore.s
src/sys/arch/hp300/hp300: locore.s
src/sys/arch/luna68k/luna68k: locore.s
src/sys/arch/m68k/conf: files.m68k
src/sys/arch/m68k/m68k: support.s
src/sys/arch/mac68k/mac68k: locore.s
src/sys/arch/mvme68k/mvme68k: locore.s
src/sys/arch/news68k/news68k: locore.s
src/sys/arch/next68k/next68k: locore.s
src/sys/arch/sun2/sun2: locore.s
src/sys/arch/sun3/sun3: locore.s
src/sys/arch/sun3/sun3x: locore.s
src/sys/arch/virt68k/virt68k: locore.s
src/sys/arch/x68k/x68k: locore.s
Log Message:
Build m68k/support.s on its own; don't include it from locore.s
To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/arch/amiga/amiga/locore.s
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/atari/atari/locore.s
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/m68k/conf/files.m68k
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/m68k/support.s
cvs rdiff -u -r1.180 -r1.181 src/sys/arch/mac68k/mac68k/locore.s
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/sun2/sun2/locore.s
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sun3/sun3/locore.s
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/sun3/sun3x/locore.s
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/virt68k/virt68k/locore.s
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/x68k/x68k/locore.s
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/amiga/amiga/locore.s
diff -u src/sys/arch/amiga/amiga/locore.s:1.167 src/sys/arch/amiga/amiga/locore.s:1.168
--- src/sys/arch/amiga/amiga/locore.s:1.167 Fri Jan 12 01:53:56 2024
+++ src/sys/arch/amiga/amiga/locore.s Tue Jan 16 15:38:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.167 2024/01/12 01:53:56 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.168 2024/01/16 15:38:57 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -1063,11 +1063,6 @@ Lnoflush:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* non-local gotos
*/
ENTRY(qsetjmp)
Index: src/sys/arch/atari/atari/locore.s
diff -u src/sys/arch/atari/atari/locore.s:1.123 src/sys/arch/atari/atari/locore.s:1.124
--- src/sys/arch/atari/atari/locore.s:1.123 Fri Jan 12 01:53:57 2024
+++ src/sys/arch/atari/atari/locore.s Tue Jan 16 15:38:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.123 2024/01/12 01:53:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.124 2024/01/16 15:38:57 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -1052,11 +1052,6 @@ Lnoflush:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* non-local gotos
*/
ENTRY(qsetjmp)
Index: src/sys/arch/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.43 src/sys/arch/cesfic/cesfic/locore.s:1.44
--- src/sys/arch/cesfic/cesfic/locore.s:1.43 Mon Jan 15 19:28:06 2024
+++ src/sys/arch/cesfic/cesfic/locore.s Tue Jan 16 15:38:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.43 2024/01/15 19:28:06 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.44 2024/01/16 15:38:57 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -735,11 +735,6 @@ Ldorte:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#define FPCOPROC /* XXX: Temporarily required */
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.181 src/sys/arch/hp300/hp300/locore.s:1.182
--- src/sys/arch/hp300/hp300/locore.s:1.181 Tue Jan 16 03:44:44 2024
+++ src/sys/arch/hp300/hp300/locore.s Tue Jan 16 15:38:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.181 2024/01/16 03:44:44 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.182 2024/01/16 15:38:57 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -957,11 +957,6 @@ Laststkadj:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#define FPCOPROC /* XXX: Temp. reqd. */
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.79 src/sys/arch/luna68k/luna68k/locore.s:1.80
--- src/sys/arch/luna68k/luna68k/locore.s:1.79 Mon Jan 15 20:10:34 2024
+++ src/sys/arch/luna68k/luna68k/locore.s Tue Jan 16 15:38:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.79 2024/01/15 20:10:34 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.80 2024/01/16 15:38:57 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -659,11 +659,6 @@ Laststkadj:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#define FPCOPROC /* XXX: Temp. reqd. */
Index: src/sys/arch/m68k/conf/files.m68k
diff -u src/sys/arch/m68k/conf/files.m68k:1.51 src/sys/arch/m68k/conf/files.m68k:1.52
--- src/sys/arch/m68k/conf/files.m68k:1.51 Wed Oct 21 13:31:51 2020
+++ src/sys/arch/m68k/conf/files.m68k Tue Jan 16 15:38:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.m68k,v 1.51 2020/10/21 13:31:51 christos Exp $
+# $NetBSD: files.m68k,v 1.52 2024/01/16 15:38:59 thorpej Exp $
#
defflag opt_fpsp.h FPSP
@@ -26,6 +26,7 @@ file arch/m68k/m68k/process_machdep.c
file arch/m68k/m68k/reenter_syscall.s
file arch/m68k/m68k/regdump.c
file arch/m68k/m68k/sig_machdep.c
+file arch/m68k/m68k/support.s
file arch/m68k/m68k/m68k_syscall.c
file arch/m68k/m68k/sunos_syscall.c compat_sunos
file arch/m68k/m68k/linux_syscall.c compat_linux
Index: src/sys/arch/m68k/m68k/support.s
diff -u src/sys/arch/m68k/m68k/support.s:1.9 src/sys/arch/m68k/m68k/support.s:1.10
--- src/sys/arch/m68k/m68k/support.s:1.9 Sat Jan 13 00:44:42 2024
+++ src/sys/arch/m68k/m68k/support.s Tue Jan 16 15:38:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: support.s,v 1.9 2024/01/13 00:44:42 thorpej Exp $ */
+/* $NetBSD: support.s,v 1.10 2024/01/16 15:38:59 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -42,12 +42,12 @@
* Miscellaneous support routines common to all m68k ports.
*/
-/*
- * NOTICE: This is not a standalone file. To use it, #include it in
- * your port's locore.s, like so:
- *
- * #include <m68k/m68k/support.s>
- */
+#include <machine/asm.h>
+
+#include "assym.h"
+
+ .file "support.s"
+ .text
/*
* non-local gotos
Index: src/sys/arch/mac68k/mac68k/locore.s
diff -u src/sys/arch/mac68k/mac68k/locore.s:1.180 src/sys/arch/mac68k/mac68k/locore.s:1.181
--- src/sys/arch/mac68k/mac68k/locore.s:1.180 Tue Jan 9 07:28:26 2024
+++ src/sys/arch/mac68k/mac68k/locore.s Tue Jan 16 15:38:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.180 2024/01/09 07:28:26 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.181 2024/01/16 15:38:57 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -899,11 +899,6 @@ ASENTRY_NOPROFILE(rei)
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#define FPCOPROC /* XXX: Temp. Reqd. */
Index: src/sys/arch/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.127 src/sys/arch/mvme68k/mvme68k/locore.s:1.128
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.127 Tue Jan 16 01:26:34 2024
+++ src/sys/arch/mvme68k/mvme68k/locore.s Tue Jan 16 15:38:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.127 2024/01/16 01:26:34 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.128 2024/01/16 15:38:57 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -972,11 +972,6 @@ Laststkadj:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#define FPCOPROC /* XXX: Temp. Reqd. */
Index: src/sys/arch/news68k/news68k/locore.s
diff -u src/sys/arch/news68k/news68k/locore.s:1.82 src/sys/arch/news68k/news68k/locore.s:1.83
--- src/sys/arch/news68k/news68k/locore.s:1.82 Mon Jan 15 20:21:51 2024
+++ src/sys/arch/news68k/news68k/locore.s Tue Jan 16 15:38:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.82 2024/01/15 20:21:51 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.83 2024/01/16 15:38:57 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -779,11 +779,6 @@ Laststkadj:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#define FPCOPROC /* XXX: Temp. Reqd. */
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.82 src/sys/arch/next68k/next68k/locore.s:1.83
--- src/sys/arch/next68k/next68k/locore.s:1.82 Tue Jan 16 00:34:58 2024
+++ src/sys/arch/next68k/next68k/locore.s Tue Jan 16 15:38:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.82 2024/01/16 00:34:58 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.83 2024/01/16 15:38:58 thorpej Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -724,11 +724,6 @@ Laststkadj:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#define FPCOPROC /* XXX: Temp. Reqd. */
Index: src/sys/arch/sun2/sun2/locore.s
diff -u src/sys/arch/sun2/sun2/locore.s:1.35 src/sys/arch/sun2/sun2/locore.s:1.36
--- src/sys/arch/sun2/sun2/locore.s:1.35 Mon Jan 15 17:40:34 2024
+++ src/sys/arch/sun2/sun2/locore.s Tue Jan 16 15:38:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.35 2024/01/15 17:40:34 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.36 2024/01/16 15:38:58 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -493,11 +493,6 @@ Ldorte:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#undef FPCOPROC
Index: src/sys/arch/sun3/sun3/locore.s
diff -u src/sys/arch/sun3/sun3/locore.s:1.107 src/sys/arch/sun3/sun3/locore.s:1.108
--- src/sys/arch/sun3/sun3/locore.s:1.107 Mon Jan 15 17:40:35 2024
+++ src/sys/arch/sun3/sun3/locore.s Tue Jan 16 15:38:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.107 2024/01/15 17:40:35 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.108 2024/01/16 15:38:58 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -539,11 +539,6 @@ Ldorte:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#define FPCOPROC /* XXX: Temp. Reqd. */
Index: src/sys/arch/sun3/sun3x/locore.s
diff -u src/sys/arch/sun3/sun3x/locore.s:1.75 src/sys/arch/sun3/sun3x/locore.s:1.76
--- src/sys/arch/sun3/sun3x/locore.s:1.75 Mon Jan 15 17:40:35 2024
+++ src/sys/arch/sun3/sun3x/locore.s Tue Jan 16 15:38:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.75 2024/01/15 17:40:35 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.76 2024/01/16 15:38:58 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -524,11 +524,6 @@ Ldorte:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#define FPCOPROC /* XXX: Temp. Reqd. */
Index: src/sys/arch/virt68k/virt68k/locore.s
diff -u src/sys/arch/virt68k/virt68k/locore.s:1.9 src/sys/arch/virt68k/virt68k/locore.s:1.10
--- src/sys/arch/virt68k/virt68k/locore.s:1.9 Sat Jan 13 17:10:58 2024
+++ src/sys/arch/virt68k/virt68k/locore.s Tue Jan 16 15:38:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.9 2024/01/13 17:10:58 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.10 2024/01/16 15:38:58 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -569,11 +569,6 @@ Laststkadj:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#define FPCOPROC /* XXX: Temp. Reqd. */
Index: src/sys/arch/x68k/x68k/locore.s
diff -u src/sys/arch/x68k/x68k/locore.s:1.128 src/sys/arch/x68k/x68k/locore.s:1.129
--- src/sys/arch/x68k/x68k/locore.s:1.128 Tue Jan 9 07:28:26 2024
+++ src/sys/arch/x68k/x68k/locore.s Tue Jan 16 15:38:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.128 2024/01/09 07:28:26 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.129 2024/01/16 15:38:59 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -773,11 +773,6 @@ Laststkadj:
*/
/*
- * Use common m68k support routines.
- */
-#include <m68k/m68k/support.s>
-
-/*
* Use common m68k process/lwp switch and context save subroutines.
*/
#define FPCOPROC /* XXX: Temp. reqd. */
