* mach/setup-thread.c (__mach_setup_thread): int -> natural_t

	* sysdeps/mach/hurd/dl-sysdep.c: Use ElfW(TYPE) in place of Elf32_TYPE.
	(__mmap): Use MAP_FAILED instead of widening __hurd_fail value.

	* sysdeps/mach/hurd/bind.c: Use prototype definition.
	* sysdeps/mach/hurd/connect.c: Likewise.
	* sysdeps/mach/hurd/getsockopt.c: Likewise.
	* sysdeps/mach/hurd/setsockopt.c: Likewise.

	* sysdeps/mach/hurd/alpha/sigreturn.c: Pass missing argument to
	__msg_sig_post RPC.

	* hurd/catch-exc.c: Use integer_t instead of int.
	* hurd/hurdfault.c: Likewise.

	* sysdeps/mach/hurd/alpha/exc2signal.c
	(_hurd_exception2signal): Rewritten.
	* sysdeps/mach/hurd/alpha/longjmp-ts.c
	(_hurd_longjmp_thread_state): Rewritten.

8 files changed, 59 insertions, 60 deletions

diff --git a/sysdeps/mach/hurd/alpha/exc2signal.c b/sysdeps/mach/hurd/alpha/exc2signal.c
index 3bceb64b22..5f3fbbbbb1 100644
--- a/sysdeps/mach/hurd/alpha/exc2signal.c
+++ b/sysdeps/mach/hurd/alpha/exc2signal.c
@@ -1,5 +1,5 @@
 /* Translate Mach exception codes into signal numbers.  Alpha version.
-   Copyright (C) 1994, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1994,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -25,52 +25,51 @@
    into a signal number and signal subcode.  */
 
 void
-_hurd_exception2signal (int exception, int code, int subcode,
-			int *signo, long int *sigcode, int *error)
+_hurd_exception2signal (struct hurd_signal_detail *detail, int *signo)
 {
-  *error = 0;
+  detail->error = 0;
 
-  switch (exception)
+  switch (detail->exc)
     {
     default:
       *signo = SIGIOT;
-      *sigcode = exception;
+      detail->code = detail->exc;
       break;
 
     case EXC_BAD_ACCESS:
-      if (code == KERN_PROTECTION_FAILURE)
+      if (detail->exc_code == KERN_PROTECTION_FAILURE)
 	*signo = SIGSEGV;
       else
 	*signo = SIGBUS;
-      *sigcode = subcode;
-      *error = code;
+      detail->code = detail->exc_subcode;
+      detail->error = detail->exc_code;
       break;
 
     case EXC_BAD_INSTRUCTION:
       *signo = SIGILL;
-      *sigcode = code;
+      detail->code = detail->exc_code;
       break;
 
     case EXC_ARITHMETIC:
       *signo = SIGFPE;
-      *sigcode = code;
+      detail->code = detail->exc_code;
       break;
       break;
 
     case EXC_EMULATION:
       /* 3.0 doesn't give this one, why, I don't know.  */
       *signo = SIGEMT;
-      *sigcode = code;
+      detail->code = detail->exc_code;
       break;
 
     case EXC_SOFTWARE:
       *signo = SIGEMT;
-      *sigcode = code;
+      detail->code = detail->exc_code;
       break;
 
     case EXC_BREAKPOINT:
       *signo = SIGTRAP;
-      *sigcode = code;
+      detail->code = detail->exc_code;
       break;
     }
 }
