diff --git a/ChangeLog b/ChangeLog
index d33d7af2d5..0df19639f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+Thu Apr 27 01:24:09 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* configure.in: Unless --without-fp, prepend */fpu before each
+ 	machine dir in $mach; don't prepend FPU dirs at end.  If
+ 	--with-elf, prepend MACHINE/elf directories at end; don't insert
+ 	them into $mach.
+
+	* Makerules (dist): Filter out *.[cSs] from $(distribute) in deps.
+
+	* sysdeps/stub/clock.c: Added stub warning.
+	* sysdeps/stub/dirfd.c: Likewise.
+	* sysdeps/stub/exc2signal.c: Likewise.
+	* sysdeps/stub/fdopen.c: Likewise.
+	* sysdeps/stub/flock.c: Likewise.
+	* sysdeps/stub/fpathconf.c: Likewise.
+	* sysdeps/stub/ftruncate.c: Likewise.
+	* sysdeps/stub/gtty.c: Likewise.
+	* sysdeps/stub/isatty.c: Likewise.
+	* sysdeps/stub/killpg.c: Likewise.
+	* sysdeps/stub/madvise.c: Likewise.
+	* sysdeps/stub/mkstemp.c: Likewise.
+	* sysdeps/stub/mktemp.c: Likewise.
+	* sysdeps/stub/mprotect.c: Likewise.
+	* sysdeps/stub/msync.c: Likewise.
+	* sysdeps/stub/pathconf.c: Likewise.
+	* sysdeps/stub/poll.c: Likewise.
+	* sysdeps/stub/raise.c: Likewise.
+	* sysdeps/stub/readv.c: Likewise.
+	* sysdeps/stub/setenv.c: Likewise.
+	* sysdeps/stub/setlogin.c: Likewise.
+	* sysdeps/stub/sigaltstack.c: Likewise.
+	* sysdeps/stub/sigintr.c: Likewise.
+	* sysdeps/stub/sigstack.c: Likewise.
+	* sysdeps/stub/sleep.c: Likewise.
+	* sysdeps/stub/sstk.c: Likewise.
+	* sysdeps/stub/stime.c: Likewise.
+	* sysdeps/stub/stty.c: Likewise.
+	* sysdeps/stub/syscall.c: Likewise.
+	* sysdeps/stub/sysconf.c: Likewise.
+	* sysdeps/stub/truncate.c: Likewise.
+	* sysdeps/stub/ualarm.c: Likewise.
+	* sysdeps/stub/usleep.c: Likewise.
+	* sysdeps/stub/utimes.c: Likewise.
+	* sysdeps/stub/writev.c: Likewise.
+
+	* sysdeps/stub/libc_fatal.c: Remove __NORETURN keyword.
+
+Wed Apr 26 16:06:42 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* locale/loadlocale.c (_nl_free_locale): Do nothing if DATA is null.
+
+Tue Apr 25 17:17:19 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob.c (glob): If GLOB_MARK set, stat names to find
+ 	directories and append slashes to them in final pass before
+ 	sorting.
+	(glob_in_dir): If GLOB_MARK set, just allocate the extra char for the
+	slash; never append it here.
+
 Sat Apr 22 14:48:03 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* mach/Machrules [interface-library]
diff --git a/Makerules b/Makerules
index f19a9f7b71..6c01013e8d 100644
--- a/Makerules
+++ b/Makerules
@@ -610,7 +610,9 @@ $(common-objpfx)stub-$(subdir): $(+depfiles)
 dist: distinfo $(..)Make-dist 
 	$(MAKE) -f $< -f $(word 2,$^) $(Make-dist-args)
 
-dist: $(distribute)
+# Avoid depending on source files found in sysdeps dirs,
+# because the references affect implicit rule selection.
+dist: $(filter-out %.c %.S %.s,$(distribute))
 
 # We used to simply export all these variables, but that frequently made the
 # environment get too large.  Instead, we write all the information into
diff --git a/configure.in b/configure.in
index 11f57c9f9f..bf2e2b1628 100644
--- a/configure.in
+++ b/configure.in
@@ -147,9 +147,9 @@ mach=
 tail=$machine
 while m=`echo $tail | sed 's@^\(.*\)/\([^/]*\)$@& \1@'`; test -n "$m"; do
   set $m
