From bfb62ce4152d5ff6a0c7ed5a25d5a09da6bc1cad Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Sat, 18 Feb 2006 00:21:27 +0000
Subject: [PATCH] Move PowerPC compat files from arch/powerpc to
 compat/arch/powerpc.

---
 lib/libc/arch/powerpc/Makefile.inc                         | 4 ++--
 lib/libc/arch/powerpc/gen/Makefile.inc                     | 4 ++--
 lib/libc/arch/powerpc/sys/__sigreturn14.S                  | 5 -----
 lib/libc/compat/arch/powerpc/Makefile.inc                  | 4 ++++
 lib/libc/compat/arch/powerpc/gen/Makefile.inc              | 4 ++++
 .../arch/powerpc/gen/compat___setjmp14.S}                  | 4 ++--
 .../arch/powerpc/gen/compat___sigsetjmp14.S}               | 4 ++--
 lib/libc/compat/arch/powerpc/sys/Makefile.inc              | 7 +++++++
 .../Ovfork.S => compat/arch/powerpc/sys/compat_Ovfork.S}   | 2 +-
 .../arch/powerpc/sys/compat___semctl.S}                    | 2 +-
 lib/libc/compat/arch/powerpc/sys/compat___sigreturn14.S    | 5 +++++
 .../arch/powerpc/sys/compat___sigtramp1.S}                 | 2 +-
 .../msgctl.S => compat/arch/powerpc/sys/compat_msgctl.S}   | 2 +-
 .../shmctl.S => compat/arch/powerpc/sys/compat_shmctl.S}   | 2 +-
 .../arch/powerpc/sys/compat_sigaction13.S}                 | 2 +-
 .../arch/powerpc/sys/compat_sigpending13.S}                | 2 +-
 .../arch/powerpc/sys/compat_sigprocmask13.S}               | 2 +-
 .../arch/powerpc/sys/compat_sigreturn13.S}                 | 2 +-
 .../arch/powerpc/sys/compat_sigsuspend13.S}                | 2 +-
 19 files changed, 38 insertions(+), 23 deletions(-)
 delete mode 100644 lib/libc/arch/powerpc/sys/__sigreturn14.S
 create mode 100644 lib/libc/compat/arch/powerpc/Makefile.inc
 create mode 100644 lib/libc/compat/arch/powerpc/gen/Makefile.inc
 rename lib/libc/{arch/powerpc/gen/__setjmp14.S => compat/arch/powerpc/gen/compat___setjmp14.S} (84%)
 rename lib/libc/{arch/powerpc/gen/__sigsetjmp14.S => compat/arch/powerpc/gen/compat___sigsetjmp14.S} (81%)
 create mode 100644 lib/libc/compat/arch/powerpc/sys/Makefile.inc
 rename lib/libc/{arch/powerpc/sys/Ovfork.S => compat/arch/powerpc/sys/compat_Ovfork.S} (85%)
 rename lib/libc/{arch/powerpc/sys/__semctl.S => compat/arch/powerpc/sys/compat___semctl.S} (96%)
 create mode 100644 lib/libc/compat/arch/powerpc/sys/compat___sigreturn14.S
 rename lib/libc/{arch/powerpc/sys/__sigtramp1.S => compat/arch/powerpc/sys/compat___sigtramp1.S} (97%)
 rename lib/libc/{arch/powerpc/sys/msgctl.S => compat/arch/powerpc/sys/compat_msgctl.S} (71%)
 rename lib/libc/{arch/powerpc/sys/shmctl.S => compat/arch/powerpc/sys/compat_shmctl.S} (96%)
 rename lib/libc/{arch/powerpc/sys/sigaction.S => compat/arch/powerpc/sys/compat_sigaction13.S} (71%)
 rename lib/libc/{arch/powerpc/sys/sigpending.S => compat/arch/powerpc/sys/compat_sigpending13.S} (83%)
 rename lib/libc/{arch/powerpc/sys/sigprocmask.S => compat/arch/powerpc/sys/compat_sigprocmask13.S} (89%)
 rename lib/libc/{arch/powerpc/sys/sigreturn.S => compat/arch/powerpc/sys/compat_sigreturn13.S} (66%)
 rename lib/libc/{arch/powerpc/sys/sigsuspend.S => compat/arch/powerpc/sys/compat_sigsuspend13.S} (80%)

diff --git a/lib/libc/arch/powerpc/Makefile.inc b/lib/libc/arch/powerpc/Makefile.inc
index fce4e92e3bc5..fd8cfe2758ee 100644
--- a/lib/libc/arch/powerpc/Makefile.inc
+++ b/lib/libc/arch/powerpc/Makefile.inc
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile.inc,v 1.8 2004/12/09 00:39:41 simonb Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2006/02/18 00:21:27 matt Exp $
 
 KMINCLUDES=
 KMSRCS=	
 
