summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-02-08 02:10:15 +0000
committerRoland McGrath <roland@gnu.org>1996-02-08 02:10:15 +0000
commit4ca84cff3b3e184164acde81deaad1fe52eabd14 (patch)
tree5a3f94f16ef8bd822bee58606b640c1e867aea95
parent1ac3b08e9348daa948d4982f0a4363a6767196e1 (diff)
downloadglibc-4ca84cff3b3e184164acde81deaad1fe52eabd14.tar.gz
glibc-4ca84cff3b3e184164acde81deaad1fe52eabd14.tar.xz
glibc-4ca84cff3b3e184164acde81deaad1fe52eabd14.zip
Wed Feb 7 18:48:30 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
	* hurd/hurdmsg.c (_S_msg_report_wait): Function removed.
	* hurd/report-wait.c: New file.
	* hurd/Makefile (routines): Added report-wait.

	* sysdeps/mach/hurd/Makefile (inhibit-unix-syscalls): New variable.

	* sysdeps/mach/hurd/i386/intr-msg.h (struct mach_msg_trap_args):
	New type.
	(SYSCALL_EXAMINE, MSG_EXAMINE): New inline functions.
	* sysdeps/mach/hurd/i386/trampoline.c (struct mach_msg_trap_args):
	Structure moved to intr-msg.h; include that.

	* time/Makefile (CFLAGS-ialloc.c): Add -Wno-unused.
	(CFLAGS-scheck.c): New variable.

	* sysdeps/mach/hurd/dl-sysdep.c (__hurd_sigthread_stack_base,
	__hurd_sigthread_stack_end, __hurd_sigthread_variables,
	__hurd_threadvar_stack_mask): New variables.

	* sysdeps/mach/hurd/fork.c: Set the new task's exception port to
	its new message port.

	* misc/init-misc.c: Put __init_misc in the __libc_subinit set.

	* configure.in (uname): Add quoting.

	* sysdeps/mach/hurd/fchdir.c: Don't consult errno unless lookup fails.
	* hurd/fchroot.c: Likewise.

	* posix/sys/types.h [GCC >= 2.7]: Define intN_t/u_intN_t using
	__attribute__ ((__mode__ (__XX__))).

Wed Feb 7 03:24:05 1996 Torbjorn Granlund  <tege@tmg.se>

	* sysdeps/i386/i586/memcopy.h (WORD_COPY_FWD): Manually allocate
	destination cache lines.
	(WORD_COPY_BWD): Likewise.

Wed Feb  7 14:16:36 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* sysdeps/generic/Makefile (make_siglist): Get signum.h absolute
	file name first thing, before $(native-compile) changes directories.

	From Gord Matzigkeit <gord@enci.ucalgary.ca>:
	* sysdeps/unix/make_errlist.c: Use strerror if available.
	* sysdeps/unix/configure.in: New file

	* sysdeps/unix/bsd/sun/syscalls.list: Added sigvec.
	* sysdeps/unix/bsd/sun/sigvec.S: File removed.

	* sysdeps/stub/sendto.c: Make sockaddr arg pointer to const.
	* sysdeps/stub/connect.c: Likewise.
	* sysdeps/stub/bind.c: Likewise.

	* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): RETRYNAME of
	"" is only special for FS_RETRY_NORMAL; for FS_RETRY_REAUTH, do
	another dir_lookup of "".