-  # If using ELF, look for an `elf' subdirectory of each machine directory.
-  if test "$elf" = yes; then
-    mach="$mach /$1/elf"
+  # Prepend the machine's FPU directory unless --without-fp.
+  if test "$with_fp" = yes; then
+    mach="$mach /$1/fpu"
   fi
   mach="$mach /$1"
   tail="$2"
@@ -187,21 +187,25 @@ fi
 # We have now validated the configuration.
 
 
-# Remove the leading slashes.
-sysnames="`echo $sysnames | sed -e 's@^/@@' -e 's@ /@ @g'`"
-
-# Prepend the machine's FPU directory unless --without-fp.
-if test "$with_fp" = yes; then
-  fpu_dirs=
+# If using ELF, look for an `elf' subdirectory of each machine directory.
+# We prepend these rather than inserting them whereever the machine appears
+# because things specified by the machine's ELF ABI should override
+# OS-specific things, and should always be the same for any OS on the
+# machine (otherwise what's the point of an ABI?).
+if test "$elf" = yes; then
+  elf_dirs=
   for m in $mach; do
-    if test -d $sysdep_dir$m/fpu; then
-      fpu_dirs="$fpu_dirs $m/fpu"
+    if test -d $sysdep_dir$m/elf; then
+      elf_dirs="$elf_dirs $m/elf"
     fi
   done
-  sysnames="`echo $fpu_dirs | sed -e 's,^/,,' -e 's, /,,g'` $sysnames"
+  sysnames="`echo $elf_dirs | sed -e 's,^/,,' -e 's, /,,g'` $sysnames"
 fi
 
 
+# Remove the leading slashes.
+sysnames="`echo $sysnames | sed -e 's@^/@@' -e 's@ /@ @g'`"
+
 
 # Expand the list of system names into a full list of directories
 # from each element's parent name and Implies file (if present).
diff --git a/sysdeps/stub/clock.c b/sysdeps/stub/clock.c
index 151022db4e..c22192bd86 100644
--- a/sysdeps/stub/clock.c
+++ b/sysdeps/stub/clock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -28,3 +28,5 @@ DEFUN_VOID(clock)
   errno = ENOSYS;
   return (clock_t) -1;
 }
+
+stub_warning (clock)
diff --git a/sysdeps/stub/dirfd.c b/sysdeps/stub/dirfd.c
index f6ebd04bca..9ec19696f3 100644
--- a/sysdeps/stub/dirfd.c
+++ b/sysdeps/stub/dirfd.c
@@ -28,3 +28,5 @@ dirfd (dirp)
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (dirfd)
diff --git a/sysdeps/stub/elfreloc.h b/sysdeps/stub/elfreloc.h
new file mode 100644
index 0000000000..2fea444cbc
--- /dev/null
+++ b/sysdeps/stub/elfreloc.h
@@ -0,0 +1,36 @@
+/* Machine-dependent ELF dynamic relocation inline functions.  Stub version.
+Copyright (C) 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.  */
+
+/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+   LOADADDR is the load address of the object; INFO is an array indexed
+   by DT_* of the .dynamic section info.  */
+
+static inline void
+elf_machine_rel (Elf32_Addr loadaddr, const Elf32_Word *info,
+		 const Elf32_Rel *reloc, Elf32_Sym *sym)
+{
+  abort ();
+}
+
+static inline void
+elf_machine_rela (Elf32_Addr loadaddr, const Elf32_Word *info,
+		  const Elf32_Rela *reloc)
+{
+  abort ();
+}
diff --git a/sysdeps/stub/exc2signal.c b/sysdeps/stub/exc2signal.c
index 1c4c9ac5ec..f760bcd4a1 100644
--- a/sysdeps/stub/exc2signal.c
+++ b/sysdeps/stub/exc2signal.c
@@ -1,5 +1,5 @@
 /* Translate Mach exception codes into signal numbers.  Stub version.
-Copyright (C) 1991, 1992, 1994 Free Software Foundation, Inc.
+Copyright (C) 1991, 1992, 1994, 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
@@ -19,6 +19,9 @@ Cambridge, MA 02139, USA.  */
 
 #include <hurd.h>
 