-SRCS+=	__sigaction14_sigtramp.c __sigtramp1.S __sigtramp2.S
+SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
 
 .if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no")
 .include <softfloat/Makefile.inc>
diff --git a/lib/libc/arch/powerpc/gen/Makefile.inc b/lib/libc/arch/powerpc/gen/Makefile.inc
index 827056e46cb4..8e79fbc8e919 100644
--- a/lib/libc/arch/powerpc/gen/Makefile.inc
+++ b/lib/libc/arch/powerpc/gen/Makefile.inc
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile.inc,v 1.20 2005/04/15 22:39:11 kleink Exp $
+#	$NetBSD: Makefile.inc,v 1.21 2006/02/18 00:21:27 matt Exp $
 
-SRCS+=	_setjmp.S setjmp.S sigsetjmp.S __setjmp14.S __sigsetjmp14.S
+SRCS+=	_setjmp.S setjmp.S sigsetjmp.S
 SRCS+=	bswap16.c bswap32.c bswap64.c
 SRCS+=	fabs.c flt_rounds.c
 SRCS+=	syncicache.c
diff --git a/lib/libc/arch/powerpc/sys/__sigreturn14.S b/lib/libc/arch/powerpc/sys/__sigreturn14.S
deleted file mode 100644
index 4e1a2f2e6b00..000000000000
--- a/lib/libc/arch/powerpc/sys/__sigreturn14.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: __sigreturn14.S,v 1.2 2004/03/26 20:35:37 drochner Exp $	*/
-
-#include "SYS.h"
-
-PSEUDO(__sigreturn14,compat_16___sigreturn14)
diff --git a/lib/libc/compat/arch/powerpc/Makefile.inc b/lib/libc/compat/arch/powerpc/Makefile.inc
new file mode 100644
index 000000000000..beaf7af8bedd
--- /dev/null
+++ b/lib/libc/compat/arch/powerpc/Makefile.inc
@@ -0,0 +1,4 @@
+#	$NetBSD: Makefile.inc,v 1.1 2006/02/18 00:21:28 matt Exp $
+
+.include "${.CURDIR}/compat/arch/${MACHINE_ARCH}/gen/Makefile.inc"
+.include "${.CURDIR}/compat/arch/${MACHINE_ARCH}/sys/Makefile.inc"
diff --git a/lib/libc/compat/arch/powerpc/gen/Makefile.inc b/lib/libc/compat/arch/powerpc/gen/Makefile.inc
new file mode 100644
index 000000000000..d1b18d90d063
--- /dev/null
+++ b/lib/libc/compat/arch/powerpc/gen/Makefile.inc
@@ -0,0 +1,4 @@
+#	$NetBSD: Makefile.inc,v 1.1 2006/02/18 00:21:28 matt Exp $
+
+# objects built from assembler sources (need lint stubs)
+SRCS+=	compat___setjmp14.S compat___sigsetjmp14.S
diff --git a/lib/libc/arch/powerpc/gen/__setjmp14.S b/lib/libc/compat/arch/powerpc/gen/compat___setjmp14.S
similarity index 84%
rename from lib/libc/arch/powerpc/gen/__setjmp14.S
rename to lib/libc/compat/arch/powerpc/gen/compat___setjmp14.S
index 53e65edea144..50a9b6d30c30 100644
--- a/lib/libc/arch/powerpc/gen/__setjmp14.S
+++ b/lib/libc/compat/arch/powerpc/gen/compat___setjmp14.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __setjmp14.S,v 1.2 2002/07/30 06:07:57 matt Exp $	*/
+/*	$NetBSD: compat___setjmp14.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 #include <sys/syscall.h>
 
@@ -6,7 +6,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$NetBSD: __setjmp14.S,v 1.2 2002/07/30 06:07:57 matt Exp $"
+	.asciz "$NetBSD: compat___setjmp14.S,v 1.1 2006/02/18 00:21:28 matt Exp $"
 #endif
 
 /*
diff --git a/lib/libc/arch/powerpc/gen/__sigsetjmp14.S b/lib/libc/compat/arch/powerpc/gen/compat___sigsetjmp14.S
similarity index 81%
rename from lib/libc/arch/powerpc/gen/__sigsetjmp14.S
rename to lib/libc/compat/arch/powerpc/gen/compat___sigsetjmp14.S
index 5b4b7d737380..9aae4ab7c44a 100644
--- a/lib/libc/arch/powerpc/gen/__sigsetjmp14.S
+++ b/lib/libc/compat/arch/powerpc/gen/compat___sigsetjmp14.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigsetjmp14.S,v 1.2 2002/07/30 06:07:57 matt Exp $	*/
+/*	$NetBSD: compat___sigsetjmp14.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 #include <sys/syscall.h>
 
@@ -6,7 +6,7 @@
 
 #if defined(LIBC_SCCS)
 	.text
-	.asciz "$NetBSD: __sigsetjmp14.S,v 1.2 2002/07/30 06:07:57 matt Exp $"
+	.asciz "$NetBSD: compat___sigsetjmp14.S,v 1.1 2006/02/18 00:21:28 matt Exp $"
 #endif
 
 ENTRY(__sigsetjmp14)
diff --git a/lib/libc/compat/arch/powerpc/sys/Makefile.inc b/lib/libc/compat/arch/powerpc/sys/Makefile.inc
new file mode 100644
index 000000000000..425cfc4da3e5
--- /dev/null
+++ b/lib/libc/compat/arch/powerpc/sys/Makefile.inc
@@ -0,0 +1,7 @@
+#	$NetBSD: Makefile.inc,v 1.1 2006/02/18 00:21:28 matt Exp $
+
+SRCS+=	compat_Ovfork.S \
+	compat___sigreturn14.S compat___sigtramp1.S \
+	compat_msgctl.S compat___semctl.S compat_shmctl.S \
+	compat_sigaction13.S compat_sigpending13.S compat_sigprocmask13.S \
+	compat_sigreturn13.S compat_sigsuspend13.S 
diff --git a/lib/libc/arch/powerpc/sys/Ovfork.S b/lib/libc/compat/arch/powerpc/sys/compat_Ovfork.S
similarity index 85%
rename from lib/libc/arch/powerpc/sys/Ovfork.S
rename to lib/libc/compat/arch/powerpc/sys/compat_Ovfork.S
index d8f2423d30ee..63f14ab8c012 100644
--- a/lib/libc/arch/powerpc/sys/Ovfork.S
+++ b/lib/libc/compat/arch/powerpc/sys/compat_Ovfork.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: Ovfork.S,v 1.4 2002/07/30 06:07:59 matt Exp $	*/
+/*	$NetBSD: compat_Ovfork.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 /*
  * pid = vfork();
diff --git a/lib/libc/arch/powerpc/sys/__semctl.S b/lib/libc/compat/arch/powerpc/sys/compat___semctl.S
similarity index 96%
rename from lib/libc/arch/powerpc/sys/__semctl.S
rename to lib/libc/compat/arch/powerpc/sys/compat___semctl.S
index 27b9964e5a93..3d1de6535d3c 100644
--- a/lib/libc/arch/powerpc/sys/__semctl.S
+++ b/lib/libc/compat/arch/powerpc/sys/compat___semctl.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __semctl.S,v 1.1 1999/08/25 05:09:30 thorpej Exp $	*/
+/*	$NetBSD: compat___semctl.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/lib/libc/compat/arch/powerpc/sys/compat___sigreturn14.S b/lib/libc/compat/arch/powerpc/sys/compat___sigreturn14.S
new file mode 100644
index 000000000000..b075c3135f96
--- /dev/null
+++ b/lib/libc/compat/arch/powerpc/sys/compat___sigreturn14.S
@@ -0,0 +1,5 @@
+/*	$NetBSD: compat___sigreturn14.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
+
+#include "SYS.h"
+
+PSEUDO(__sigreturn14,compat_16___sigreturn14)
diff --git a/lib/libc/arch/powerpc/sys/__sigtramp1.S b/lib/libc/compat/arch/powerpc/sys/compat___sigtramp1.S
similarity index 97%
rename from lib/libc/arch/powerpc/sys/__sigtramp1.S
rename to lib/libc/compat/arch/powerpc/sys/compat___sigtramp1.S
index 7c649bfe3a89..d18dd1389f8f 100644
--- a/lib/libc/arch/powerpc/sys/__sigtramp1.S
+++ b/lib/libc/compat/arch/powerpc/sys/compat___sigtramp1.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigtramp1.S,v 1.3 2004/03/26 20:35:37 drochner Exp $	*/
+/*	$NetBSD: compat___sigtramp1.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/powerpc/sys/msgctl.S b/lib/libc/compat/arch/powerpc/sys/compat_msgctl.S
similarity index 71%
rename from lib/libc/arch/powerpc/sys/msgctl.S
rename to lib/libc/compat/arch/powerpc/sys/compat_msgctl.S
index d455364b63b1..26ccc3ced8b3 100644
--- a/lib/libc/arch/powerpc/sys/msgctl.S
+++ b/lib/libc/compat/arch/powerpc/sys/compat_msgctl.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: msgctl.S,v 1.1 1999/08/25 05:09:31 thorpej Exp $	*/
+/*	$NetBSD: compat_msgctl.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 #include "SYS.h"
 
diff --git a/lib/libc/arch/powerpc/sys/shmctl.S b/lib/libc/compat/arch/powerpc/sys/compat_shmctl.S
similarity index 96%
rename from lib/libc/arch/powerpc/sys/shmctl.S
rename to lib/libc/compat/arch/powerpc/sys/compat_shmctl.S
index 9fc2fdd53bfd..b0b83b05b420 100644
--- a/lib/libc/arch/powerpc/sys/shmctl.S
+++ b/lib/libc/compat/arch/powerpc/sys/compat_shmctl.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: shmctl.S,v 1.1 1999/08/25 05:09:31 thorpej Exp $	*/
+/*	$NetBSD: compat_shmctl.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/powerpc/sys/sigaction.S b/lib/libc/compat/arch/powerpc/sys/compat_sigaction13.S
similarity index 71%
rename from lib/libc/arch/powerpc/sys/sigaction.S
rename to lib/libc/compat/arch/powerpc/sys/compat_sigaction13.S
index 10766d7f83e6..42c5ed6b4909 100644
--- a/lib/libc/arch/powerpc/sys/sigaction.S
+++ b/lib/libc/compat/arch/powerpc/sys/compat_sigaction13.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigaction.S,v 1.2 1998/12/02 01:01:04 thorpej Exp $	*/
+/*	$NetBSD: compat_sigaction13.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 #include "SYS.h"
 
diff --git a/lib/libc/arch/powerpc/sys/sigpending.S b/lib/libc/compat/arch/powerpc/sys/compat_sigpending13.S
similarity index 83%
rename from lib/libc/arch/powerpc/sys/sigpending.S
rename to lib/libc/compat/arch/powerpc/sys/compat_sigpending13.S
index 7b55b544d367..88293359024a 100644
--- a/lib/libc/arch/powerpc/sys/sigpending.S
+++ b/lib/libc/compat/arch/powerpc/sys/compat_sigpending13.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigpending.S,v 1.8 2002/07/30 06:08:01 matt Exp $	*/
+/*	$NetBSD: compat_sigpending13.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 #include "SYS.h"
 
diff --git a/lib/libc/arch/powerpc/sys/sigprocmask.S b/lib/libc/compat/arch/powerpc/sys/compat_sigprocmask13.S
similarity index 89%
rename from lib/libc/arch/powerpc/sys/sigprocmask.S
rename to lib/libc/compat/arch/powerpc/sys/compat_sigprocmask13.S
index 768edb6ba31d..e1a588126572 100644
--- a/lib/libc/arch/powerpc/sys/sigprocmask.S
+++ b/lib/libc/compat/arch/powerpc/sys/compat_sigprocmask13.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigprocmask.S,v 1.8 2002/07/30 06:08:01 matt Exp $	*/
+/*	$NetBSD: compat_sigprocmask13.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 #include "SYS.h"
 
diff --git a/lib/libc/arch/powerpc/sys/sigreturn.S b/lib/libc/compat/arch/powerpc/sys/compat_sigreturn13.S
similarity index 66%
rename from lib/libc/arch/powerpc/sys/sigreturn.S
rename to lib/libc/compat/arch/powerpc/sys/compat_sigreturn13.S
index ff5744c825ce..0c5020943a9c 100644
--- a/lib/libc/arch/powerpc/sys/sigreturn.S
+++ b/lib/libc/compat/arch/powerpc/sys/compat_sigreturn13.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigreturn.S,v 1.5 2004/03/26 22:15:03 drochner Exp $	*/
+/*	$NetBSD: compat_sigreturn13.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 #include "SYS.h"
 
diff --git a/lib/libc/arch/powerpc/sys/sigsuspend.S b/lib/libc/compat/arch/powerpc/sys/compat_sigsuspend13.S
similarity index 80%
rename from lib/libc/arch/powerpc/sys/sigsuspend.S
rename to lib/libc/compat/arch/powerpc/sys/compat_sigsuspend13.S
index bb8791b51bb6..ab3f1fa3c3b2 100644
--- a/lib/libc/arch/powerpc/sys/sigsuspend.S
+++ b/lib/libc/compat/arch/powerpc/sys/compat_sigsuspend13.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigsuspend.S,v 1.8 2002/07/30 06:08:01 matt Exp $	*/
+/*	$NetBSD: compat_sigsuspend13.S,v 1.1 2006/02/18 00:21:28 matt Exp $	*/
 
 #include "SYS.h"