3 files changed, 18 insertions, 45 deletions

diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c
index 3c44ba975d5a..cec3dd4250b1 100644
--- a/sys/powerpc/aim/machdep.c
+++ b/sys/powerpc/aim/machdep.c
@@ -598,18 +598,6 @@ sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code)
 	PROC_LOCK(p);
 }
 
-/*
- * Stub to satisfy the reference to osigreturn in the syscall table.  This
- * is needed even for newer arches that don't support old signals because
- * the syscall table is machine-independent.
- */
-int
-osigreturn(struct thread *td, struct osigreturn_args *uap)
-{
-
-	return (nosys(td, (struct nosys_args *)uap));
-}
-
 int
 sigreturn(struct thread *td, struct sigreturn_args *uap)
 {
@@ -656,6 +644,15 @@ sigreturn(struct thread *td, struct sigreturn_args *uap)
 	return (EJUSTRETURN);
 }
 
+#ifdef COMPAT_FREEBSD4
+int
+freebsd4_sigreturn(struct thread *td, struct freebsd4_sigreturn_args *uap)
+{
+
+	return sigreturn(td, (struct sigreturn_args *)uap);
+}
+#endif
+
 void
 cpu_boot(int howto)
 {
diff --git a/sys/powerpc/include/signal.h b/sys/powerpc/include/signal.h
index 55b16ddd3539..c290bb9bd74e 100644
--- a/sys/powerpc/include/signal.h
+++ b/sys/powerpc/include/signal.h
@@ -44,28 +44,7 @@
 typedef int sig_atomic_t;
 
 #ifdef _KERNEL
-typedef unsigned int osigset_t;
-
 #include <machine/frame.h>
-
-/*
- * XXX why do we have compatibility structs for a new platform?
- */
-#if defined(__LIBC12_SOURCE__) || defined(_KERNEL)
-struct sigcontext13 {
-	int sc_onstack;			/* saved onstack flag */
-	int sc_mask;			/* saved signal mask (old style) */
-	struct trapframe sc_frame;	/* saved registers */
-};
-#endif /* __LIBC12_SOURCE__ || _KERNEL */
-
-struct osigcontext {
-	int sc_onstack;			/* saved onstack flag */
-	int __sc_mask13;		/* saved signal mask (old style) */
-	struct trapframe sc_frame;	/* saved registers */
-	struct __sigset sc_mask;	/* saved signal mask (new style) */
-};
-
 #endif /* _KERNEL */
 
 #if __BSD_VISIBLE
diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c
index 3c44ba975d5a..cec3dd4250b1 100644
--- a/sys/powerpc/powerpc/machdep.c
+++ b/sys/powerpc/powerpc/machdep.c
@@ -598,18 +598,6 @@ sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code)
 	PROC_LOCK(p);
 }
 
-/*
- * Stub to satisfy the reference to osigreturn in the syscall table.  This
- * is needed even for newer arches that don't support old signals because
- * the syscall table is machine-independent.
- */
-int
-osigreturn(struct thread *td, struct osigreturn_args *uap)
-{
-
-	return (nosys(td, (struct nosys_args *)uap));
-}
-
 int
 sigreturn(struct thread *td, struct sigreturn_args *uap)
 {
@@ -656,6 +644,15 @@ sigreturn(struct thread *td, struct sigreturn_args *uap)
 	return (EJUSTRETURN);
 }
 
+#ifdef COMPAT_FREEBSD4
+int
+freebsd4_sigreturn(struct thread *td, struct freebsd4_sigreturn_args *uap)
+{
+
+	return sigreturn(td, (struct sigreturn_args *)uap);
+}
+#endif
+
 void
 cpu_boot(int howto)
 {