diff --git a/sysdeps/mach/hurd/alpha/longjmp-ts.c b/sysdeps/mach/hurd/alpha/longjmp-ts.c
index eb2764977c..b271d6d2a9 100644
--- a/sysdeps/mach/hurd/alpha/longjmp-ts.c
+++ b/sysdeps/mach/hurd/alpha/longjmp-ts.c
@@ -1,5 +1,5 @@
 /* Perform a `longjmp' on a Mach thread_state.  Alpha version.
-   Copyright (C) 1991, 1994, 1997 Free Software Foundation, Inc.
+   Copyright (C) 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,15 +27,22 @@
 void
 _hurd_longjmp_thread_state (void *state, jmp_buf env, int val)
 {
-  struct alpha_thread_state *ts = state;
-
-  ts->r9 = env[0].__jmpbuf[0].__9;
-  ts->r11 = env[0].__jmpbuf[0].__11;
-  ts->r12 = env[0].__jmpbuf[0].__12;
-  ts->r13 = env[0].__jmpbuf[0].__13;
-  ts->r14 = env[0].__jmpbuf[0].__14;
-  ts->r15 = (long int) env[0].__jmpbuf[0].__fp;
-  ts->r30 = (long int) env[0].__jmpbuf[0].__sp;
-  ts->pc = (long int) env[0].__jmpbuf[0].__pc;
+  struct alpha_thread_state *const ts = state;
+
+  ts->r9 = env[0].__jmpbuf[JB_S0];
+  ts->r10 = env[0].__jmpbuf[JB_S1];
+  ts->r11 = env[0].__jmpbuf[JB_S2];
+  ts->r12 = env[0].__jmpbuf[JB_S3];
+  ts->r13 = env[0].__jmpbuf[JB_S4];
+  ts->r13 = env[0].__jmpbuf[JB_S5];
+  ts->pc = env[0].__jmpbuf[JB_PC];
+  ts->r15 = env[0].__jmpbuf[JB_FP];
+  ts->r30 = env[0].__jmpbuf[JB_SP];
   ts->r0 = val ?: 1;
+
+  /* XXX
+     To mimic longjmp we ought to restore some fp registers too.
+     But those registers are in struct alpha_float_state.
+     The only use of this is in fork, and it probably won't matter.
+  */
 }
diff --git a/sysdeps/mach/hurd/alpha/sigreturn.c b/sysdeps/mach/hurd/alpha/sigreturn.c
index e520b35e73..182d4cbd84 100644
--- a/sysdeps/mach/hurd/alpha/sigreturn.c
+++ b/sysdeps/mach/hurd/alpha/sigreturn.c
@@ -1,5 +1,5 @@
 /* Return from signal handler in GNU C library for Hurd.  Alpha version.
-   Copyright (C) 1994, 1995, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1994,95,97,98,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,6 @@
 #include <hurd/msg.h>
 #include <stdlib.h>
 #include <string.h>
-#include <mach/machine/alpha_instruction.h>
 
 int
 __sigreturn (struct sigcontext *scp)
@@ -58,7 +57,7 @@ __sigreturn (struct sigcontext *scp)
 	 thread will examine us while we are blocked in the sig_post RPC.  */
       ss->intr_port = MACH_PORT_NULL;
       __spin_unlock (&ss->lock);
-      __msg_sig_post (_hurd_msgport, 0, __mach_task_self ());
+      __msg_sig_post (_hurd_msgport, 0, 0, __mach_task_self ());
       /* If a pending signal was handled, sig_post never returned.  */
       __spin_lock (&ss->lock);
     }