+/* This file must be modified with machine-dependent details.  */
+#error "need to write sysdeps/mach/hurd/MACHINE/exc2signal.c"
+
 /* Translate the Mach exception codes, as received in an `exception_raise' RPC,
    into a signal number and signal subcode.  */
 
diff --git a/sysdeps/stub/fdopen.c b/sysdeps/stub/fdopen.c
index 9865f42b9b..4ab921bfd1 100644
--- a/sysdeps/stub/fdopen.c
+++ b/sysdeps/stub/fdopen.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -27,3 +27,5 @@ DEFUN(fdopen, (fd, mode), int fd AND CONST char *mode)
   errno = ENOSYS;
   return NULL;
 }
+
+stub_warning (fdopen)
diff --git a/sysdeps/stub/flock.c b/sysdeps/stub/flock.c
index 6855cd4a3e..bdd7858393 100644
--- a/sysdeps/stub/flock.c
+++ b/sysdeps/stub/flock.c
@@ -31,3 +31,5 @@ DEFUN(__flock, (fd, operation),
 }
 
 weak_alias (__flock, flock)
+
+stub_warning (flock)
diff --git a/sysdeps/stub/fpathconf.c b/sysdeps/stub/fpathconf.c
index fe121ba3c2..4f1f1d4a1d 100644
--- a/sysdeps/stub/fpathconf.c
+++ b/sysdeps/stub/fpathconf.c
@@ -55,3 +55,5 @@ DEFUN(__fpathconf, (fd, name), int fd AND int name)
 }
 
 weak_alias (__fpathconf, fpathconf)
+
+stub_warning (fpathconf)
diff --git a/sysdeps/stub/ftruncate.c b/sysdeps/stub/ftruncate.c
index 8b2d4665a9..f9474dd4e2 100644
--- a/sysdeps/stub/ftruncate.c
+++ b/sysdeps/stub/ftruncate.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -28,3 +28,5 @@ DEFUN(ftruncate, (fd, length),
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (ftruncate)
diff --git a/sysdeps/stub/gtty.c b/sysdeps/stub/gtty.c
index 5695d69a2d..b702dda29a 100644
--- a/sysdeps/stub/gtty.c
+++ b/sysdeps/stub/gtty.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* 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
@@ -35,3 +35,5 @@ DEFUN(gtty, (fd, params),
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (gtty)
diff --git a/sysdeps/stub/isatty.c b/sysdeps/stub/isatty.c
index 05477f8cc8..ae9510b313 100644
--- a/sysdeps/stub/isatty.c
+++ b/sysdeps/stub/isatty.c
@@ -29,3 +29,5 @@ DEFUN(__isatty, (fd), int fd)
 }
 
 weak_alias (__isatty, isatty)
+
+stub_warning (isatty)
diff --git a/sysdeps/stub/killpg.c b/sysdeps/stub/killpg.c
index eb05bca9b8..6e8424d4a3 100644
--- a/sysdeps/stub/killpg.c
+++ b/sysdeps/stub/killpg.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 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
@@ -30,3 +30,5 @@ DEFUN(killpg, (pgrp, sig), __pid_t pgrp AND int sig)
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (killpg)
diff --git a/sysdeps/stub/libc_fatal.c b/sysdeps/stub/libc_fatal.c
index 5a5d2fb79f..743bc4e079 100644
--- a/sysdeps/stub/libc_fatal.c
+++ b/sysdeps/stub/libc_fatal.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 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
@@ -20,7 +20,6 @@ Cambridge, MA 02139, USA.  */
 #include <stdio.h>
 
 /* Abort with an error message.  */
-__NORETURN
 void
 DEFUN(__libc_fatal, (message), CONST char *message)
 {
diff --git a/sysdeps/stub/madvise.c b/sysdeps/stub/madvise.c
index 631a151f36..e3dbacdfe3 100644
--- a/sysdeps/stub/madvise.c
+++ b/sysdeps/stub/madvise.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 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
@@ -29,3 +29,5 @@ madvise (caddr_t addr, size_t len, int advice)
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (madvise)
diff --git a/sysdeps/stub/mkstemp.c b/sysdeps/stub/mkstemp.c
index 0adc52ed62..1adf6c0215 100644
--- a/sysdeps/stub/mkstemp.c
+++ b/sysdeps/stub/mkstemp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -36,3 +36,5 @@ DEFUN(mkstemp, (template), char *template)
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (mkstemp)
diff --git a/sysdeps/stub/mktemp.c b/sysdeps/stub/mktemp.c
index 33a1295942..ad660232d7 100644
--- a/sysdeps/stub/mktemp.c
+++ b/sysdeps/stub/mktemp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -35,3 +35,5 @@ DEFUN(mktemp, (template), char *template)
   errno = ENOSYS;
   return NULL;
 }
+
+stub_warning (mktemp)
diff --git a/sysdeps/stub/mprotect.c b/sysdeps/stub/mprotect.c
index 169e6c3ec8..1d8c8f4ded 100644
--- a/sysdeps/stub/mprotect.c
+++ b/sysdeps/stub/mprotect.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 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
@@ -31,3 +31,4 @@ mprotect (caddr_t addr, size_t len, int prot)
   return -1;
 }
 	