-rw-r--r--ChangeLog60
-rw-r--r--configure.in3
-rw-r--r--hurd/Makefile2
-rw-r--r--hurd/fchroot.c10
-rw-r--r--hurd/hurdlookup.c5
-rw-r--r--hurd/hurdmsg.c7
-rw-r--r--misc/init-misc.c4
-rw-r--r--posix/sys/types.h23
-rw-r--r--sysdeps/generic/Makefile5
-rw-r--r--sysdeps/i386/i586/memcopy.h26
-rw-r--r--sysdeps/mach/hurd/Makefile3
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c8
-rw-r--r--sysdeps/mach/hurd/fchdir.c10
-rw-r--r--sysdeps/mach/hurd/fork.c6
-rw-r--r--sysdeps/mach/hurd/i386/intr-msg.h55
-rw-r--r--sysdeps/mach/hurd/i386/trampoline.c16
-rw-r--r--sysdeps/stub/bind.c4
-rw-r--r--sysdeps/stub/connect.c4
-rw-r--r--sysdeps/stub/sendto.c4
-rw-r--r--sysdeps/unix/bsd/sun/sigvec.S26
-rw-r--r--sysdeps/unix/bsd/sun/syscalls.list1
-rw-r--r--sysdeps/unix/configure.in8
-rw-r--r--sysdeps/unix/make_errlist.c10
-rw-r--r--time/Makefile3
24 files changed, 221 insertions, 82 deletions
diff --git a/ChangeLog b/ChangeLog
index c211906912..e1a5621125 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+Wed Feb  7 18:48:30 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* hurd/hurdmsg.c (_S_msg_report_wait): Function removed.
+	* hurd/report-wait.c: New file.
+	* hurd/Makefile (routines): Added report-wait.
+
+	* sysdeps/mach/hurd/Makefile (inhibit-unix-syscalls): New variable.
+
+	* sysdeps/mach/hurd/i386/intr-msg.h (struct mach_msg_trap_args):
+	New type.
+	(SYSCALL_EXAMINE, MSG_EXAMINE): New inline functions.
+	* sysdeps/mach/hurd/i386/trampoline.c (struct mach_msg_trap_args):
+	Structure moved to intr-msg.h; include that.
+
+	* time/Makefile (CFLAGS-ialloc.c): Add -Wno-unused.
+	(CFLAGS-scheck.c): New variable.
+
+	* sysdeps/mach/hurd/dl-sysdep.c (__hurd_sigthread_stack_base,
+	__hurd_sigthread_stack_end, __hurd_sigthread_variables,
+	__hurd_threadvar_stack_mask): New variables.
+
+	* sysdeps/mach/hurd/fork.c: Set the new task's exception port to
+	its new message port.
+
+	* misc/init-misc.c: Put __init_misc in the __libc_subinit set.
+
+	* configure.in (uname): Add quoting.
+
+	* sysdeps/mach/hurd/fchdir.c: Don't consult errno unless lookup fails.
+	* hurd/fchroot.c: Likewise.
+
+	* posix/sys/types.h [GCC >= 2.7]: Define intN_t/u_intN_t using
+	__attribute__ ((__mode__ (__XX__))).
+
+Wed Feb 7 03:24:05 1996 Torbjorn Granlund  <tege@tmg.se>
+
+	* sysdeps/i386/i586/memcopy.h (WORD_COPY_FWD): Manually allocate
+	destination cache lines.
+	(WORD_COPY_BWD): Likewise.
+
+Wed Feb  7 14:16:36 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* sysdeps/generic/Makefile (make_siglist): Get signum.h absolute
+	file name first thing, before $(native-compile) changes directories.
+
+	From Gord Matzigkeit <gord@enci.ucalgary.ca>:
+	* sysdeps/unix/make_errlist.c: Use strerror if available.
+	* sysdeps/unix/configure.in: New file
+
+	* sysdeps/unix/bsd/sun/syscalls.list: Added sigvec.
+	* sysdeps/unix/bsd/sun/sigvec.S: File removed.
+
+	* sysdeps/stub/sendto.c: Make sockaddr arg pointer to const.
+	* sysdeps/stub/connect.c: Likewise.
+	* sysdeps/stub/bind.c: Likewise.
+
+	* hurd/hurdlookup.c (__hurd_file_name_lookup_retry): RETRYNAME of
+	"" is only special for FS_RETRY_NORMAL; for FS_RETRY_REAUTH, do
+	another dir_lookup of "".
+
 Fri Feb  2 13:09:18 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* sysdeps/mach/hurd/fork.c: Clear trace flag in child.
diff --git a/configure.in b/configure.in
index 6ad4e5190a..4c9d881100 100644
--- a/configure.in
+++ b/configure.in
@@ -418,13 +418,16 @@ for dir in $sysnames; do
     AC_MSG_RESULT(running configure fragment for $dir)
     . $sysdep_dir/$dir/configure
   fi
+[
   if test -z "$uname"; then
     if test -r $sysdep_dir/$dir/uname.c ||
        test -r $sysdep_dir/$dir/uname.S ||
        { test -r $sysdep_dir/$dir/syscalls.list &&
 	 grep '^uname[ 	]' $sysdep_dir/$dir/syscalls.list >/dev/null; }; then
       uname=$dir
+    fi
   fi
+]dnl
 done
 
 AC_LINK_FILES(`echo $libc_link_sources`, `echo $libc_link_dests`)
