[src/netbsd-1-5]: src/sys/kern pull up 1.117 (approved by thorpej):

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4245059a8af0
branches:  netbsd-1-5
changeset: 488828:4245059a8af0
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 31 02:41:26 2000 +0000

description:
pull up 1.117 (approved by thorpej):
>Fix the sparc_v9 hack...

diffstat:

 sys/kern/kern_exec.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 5049a8c0adfe -r 4245059a8af0 sys/kern/kern_exec.c
--- a/sys/kern/kern_exec.c      Mon Jul 31 02:19:20 2000 +0000
+++ b/sys/kern/kern_exec.c      Mon Jul 31 02:41:26 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_exec.c,v 1.110.4.1 2000/07/26 23:10:28 mycroft Exp $      */
+/*     $NetBSD: kern_exec.c,v 1.110.4.2 2000/07/31 02:41:26 mrg Exp $  */
 
 /*-
  * Copyright (C) 1993, 1994, 1996 Christopher G. Demetriou
@@ -563,10 +563,14 @@
 
 #ifdef __sparc_v9__
        /* XXX Temporary hack for argc format conversion. */
-       argc = (argc << 32) | (argc & 0xffffffff);
+       argc <<= 32;
 #endif
        if (copyout(&argc, cpp++, sizeof(argc)))
                return NULL;
+#ifdef __sparc_v9__
+       /* XXX Temporary hack for argc format conversion. */
+       argc >>= 32;
+#endif
 
        dp = (char *) (cpp + argc + envc + 2 + pack->ep_emul->e_arglen);
        sp = argp;