+stub_warning (mprotect)
diff --git a/sysdeps/stub/msync.c b/sysdeps/stub/msync.c
index ed55915409..668c582e1f 100644
--- a/sysdeps/stub/msync.c
+++ b/sysdeps/stub/msync.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 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
@@ -30,3 +30,5 @@ msync (caddr_t addr, size_t len)
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (msync)
diff --git a/sysdeps/stub/pathconf.c b/sysdeps/stub/pathconf.c
index f14d10f7d1..1a544c3882 100644
--- a/sysdeps/stub/pathconf.c
+++ b/sysdeps/stub/pathconf.c
@@ -35,3 +35,5 @@ DEFUN(__pathconf, (path, name), CONST char *path AND int name)
 }
 
 weak_alias (__pathconf, pathconf)
+
+stub_warning (pathconf)
diff --git a/sysdeps/stub/poll.c b/sysdeps/stub/poll.c
index 3436eaa33d..40fc2c91c7 100644
--- a/sysdeps/stub/poll.c
+++ b/sysdeps/stub/poll.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 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
@@ -34,3 +34,5 @@ poll (fds, nfds, timeout)
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (poll)
diff --git a/sysdeps/stub/raise.c b/sysdeps/stub/raise.c
index b3af76b5b4..ea89874f92 100644
--- a/sysdeps/stub/raise.c
+++ b/sysdeps/stub/raise.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -27,3 +27,5 @@ DEFUN(raise, (sig), int sig)
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (raise)
diff --git a/sysdeps/stub/readv.c b/sysdeps/stub/readv.c
index beebd950c1..03d6bf9613 100644
--- a/sysdeps/stub/readv.c
+++ b/sysdeps/stub/readv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -33,3 +33,5 @@ DEFUN(readv, (fd, vector, count),
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (readv)
diff --git a/sysdeps/stub/setenv.c b/sysdeps/stub/setenv.c
index 992a15df02..998c055f50 100644
--- a/sysdeps/stub/setenv.c
+++ b/sysdeps/stub/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -27,3 +27,5 @@ DEFUN(setenv, (name, value, replace),
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (setenv)
diff --git a/sysdeps/stub/setlogin.c b/sysdeps/stub/setlogin.c
index 393fd5864a..a406bc54d8 100644
--- a/sysdeps/stub/setlogin.c
+++ b/sysdeps/stub/setlogin.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -27,3 +27,5 @@ DEFUN(setlogin, (name), CONST char *name)
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (setlogin)
diff --git a/sysdeps/stub/sigaltstack.c b/sysdeps/stub/sigaltstack.c
index ae5a7ae413..01a547c2a5 100644
--- a/sysdeps/stub/sigaltstack.c
+++ b/sysdeps/stub/sigaltstack.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -29,3 +29,5 @@ DEFUN(sigaltstack, (ss, oss),
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (sigaltstack)
diff --git a/sysdeps/stub/sigintr.c b/sysdeps/stub/sigintr.c
index 5ec83e0506..a15b2c11b4 100644
--- a/sysdeps/stub/sigintr.c
+++ b/sysdeps/stub/sigintr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -30,3 +30,5 @@ DEFUN(siginterrupt, (sig, interrupt),
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (siginterrupt)
diff --git a/sysdeps/stub/sigstack.c b/sysdeps/stub/sigstack.c
index 001acfd996..a9da1e699e 100644
--- a/sysdeps/stub/sigstack.c
+++ b/sysdeps/stub/sigstack.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -29,3 +29,5 @@ DEFUN(sigstack, (ss, oss),
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (sigstack)
diff --git a/sysdeps/stub/sleep.c b/sysdeps/stub/sleep.c
index 5cbeaaff49..88c7120a27 100644
--- a/sysdeps/stub/sleep.c
+++ b/sysdeps/stub/sleep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* 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
@@ -35,3 +35,5 @@ DEFUN(sleep, (seconds), unsigned int seconds)
   errno = ENOSYS;
   return seconds;
 }
+
+stub_warning (sleep)
diff --git a/sysdeps/stub/sstk.c b/sysdeps/stub/sstk.c
index 0426d394af..e49bc31ee3 100644
--- a/sysdeps/stub/sstk.c
+++ b/sysdeps/stub/sstk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -27,3 +27,5 @@ DEFUN(sstk, (increment), int increment)
   errno = ENOSYS;
   return (PTR) -1;
 }
+
+stub_warning (sstk)
diff --git a/sysdeps/stub/stime.c b/sysdeps/stub/stime.c
index df6fdba12c..231e762808 100644
--- a/sysdeps/stub/stime.c
+++ b/sysdeps/stub/stime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -35,3 +35,5 @@ DEFUN(stime, (when), CONST time_t *when)
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (stime)
diff --git a/sysdeps/stub/stty.c b/sysdeps/stub/stty.c
index 24a865b2ea..dec67c2cc3 100644
--- a/sysdeps/stub/stty.c
+++ b/sysdeps/stub/stty.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* 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
@@ -35,3 +35,5 @@ DEFUN(stty, (fd, params),
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (stty)
diff --git a/sysdeps/stub/syscall.c b/sysdeps/stub/syscall.c
index e8deffd0ad..d2a5b3ca33 100644
--- a/sysdeps/stub/syscall.c
+++ b/sysdeps/stub/syscall.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1994, 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
@@ -29,3 +29,5 @@ DEFUN(syscall, (callno), int callno DOTS)
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (syscall)
diff --git a/sysdeps/stub/sysconf.c b/sysdeps/stub/sysconf.c
index 1d5d483793..bb4eb87e0c 100644
--- a/sysdeps/stub/sysconf.c
+++ b/sysdeps/stub/sysconf.c
@@ -67,3 +67,5 @@ DEFUN(__sysconf, (name), int name)
 }
 
 weak_alias (__sysconf, sysconf)
+
+stub_warning (sysconf)
diff --git a/sysdeps/stub/truncate.c b/sysdeps/stub/truncate.c
index 32d32d81f7..1367332792 100644
--- a/sysdeps/stub/truncate.c
+++ b/sysdeps/stub/truncate.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -28,3 +28,5 @@ DEFUN(truncate, (path, length),
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (truncate)
diff --git a/sysdeps/stub/ualarm.c b/sysdeps/stub/ualarm.c
index 4a596d77e8..ead365b157 100644
--- a/sysdeps/stub/ualarm.c
+++ b/sysdeps/stub/ualarm.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -31,3 +31,5 @@ DEFUN(ualarm, (value, interval),
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (ualarm)
diff --git a/sysdeps/stub/usleep.c b/sysdeps/stub/usleep.c
index f0c65d0710..c1cae9c7c6 100644
--- a/sysdeps/stub/usleep.c
+++ b/sysdeps/stub/usleep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -26,3 +26,5 @@ DEFUN(usleep, (useconds), unsigned int useconds)
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (usleep)
diff --git a/sysdeps/stub/utimes.c b/sysdeps/stub/utimes.c
index 5172b0714a..5afc3d7eb4 100644
--- a/sysdeps/stub/utimes.c
+++ b/sysdeps/stub/utimes.c
@@ -38,3 +38,5 @@ DEFUN(__utimes, (file, tvp),
 }
 
 weak_alias (__utimes, utimes)
+
+stub_warning (utimes)
diff --git a/sysdeps/stub/writev.c b/sysdeps/stub/writev.c
index de354e8cd7..f1d574948d 100644
--- a/sysdeps/stub/writev.c
+++ b/sysdeps/stub/writev.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -33,3 +33,5 @@ DEFUN(writev, (fd, vector, count),
   errno = ENOSYS;
   return -1;
 }
+
+stub_warning (writev)