From 4e7e0da41e5a85991a4057615c42d9570fd8383b Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Thu, 25 Sep 2003 22:46:22 +0000
Subject: [PATCH] Add siginfo signal trampoline.

---
 lib/libc/arch/powerpc/Makefile.inc      |  4 +-
 lib/libc/arch/powerpc/sys/__sigtramp2.S | 56 +++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 lib/libc/arch/powerpc/sys/__sigtramp2.S

diff --git a/lib/libc/arch/powerpc/Makefile.inc b/lib/libc/arch/powerpc/Makefile.inc
index e4e222a711fb..07284d19b5b4 100644
--- a/lib/libc/arch/powerpc/Makefile.inc
+++ b/lib/libc/arch/powerpc/Makefile.inc
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile.inc,v 1.6 2002/07/10 04:29:08 thorpej Exp $
+#	$NetBSD: Makefile.inc,v 1.7 2003/09/25 22:46:22 matt Exp $
 
 KMINCLUDES=
 KMSRCS=	
 
-SRCS+=	__sigaction14_sigtramp.c __sigtramp1.S
+SRCS+=	__sigaction14_sigtramp.c __sigtramp1.S __sigtramp2.S
 
 .if (${MKSOFTFLOAT} != "no")
 CPPFLAGS+= -DSOFTFLOAT_NEED_FIXUNS
diff --git a/lib/libc/arch/powerpc/sys/__sigtramp2.S b/lib/libc/arch/powerpc/sys/__sigtramp2.S
new file mode 100644
index 000000000000..fe0c9c216f6c
--- /dev/null
+++ b/lib/libc/arch/powerpc/sys/__sigtramp2.S
@@ -0,0 +1,56 @@
+/*	$NetBSD: __sigtramp2.S,v 1.1 2003/09/25 22:46:22 matt Exp $	*/
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the NetBSD
+ *	Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define _NOREGNAMES
+#include "SYS.h"
+
+/*
+ * On entry to user space, stack and registers look like:
+ *
+ *	r3	signal number
+ *	r4	pointer to siginfo structure
+ *	r5	pointer to ucontext structure
+ *	r30	pointer to ucontext structure
+ *	srr0	address of handler
+ *	lr	address of this trampoline
+ *
+ */
+ENTRY_NOPROFILE(__sigtramp_siginfo_2)
+	mr	%r3,%r30		/* restore ucontext pointer */
+	_DOSYSCALL(setcontext)		/* restore machine state */
+	_DOSYSCALL(exit)		/* or exit with errno if failed */