@@ -200,9 +199,9 @@ __sigreturn (struct sigcontext *scp)
        the user stack and do the magical `rei' PAL call.  */
     asm volatile ("mov %0, $30\n"
 		  "call_pal %1"
-		  : : "r" (rei_frame), "i" (op_rei));
+		  : : "r" (rei_frame), "i" (63)); /* PAL_rti */
     /* Firewall.  */
-    asm volatile ("call_pal %0" : : "i" (op_halt));
+    asm volatile ("halt");
   }
 
   /* NOTREACHED */
diff --git a/sysdeps/mach/hurd/bind.c b/sysdeps/mach/hurd/bind.c
index f59a44ccda..8b08a6bafa 100644
--- a/sysdeps/mach/hurd/bind.c
+++ b/sysdeps/mach/hurd/bind.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,94,95,96,97,98,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1992,94,95,96,97,98,2001,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -30,10 +30,7 @@
 
 /* Give the socket FD the local address ADDR (which is LEN bytes long).  */
 int
-bind (fd, addrarg, len)
-     int fd;
-     __CONST_SOCKADDR_ARG addrarg;
-     size_t len;
+bind  (int fd, __CONST_SOCKADDR_ARG addrarg, socklen_t len)
 {
   addr_port_t aport;
   error_t err;
diff --git a/sysdeps/mach/hurd/connect.c b/sysdeps/mach/hurd/connect.c
index 76e3812151..178e335eca 100644
--- a/sysdeps/mach/hurd/connect.c
+++ b/sysdeps/mach/hurd/connect.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992,94,95,96,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,10 +29,7 @@
    and the only address from which to accept transmissions.
    Return 0 on success, -1 for errors.  */
 int
-__connect (fd, addrarg, len)
-     int fd;
-     __CONST_SOCKADDR_ARG addrarg;
-     size_t len;
+__connect (int fd, __CONST_SOCKADDR_ARG addrarg, socklen_t len)
 {
   error_t err;
   addr_port_t aport;
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 883c959bee..b2e7412ea1 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -104,10 +104,10 @@ static void fmh(void) {
 #endif
 
 
-Elf32_Addr
+ElfW(Addr)
 _dl_sysdep_start (void **start_argptr,
-		  void (*dl_main) (const Elf32_Phdr *phdr, Elf32_Word phent,
-				   Elf32_Addr *user_entry))
+		  void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phent,
+				   ElfW(Addr) *user_entry))
 {
   void go (int *argdata)
     {
@@ -186,8 +186,8 @@ unfmh();			/* XXX */
 
       /* Call elf/rtld.c's main program.  It will set everything
 	 up and leave us to transfer control to USER_ENTRY.  */
-      (*dl_main) ((const Elf32_Phdr *) _dl_hurd_data->phdr,
-		  _dl_hurd_data->phdrsz / sizeof (Elf32_Phdr),
+      (*dl_main) ((const ElfW(Phdr) *) _dl_hurd_data->phdr,
+		  _dl_hurd_data->phdrsz / sizeof (ElfW(Phdr)),
 		  &_dl_hurd_data->user_entry);
 
       /* The call above might screw a few things up.
@@ -481,7 +481,9 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
   if ((flags & MAP_ANON) == 0)
     __mach_port_deallocate (__mach_task_self (), memobj_rd);
 
-  return err ? (__ptr_t) __hurd_fail (err) : (__ptr_t) mapaddr;
+  if (err)
+    return __hurd_fail (err), MAP_FAILED;
+  return (__ptr_t) mapaddr;
 }
 
 int weak_function
diff --git a/sysdeps/mach/hurd/getsockopt.c b/sysdeps/mach/hurd/getsockopt.c
index d1bc5b9028..7e35fa5024 100644
--- a/sysdeps/mach/hurd/getsockopt.c
+++ b/sysdeps/mach/hurd/getsockopt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,94,97,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1992,94,97,2001,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,12 +29,11 @@
 
 /* XXX should be __getsockopt ? */
 int
-getsockopt (fd, level, optname, optval, optlen)
-     int fd;
-     int level;
-     int optname;
-     void *optval;
-     size_t *optlen;
+getsockopt (int fd,
+	    int level,
+	    int optname,
+	    void *optval,
+	    socklen_t *optlen)
 {
   error_t err;
   char *buf = optval;
diff --git a/sysdeps/mach/hurd/setsockopt.c b/sysdeps/mach/hurd/setsockopt.c
index 620fef05d6..9875e96311 100644
--- a/sysdeps/mach/hurd/setsockopt.c
+++ b/sysdeps/mach/hurd/setsockopt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1994, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1992,94,97,98,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,12 +27,11 @@
    Returns 0 on success, -1 for errors.  */
 /* XXX __setsockopt ? */
 int
-setsockopt (fd, level, optname, optval, optlen)
-     int fd;
-     int level;
-     int optname;
-     const void *optval;
-     size_t optlen;
+setsockopt (int fd,
+	    int level,
+	    int optname,
+	    const void *optval,
+	    socklen_t optlen)
 {
   error_t err = HURD_DPORT_USE (fd, __socket_setopt (port,
 						     level, optname,