diff --git a/lib/libc/arch/alpha/sys/__sigaction14_sigtramp.c b/lib/libc/arch/alpha/sys/__sigaction14_sigtramp.c
index 225fc20db323..76cc4eaa1d39 100644
--- a/lib/libc/arch/alpha/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/alpha/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2003/10/18 18:33:51 christos Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.5 2004/03/23 16:19:40 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,10 +64,12 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * set in the sigaction.
 	 */
 	if ((act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 		    __sigtramp_sigcontext_1, 1);
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	/*
diff --git a/lib/libc/arch/arm/sys/__sigaction14_sigtramp.c b/lib/libc/arch/arm/sys/__sigaction14_sigtramp.c
index 70ef5fb81565..fc21b7add2a9 100644
--- a/lib/libc/arch/arm/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/arm/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.3 2003/10/05 19:48:39 matt Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2004/03/23 16:19:40 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,10 +64,12 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * set in the sigaction.
 	 */
 	if ((act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 		    __sigtramp_sigcontext_1, 1);
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	/*
diff --git a/lib/libc/arch/i386/sys/__sigaction14_sigtramp.c b/lib/libc/arch/i386/sys/__sigaction14_sigtramp.c
index 449eecb3a577..444449dde441 100644
--- a/lib/libc/arch/i386/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/i386/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.7 2003/10/12 04:23:17 christos Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.8 2004/03/23 16:19:40 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,10 +64,12 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * set in the sigaction.
 	 */
 	if ((act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 		    __sigtramp_sigcontext_1, 1);
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	/*
diff --git a/lib/libc/arch/m68k/sys/__sigaction14_sigtramp.c b/lib/libc/arch/m68k/sys/__sigaction14_sigtramp.c
index cfdf8c7abc68..0d6a1de94fa4 100644
--- a/lib/libc/arch/m68k/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/m68k/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2003/10/18 18:16:23 christos Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.5 2004/03/23 16:19:41 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,10 +64,12 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * set in the sigaction.
 	 */
 	if ((act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 		    __sigtramp_sigcontext_1, 1);
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	/*
diff --git a/lib/libc/arch/mips/sys/__sigaction14_sigtramp.c b/lib/libc/arch/mips/sys/__sigaction14_sigtramp.c
index b3676682a93d..16982baa3b1d 100644
--- a/lib/libc/arch/mips/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/mips/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.3 2003/11/02 08:37:48 christos Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2004/03/23 16:19:41 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,10 +64,12 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * set in the sigaction.
 	 */
 	if ((act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 		    __sigtramp_sigcontext_1, 1);
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	/*
diff --git a/lib/libc/arch/ns32k/sys/__sigaction14_sigtramp.c b/lib/libc/arch/ns32k/sys/__sigaction14_sigtramp.c
index 76c414573eb5..861c19f523e5 100644
--- a/lib/libc/arch/ns32k/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/ns32k/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.3 2003/11/11 19:10:02 simonb Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2004/03/23 16:19:41 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -66,10 +66,12 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * set in the sigaction.
 	 */
 	if ((act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 		    __sigtramp_sigcontext_1, 1);
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	/*
diff --git a/lib/libc/arch/powerpc/sys/__sigaction14_sigtramp.c b/lib/libc/arch/powerpc/sys/__sigaction14_sigtramp.c
index fe63445ab802..8d12eafe08bc 100644
--- a/lib/libc/arch/powerpc/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/powerpc/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2003/09/27 03:33:00 matt Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.5 2004/03/23 16:19:41 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,10 +64,12 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * set in the sigaction.
 	 */
 	if ((act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 		    __sigtramp_sigcontext_1, 1);
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	/*
diff --git a/lib/libc/arch/sh3/sys/__sigaction14_sigtramp.c b/lib/libc/arch/sh3/sys/__sigaction14_sigtramp.c
index 58101f89699c..e9f111d99c93 100644
--- a/lib/libc/arch/sh3/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/sh3/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.3 2003/11/23 23:13:11 uwe Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2004/03/23 16:19:41 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -58,6 +58,7 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * is not set in the sigaction.
 	 */
 	if (act && (act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 					   __sigtramp_sigcontext_1, 1);
 		/*
@@ -67,6 +68,7 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 		 */
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
diff --git a/lib/libc/arch/sh5/sys/__sigaction14_sigtramp.c b/lib/libc/arch/sh5/sys/__sigaction14_sigtramp.c
index 09969d734b14..5b99293dd880 100644
--- a/lib/libc/arch/sh5/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/sh5/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2003/10/05 10:01:49 scw Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.5 2004/03/23 16:19:41 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,10 +64,12 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * set in the sigaction.
 	 */
 	if ((act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 		    __sigtramp_sigcontext_1, 1);
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	/*
diff --git a/lib/libc/arch/sparc/sys/__sigaction14_sigtramp.c b/lib/libc/arch/sparc/sys/__sigaction14_sigtramp.c
index f474e9a7990f..422adc764e35 100644
--- a/lib/libc/arch/sparc/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/sparc/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.3 2003/10/12 14:42:03 pk Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2004/03/23 16:19:41 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -58,6 +58,7 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * is not set in the sigaction.
 	 */
 	if (act && (act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 					   __sigtramp_sigcontext_1, 1);
 		/*
@@ -67,6 +68,7 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 		 */
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
diff --git a/lib/libc/arch/sparc64/sys/__sigaction14_sigtramp.c b/lib/libc/arch/sparc64/sys/__sigaction14_sigtramp.c
index 18fba994eee4..422adc764e35 100644
--- a/lib/libc/arch/sparc64/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/sparc64/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.3 2003/10/27 00:45:36 christos Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2004/03/23 16:19:41 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -58,6 +58,7 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * is not set in the sigaction.
 	 */
 	if (act && (act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 					   __sigtramp_sigcontext_1, 1);
 		/*
@@ -67,6 +68,7 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 		 */
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	return __sigaction_sigtramp(sig, act, oact, __sigtramp_siginfo_2, 2);
diff --git a/lib/libc/arch/vax/sys/__sigaction14_sigtramp.c b/lib/libc/arch/vax/sys/__sigaction14_sigtramp.c
index 5d00b184fdcb..01c6c6668969 100644
--- a/lib/libc/arch/vax/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/vax/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.4 2003/09/30 19:05:41 matt Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.5 2004/03/23 16:19:41 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -65,10 +65,12 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * set in the sigaction.
 	 */
 	if ((act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 		    __sigtramp_sigcontext_2, 2);
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	/*
diff --git a/lib/libc/arch/x86_64/sys/__sigaction14_sigtramp.c b/lib/libc/arch/x86_64/sys/__sigaction14_sigtramp.c
index 115445418184..30365ebd79f6 100644
--- a/lib/libc/arch/x86_64/sys/__sigaction14_sigtramp.c
+++ b/lib/libc/arch/x86_64/sys/__sigaction14_sigtramp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigaction14_sigtramp.c,v 1.5 2003/10/18 20:11:04 briggs Exp $	*/
+/*	$NetBSD: __sigaction14_sigtramp.c,v 1.6 2004/03/23 16:19:41 drochner Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -66,10 +66,12 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
 	 * set in the sigaction.
 	 */
 	if ((act->sa_flags & SA_SIGINFO) == 0) {
+		int sav = errno;
 		rv =  __sigaction_sigtramp(sig, act, oact,
 		    __sigtramp_sigcontext_1, 1);
 		if (rv >= 0 || errno != EINVAL)
 			return rv;
+		errno = sav;
 	}
 
 	/*