diff --git a/hurd/Makefile b/hurd/Makefile
index fe9e43e392..9683e7f178 100644
--- a/hurd/Makefile
+++ b/hurd/Makefile
@@ -51,7 +51,7 @@ routines = hurdstartup hurdinit \
 	   fopenport \
  	   vpprintf \
 	   ports-get ports-set hurdports hurdmsg \
-	   $(sig) $(dtable) hurdinline port-cleanup # report-wait
+	   $(sig) $(dtable) hurdinline port-cleanup report-wait
 sig	= hurdsig hurdfault faultexc siginfo hurd-raise preempt-sig \
 	  trampoline longjmp-ts catch-exc exc2signal hurdkill sigunwind \
 	  thread-self thread-cancel intr-msg catch-signal
diff --git a/hurd/fchroot.c b/hurd/fchroot.c
index 26ff6d9081..8c8a3b839b 100644
--- a/hurd/fchroot.c
+++ b/hurd/fchroot.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 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,9 +29,11 @@ DEFUN(fchroot, (fd), int fd)
   error_t err;
   file_t dir;
 
-  err = HURD_DPORT_USE (fd, (dir = __file_name_lookup_under (port, "",
-							     O_EXEC, 0),
-			     errno));
+  err = HURD_DPORT_USE (fd,
+			({
+			  dir = __file_name_lookup_under (port, "", O_EXEC, 0);
+			  dir == MACH_PORT_NULL ? errno : 0;
+			}));
 
   if (! err)
     _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], dir);
diff --git a/hurd/hurdlookup.c b/hurd/hurdlookup.c
index 227f20e274..41ea32774e 100644
--- a/hurd/hurdlookup.c
+++ b/hurd/hurdlookup.c
@@ -133,7 +133,10 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
 #endif
 
 	  /* An empty RETRYNAME indicates we have the final port.  */
-	  if (retryname[0] == '\0')
+	  if (retryname[0] == '\0' &&
+	      /* If reauth'd, we must do one more retry on "" to give the new
+		 translator a chance to make a new port for us.  */
+	      doretry == FS_RETRY_NORMAL)
 	    {
 	      /* We got a successful translation.  Now apply any open-time
 		 action flags we were passed.  */
diff --git a/hurd/hurdmsg.c b/hurd/hurdmsg.c
index ba19a4538d..acec1f5fdf 100644
--- a/hurd/hurdmsg.c
+++ b/hurd/hurdmsg.c
@@ -449,10 +449,3 @@ _S_msg_set_dtable (mach_port_t process,
 kern_return_t
 _S_msg_startup_dosync (mach_port_t process)
 { return EOPNOTSUPP; }
-
-kern_return_t
-_S_msg_report_wait (mach_port_t process,
-		    mach_port_t thread,
-		    string_t wait_desc,
-		    int *wait_rpc)
-{ return EOPNOTSUPP; }
diff --git a/misc/init-misc.c b/misc/init-misc.c
index 44531a5e77..bf89e9ec0f 100644
--- a/misc/init-misc.c
+++ b/misc/init-misc.c
@@ -38,3 +38,7 @@ __init_misc (int argc, char **argv, char **envp)
       __progname_full = argv[0];
     }
 }
+
+#ifdef HAVE_GNU_LD
+text_set_element (__libc_subinit, __init_misc);
+#endif
diff --git a/posix/sys/types.h b/posix/sys/types.h
index 751f1064b0..bd6eca2374 100644
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -71,6 +71,8 @@ typedef unsigned int uint;
 #ifdef __USE_BSD
 /* These size-specific names are used by some of the inet code.  */
 
+#if !defined (__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 7
+
 typedef	char int8_t;
 typedef	unsigned char u_int8_t;
 typedef	short int int16_t;
@@ -83,6 +85,27 @@ typedef unsigned long long int u_int64_t;
 typedef int register_t __attribute__ ((__mode__ (word)));
 #endif
 
+#else
+
+/* For GCC 2.7 and later, we can use specific type-size attributes.  */
+#define __intN_t(N, MODE) \
+  typedef int int##N##_t __attribute__ ((__mode__ (MODE)))
+#define __u_intN_t(N, MODE) \
+  typedef unsigned int u_int##N##_t __attribute__ ((__mode__ (MODE)))
+
+__intN_t (8, __QI__);
+__u_intN_t (8, __QI__);
+__intN_t (16, __HI__);
+__u_intN_t (16, __HI__);
+__intN_t (32, __SI__);
+__u_intN_t (32, __SI__);
+__intN_t (64, __DI__);
+__u_intN_t (64, __DI__);
+
+typedef int register_t __attribute__ ((__mode__ (__word__)));
+
+#endif
+
 /* Some code from BIND tests this macro to see if the types above are
    defined.  */
 #define __BIT_TYPES_DEFINED__	1
diff --git a/sysdeps/generic/Makefile b/sysdeps/generic/Makefile
index 665d1cc53e..5e1032a054 100644
--- a/sysdeps/generic/Makefile
+++ b/sysdeps/generic/Makefile
@@ -53,9 +53,10 @@ $(objpfx)siglist.c: $(objpfx)make_siglist
 	mv $@-tmp $@
 
 $(objpfx)make_siglist: $(sysdep_dir)/generic/make_siglist.c
+	signum_h=`cd $(dir $(firstword $(wildcard \
+			   $(+sysdep_dirs:%=%/signum.h)))); pwd`/signum.h; \
 	$(native-compile) \
-	-DSIGNUM_H=\"`cd $(dir $(firstword $(wildcard \
-			 $(+sysdep_dirs:%=%/signum.h)))); pwd`/signum.h\"
+	-DSIGNUM_H=\"$${signum_h}\"
 
 generated := $(generated) make_siglist siglist.c
 endif
diff --git a/sysdeps/i386/i586/memcopy.h b/sysdeps/i386/i586/memcopy.h
index 0a8768788e..d8928988f3 100644
--- a/sysdeps/i386/i586/memcopy.h
+++ b/sysdeps/i386/i586/memcopy.h
@@ -1,5 +1,5 @@
 /* memcopy.h -- definitions for memory copy functions.  Pentium version.
-   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
    Contributed by Torbjorn Granlund (tege@sics.se).
 
 This file is part of the GNU C Library.
@@ -33,11 +33,14 @@ Cambridge, MA 02139, USA.  */
     {									\
       asm volatile ("subl	$32,%2\n"				\
 		    "js		2f\n"					\
+		    "movl	0(%0),%%edx\n"	/* alloc dest line */	\
 		    "1:\n"						\
-		    "movl	0(%1),%%eax\n"				\
-		    "movl	4(%1),%%edx\n"				\
-		    "movl	%%eax,0(%0)\n"				\
-		    "movl	%%edx,4(%0)\n"				\
+		    "movl	28(%0),%%eax\n"	/* alloc dest line */	\
+		    "subl	$32,%2\n"	/* decr loop count */	\
+		    "movl	0(%1),%%eax\n"	/* U pipe */		\
+		    "movl	4(%1),%%edx\n"	/* V pipe */		\
+		    "movl	%%eax,0(%0)\n"	/* U pipe */		\
+		    "movl	%%edx,4(%0)\n"	/* V pipe */		\
 		    "movl	8(%1),%%eax\n"				\
 		    "movl	12(%1),%%edx\n"				\
 		    "movl	%%eax,8(%0)\n"				\
@@ -50,9 +53,8 @@ Cambridge, MA 02139, USA.  */
 		    "movl	28(%1),%%edx\n"				\
 		    "movl	%%eax,24(%0)\n"				\
 		    "movl	%%edx,28(%0)\n"				\
-		    "addl	$32,%1\n"				\
-		    "addl	$32,%0\n"				\
-		    "subl	$32,%2\n"				\
+		    "leal	32(%1),%1\n"	/* update src ptr */	\
+		    "leal	32(%0),%0\n"	/* update dst ptr */	\
 		    "jns	1b\n"					\
 		    "2: addl	$32,%2" :				\
 		    "=r" (dst_bp), "=r" (src_bp), "=r" (nbytes_left) :	\
@@ -66,7 +68,10 @@ Cambridge, MA 02139, USA.  */
     {									\
       asm volatile ("subl	$32,%2\n"				\
 		    "js		2f\n"					\
+		    "movl	-4(%0),%%edx\n"				\
 		    "1:\n"						\
+		    "movl	-32(%0),%%eax\n"			\
+		    "subl	$32,%2\n"				\
 		    "movl	-4(%1),%%eax\n"				\
 		    "movl	-8(%1),%%edx\n"				\
 		    "movl	%%eax,-4(%0)\n"				\
@@ -83,9 +88,8 @@ Cambridge, MA 02139, USA.  */
 		    "movl	-32(%1),%%edx\n"			\
 		    "movl	%%eax,-28(%0)\n"			\
 		    "movl	%%edx,-32(%0)\n"			\
-		    "subl	$32,%1\n"				\
-		    "subl	$32,%0\n"				\
-		    "subl	$32,%2\n"				\
+		    "leal	-32(%1),%1\n"				\
+		    "leal	-32(%0),%0\n"				\
 		    "jns	1b\n"					\
 		    "2: addl	$32,%2" :				\
 		    "=r" (dst_ep), "=r" (src_ep), "=r" (nbytes_left) :	\
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index c650f5f392..462eb23b0e 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1995, 1996 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
@@ -65,6 +65,7 @@ vpath hurd/%.h $(hurd-srcdir)
 # This bypasses all the system call stubs and uses any existing posix or
 # generic C files instead.
 inhibit-sysdep-asm += unix*
+inhibit-unix-syscalls = yes
 
 # Don't try to generate anything from the installed Unix system and its
 # libraries.  That is only of use when building for a Unix system, so as to
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index fece47ba97..21f94f812a 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -48,14 +48,18 @@ unsigned int __hurd_threadvar_max = _HURD_THREADVAR_MAX;
 static unsigned long int threadvars[_HURD_THREADVAR_MAX];
 unsigned long int __hurd_threadvar_stack_offset
   = (unsigned long int) &threadvars;
+unsigned long int __hurd_sigthread_stack_base;
+unsigned long int __hurd_sigthread_stack_end;
+unsigned long int *__hurd_sigthread_variables;
+unsigned long int __hurd_threadvar_stack_mask;
 
 
 /* XXX loser kludge for vm_map kernel bug */
 static vm_address_t fmha;
 static vm_size_t fmhs;
-static void unfmh(){
+static void unfmh(void){
 __vm_deallocate(__mach_task_self(),fmha,fmhs);}
-static void fmh() {
+static void fmh(void) {
     error_t err;int x;mach_port_t p;
     vm_address_t a=0x08000000U,max=VM_MAX_ADDRESS;
     while (!(err=__vm_region(__mach_task_self(),&a,&fmhs,&x,&x,&x,&x,&p,&x))){
diff --git a/sysdeps/mach/hurd/fchdir.c b/sysdeps/mach/hurd/fchdir.c
index 7c1be4fdd3..23fde24f4f 100644
--- a/sysdeps/mach/hurd/fchdir.c
+++ b/sysdeps/mach/hurd/fchdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 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
@@ -31,9 +31,11 @@ DEFUN(fchdir, (fd), int fd)
   error_t err;
   file_t dir;
 
-  err = HURD_DPORT_USE (fd, (dir = __file_name_lookup_under (port, "",
-							     O_EXEC, 0),
-			     errno));
+  err = HURD_DPORT_USE (fd,
+			({
+			  dir = __file_name_lookup_under (port, "", O_EXEC, 0);
+			  dir == MACH_PORT_NULL ? errno : 0;
+			}));
 
   if (! err)
     _hurd_port_set (&_hurd_ports[INIT_PORT_CWDIR], dir);
diff --git a/sysdeps/mach/hurd/fork.c b/sysdeps/mach/hurd/fork.c
index 8c6ef12d10..8d730ae4fb 100644
--- a/sysdeps/mach/hurd/fork.c
+++ b/sysdeps/mach/hurd/fork.c
@@ -252,6 +252,12 @@ __fork (void)
 		      if (old != MACH_PORT_NULL)
 			/* XXX what to do here? */
 			__mach_port_deallocate (__mach_task_self (), old);
+		      /* The new task will receive its own exceptions
+			 on its message port.  */
+		      if (err = __task_set_special_port (newtask,
+							 TASK_EXCEPTION_PORT,
+							 port))
+			LOSE;
 		    }
 		  if (err = __mach_port_insert_right (newtask,
 						      portnames[i],
diff --git a/sysdeps/mach/hurd/i386/intr-msg.h b/sysdeps/mach/hurd/i386/intr-msg.h
index 353a6d2acd..43d244a182 100644
--- a/sysdeps/mach/hurd/i386/intr-msg.h
+++ b/sysdeps/mach/hurd/i386/intr-msg.h
@@ -1,5 +1,5 @@
 /* Machine-dependent details of interruptible RPC messaging.  i386 version.
-Copyright (C) 1995 Free Software Foundation, Inc.
+Copyright (C) 1995, 1996 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
@@ -45,3 +45,56 @@ INTR_MSG_BACK_OUT (struct i386_thread_state *state)
   else
     state->ecx = state->uesp;
 }
+
+#include "hurdfault.h"
+
+static inline int
+SYSCALL_EXAMINE (struct i386_thread_state *state, int *callno)
+{
+  struct { unsigned int c[2]; } *p = (void *) (state->eip - 7);
+  int result;
+  if (_hurdsig_catch_memory_fault (p))
+    return 0;
+  if (result = p->c[0] == 0x0000009a && (p->c[1] & 0x00ffffff) == 0x00000700)
+    /* The PC is just after an `lcall $7,$0' instruction.
+       This is a system call in progress; %eax holds the call number.  */
+    *callno = state->eax;
+  _hurdsig_end_catch_fault ();
+  return result;
+}
+
+
+struct mach_msg_trap_args
+  {
+    void *retaddr;		/* Address mach_msg_trap will return to.  */
+    /* This is the order of arguments to mach_msg_trap.  */
+    mach_msg_header_t *msg;
+    mach_msg_option_t option;
+    mach_msg_size_t send_size;
+    mach_msg_size_t rcv_size;
+    mach_port_t rcv_name;
+    mach_msg_timeout_t timeout;
+    mach_port_t notify;
+  };
+
+
+static inline mach_port_t
+MSG_EXAMINE (struct i386_thread_state *state, int *msgid)
+{
+  const struct mach_msg_trap_args *args = (const void *) state->uesp;
+  mach_msg_header_t *msg;
+  mach_port_t send_port;
+
+  if (_hurdsig_catch_memory_fault (args))
+    return MACH_PORT_NULL;
+  msg = args->msg;
+  _hurdsig_end_catch_fault ();
+
+  if (_hurdsig_catch_memory_fault (msg))
+    return MACH_PORT_NULL;
+  send_port = msg->msgh_remote_port;
+  *msgid = msg->msgh_id;
+  _hurdsig_end_catch_fault ();
+
+  return send_port;
+}
diff --git a/sysdeps/mach/hurd/i386/trampoline.c b/sysdeps/mach/hurd/i386/trampoline.c
index f64539a384..bd91c24304 100644
--- a/sysdeps/mach/hurd/i386/trampoline.c
+++ b/sysdeps/mach/hurd/i386/trampoline.c
@@ -23,21 +23,9 @@ Cambridge, MA 02139, USA.  */
 #include <assert.h>
 #include <errno.h>
 #include "hurdfault.h"
+#include "intr-msg.h"
 
 
-struct mach_msg_trap_args
-  {
-    void *retaddr;		/* Address mach_msg_trap will return to.  */
-    /* This is the order of arguments to mach_msg_trap.  */
-    mach_msg_header_t *msg;
-    mach_msg_option_t option;
-    mach_msg_size_t send_size;
-    mach_msg_size_t rcv_size;
-    mach_port_t rcv_name;
-    mach_msg_timeout_t timeout;
-    mach_port_t notify;
-  };
-
 struct sigcontext *
 _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler,
 			int signo, long int sigcode,
@@ -94,7 +82,7 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler,
 	 per-thread variables, cthreads.  */
     }
   /* This code has intimate knowledge of the special mach_msg system call
-     done in intr-msg.c; that code does:
+     done in intr-msg.c; that code does (see intr-msg.h):
 					movl %esp, %ecx
 					leal ARGS, %esp
 	_hurd_intr_rpc_msg_cx_sp:	movl $-25, %eax
diff --git a/sysdeps/stub/bind.c b/sysdeps/stub/bind.c
index 9a744ef209..38ad46aa87 100644
--- a/sysdeps/stub/bind.c
+++ b/sysdeps/stub/bind.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996 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,7 @@ Cambridge, MA 02139, USA.  */
 /* Give the socket FD the local address ADDR (which is LEN bytes long).  */
 int
 DEFUN(bind, (fd, addr, len),
-      int fd AND struct sockaddr *addr AND size_t len)
+      int fd AND const struct sockaddr *addr AND size_t len)
 {
   errno = ENOSYS;
   return -1;
diff --git a/sysdeps/stub/connect.c b/sysdeps/stub/connect.c
index 8e6c7243b4..49300f3a09 100644
--- a/sysdeps/stub/connect.c
+++ b/sysdeps/stub/connect.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996 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
@@ -26,7 +26,7 @@ Cambridge, MA 02139, USA.  */
    Return 0 on success, -1 for errors.  */
 int
 DEFUN(connect, (fd, addr, len),
-      int fd AND struct sockaddr *addr AND size_t len)
+      int fd AND const struct sockaddr *addr AND size_t len)
 {
   errno = ENOSYS;
   return -1;
diff --git a/sysdeps/stub/sendto.c b/sysdeps/stub/sendto.c
index f2253b12b9..e26c88751c 100644
--- a/sysdeps/stub/sendto.c
+++ b/sysdeps/stub/sendto.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996 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,7 +25,7 @@ Cambridge, MA 02139, USA.  */
 int
 DEFUN(sendto, (fd, buf, n, flags, addr, addr_len),
       int fd AND PTR buf AND size_t n AND int flags AND
-      struct sockaddr *addr AND size_t addr_len)
+      const struct sockaddr *addr AND size_t addr_len)
 {
   errno = ENOSYS;
   return -1;
diff --git a/sysdeps/unix/bsd/sun/sigvec.S b/sysdeps/unix/bsd/sun/sigvec.S
deleted file mode 100644
index c09397486f..0000000000
--- a/sysdeps/unix/bsd/sun/sigvec.S
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright (C) 1991, 1992, 1995 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#include <sysdep.h>
-
-/* __sigvec is defined by sigtramp.c.  */
-
-PSEUDO (__raw_sigvec, sigvec, 3)
-	ret
-
-weak_alias (__sigvec, sigvec)
diff --git a/sysdeps/unix/bsd/sun/syscalls.list b/sysdeps/unix/bsd/sun/syscalls.list
index b9dca13bf7..1c0d44d8d9 100644
--- a/sysdeps/unix/bsd/sun/syscalls.list
+++ b/sysdeps/unix/bsd/sun/syscalls.list
@@ -1,3 +1,4 @@
 # File name	Caller	Syscall name	# args	Strong name	Weak names
 
 getdents	-	getdirentries	4	__getdirentries	getdirentries
+sigvec		-	sigvec		3	__raw_sigvec
diff --git a/sysdeps/unix/configure.in b/sysdeps/unix/configure.in
new file mode 100644
index 0000000000..37b6a5bbb9
--- /dev/null
+++ b/sysdeps/unix/configure.in
@@ -0,0 +1,8 @@
+sinclude(./aclocal.m4)dnl Autoconf lossage
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/unix.
+
+if test -z "$inhibit_glue"; then
+# For make_errlist.c, used in make_errlist.
+AC_CHECK_FUNCS(strerror)
+fi
diff --git a/sysdeps/unix/make_errlist.c b/sysdeps/unix/make_errlist.c
index 8c2b250134..0c6a7d948f 100644
--- a/sysdeps/unix/make_errlist.c
+++ b/sysdeps/unix/make_errlist.c
@@ -21,7 +21,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Make a definition for sys_errlist.  */
 
 extern int sys_nerr;
+#ifndef HAVE_STRERROR
 extern char *sys_errlist[];
+#endif
 
 int
 main ()
@@ -35,7 +37,13 @@ main ()
   puts ("CONST char *CONST _sys_errlist[] =\n  {");
 
   for (i = 0; i < sys_nerr; ++i)
-    printf ("    \"%s\",\n", sys_errlist[i]);
+    printf ("    \"%s\",\n",
+#ifdef HAVE_STRERROR
+          strerror (i)
+#else /* ! HAVE_STRERROR */
+          sys_errlist[i]
+#endif /* HAVE_STRERROR */
+          );
 
   puts ("    NULL\n  };\n");
 
diff --git a/time/Makefile b/time/Makefile
index b0d671ab9b..f2cab6ae58 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -127,4 +127,5 @@ tz-cc = $(COMPILE.c) $(+gcc-nowarn) \
 
 CFLAGS-zdump.c = -Wno-strict-prototypes
 CFLAGS-zic.c = -Wno-strict-prototypes
-CFLAGS-ialloc.c = -Wno-strict-prototypes
+CFLAGS-ialloc.c = -Wno-strict-prototypes -Wno-unused
+CFLAGS-scheck.c = -Wno-strict-prototypes -Wno-unused