Update. cvs/libc-ud-971014

1997-10-15 06:56  Ulrich Drepper  <drepper@cygnus.com>

	* Rules: Remove ruls to magically install <subdir>.h headers.
	Reported by Mark Kettenis <kettenis@phys.uva.nl>.

	* glibcbug.in: Fix @gnu.ai.mit.edu -> @gnu.org.
	* version.c: Likewise.
	* catgets/gencat.c: Likewise.
	* db2/makedb.c: Likewise.
	* locale/programs/locale.c: Likewise.
	* locale/programs/localedef.c: Likewise.

	* libc.map: Move _IO_list_all back to GLIBC_2.0.

	* elf/rtld.c: Provide name of running program to _dl_new_object.

	* Rules: Implement shared-only-sources.
	* include/libc-symbols.h: Define default_symbol_version.
	* libio/Makefile (shared-only-sources): Define.
	* libio/freopen.c: Define as default version.
	* libio/iofopen.c: Likewise.
	* libio/genops.c: Define _IO_list_all here.
	* libio/stdfiles.c: Create linked list with public names.
	* libio/oldstdfiles.c: Likewise.

	* stdio-common/printf.c: Optimize.
	* stdio-common/scanf.c: Optimize.

	* sysdeps/generic/setfpucw.c: Include #include <...> not "...".

	* sysdeps/i386/i486/bits/string.h: Add optimized versions of index and
	rindex.

1997-10-14  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* manual/arith.texi: Spelling fixes.
	* manual/conf.texi: Likewise.
	* manual/creature.texi: Likewise.
	* manual/filesys.texi: Likewise.
	* manual/intro.texi: Likewise.
	* manual/llio.texi: Likewise.
	* manual/math.texi: Likewise.
	* manual/message.texi: Likewise.
	* manual/pattern.texi: Likewise.
	* manual/search.texi: Likewise.
	* manual/signal.texi: Likewise.
	* manual/socket.texi: Likewise.
	* manual/startup.texi: Likewise.
	* manual/stdio.texi: Likewise.
	* manual/string.texi: Likewise.
	* manual/time.texi: Likewise.
	* manual/users.texi: Likewise.

1997-10-13 05:25  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/sys/mman.h: Use __ptr_t instead of __caddr_t.
	* sysdeps/unix/bsd/osf/sys/mman.h: Likewise.
	* sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise.
	* sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise.
	* sysdeps/unix/sysv/irix4/sys/mman.h: Likewise.
	* sysdeps/unix/sysv/linux/sys/mman.h: Likewise.
	* sysdeps/mach/hurd/mmap.c: Likewise.
	* sysdeps/generic/mmap.c: Likewise.
	* sysdeps/unix/bsd/sun/sunos4/mmap.c: Likewise.
	* sysdeps/mach/munmap.c: Likewise.
	* sysdeps/generic/munmap.c: Likewise.
	* sysdeps/mach/mprotect.c: Likewise.
	* sysdeps/generic/mprotect.c: Likewise.
	* sysdeps/generic/msync.c: Likewise.
	* sysdeps/generic/madvise.c: Likewise.

	* sysdeps/unix/sysv/linux/madvise.c: Include stub version from generic
	subdir.

1997-10-12 20:27  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* sysdeps/stub (all files):  Moved to sysdeps/generic.
	* all files using stub_warning: Include <stub-tag.h>.
	* include/stub-tag.h: New file, marks stubs in .d files.
	* Makerules: Look for stub-tag.h, not sysdeps/stub, when building
	<gnu/stubs.h>.
	* configure.in: Don't add sysdeps/stub to $sysnames.
	* sysdeps/unix/Makefile: Look for generic headers, not stub
	headers.
	* sysdeps/generic/Makefile: Likewise.
	* manual/maint.texi: Delete references to sysdeps/stub.
	* INSTALL: Rebuilt.
	* configure: Rebuilt.

354 files changed, 672 insertions, 114 deletions

diff --git a/sysdeps/generic/Makefile b/sysdeps/generic/Makefile
index b6a08172e4..2f6a8f4333 100644
--- a/sysdeps/generic/Makefile
+++ b/sysdeps/generic/Makefile
@@ -16,7 +16,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-ifeq (,$(filter-out $(sysdep_dir)/stub/bits $(common-objpfx)/bits,\
+ifeq (,$(filter-out $(sysdep_dir)/generic/bits $(common-objpfx)/bits,\
 	$(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/bits/endian.h))))))
 
 $(common-objpfx)bytesex.h: $(common-objpfx)det_endian
diff --git a/sysdeps/stub/__longjmp.c b/sysdeps/generic/__longjmp.c
index 11b72357e4..84d23d4fcd 100644
--- a/sysdeps/stub/__longjmp.c
+++ b/sysdeps/generic/__longjmp.c
@@ -36,3 +36,4 @@ __longjmp (env, val)
 }
 
 stub_warning (longjmp)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/_exit.c b/sysdeps/generic/_exit.c
index 1b8f1700da..5fb4366e49 100644
--- a/sysdeps/stub/_exit.c
+++ b/sysdeps/generic/_exit.c
@@ -31,3 +31,4 @@ _exit (status)
 }
 
 stub_warning (_exit)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/accept.c b/sysdeps/generic/accept.c
index c27070c0b1..b8f714a201 100644
--- a/sysdeps/stub/accept.c
+++ b/sysdeps/generic/accept.c
@@ -36,3 +36,4 @@ accept (fd, addr, addr_len)
 
 
 stub_warning (accept)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/access.c b/sysdeps/generic/access.c
index a3b1d32998..9dad9b5f79 100644
--- a/sysdeps/stub/access.c
+++ b/sysdeps/generic/access.c
@@ -38,3 +38,4 @@ __access (file, type)
 stub_warning (access)
 
 weak_alias (__access, access)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/acct.c b/sysdeps/generic/acct.c
index 508a775dc8..c571567f47 100644
--- a/sysdeps/stub/acct.c
+++ b/sysdeps/generic/acct.c
@@ -31,3 +31,4 @@ acct (name)
 }
 
 stub_warning (acct)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/adjtime.c b/sysdeps/generic/adjtime.c
index dc1534926f..9b6f3574d9 100644
--- a/sysdeps/stub/adjtime.c
+++ b/sysdeps/generic/adjtime.c
@@ -34,3 +34,4 @@ __adjtime (delta, olddelta)
 stub_warning (adjtime)
 
 weak_alias (__adjtime, adjtime)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/alarm.c b/sysdeps/generic/alarm.c
index 441327c04a..0f43029780 100644
--- a/sysdeps/stub/alarm.c
+++ b/sysdeps/generic/alarm.c
@@ -36,3 +36,4 @@ alarm (seconds)
 
 
 stub_warning (alarm)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/asm-syntax.h b/sysdeps/generic/asm-syntax.h
index a36150984f..a36150984f 100644
--- a/sysdeps/stub/asm-syntax.h
+++ b/sysdeps/generic/asm-syntax.h
diff --git a/sysdeps/stub/atomicity.h b/sysdeps/generic/atomicity.h
index 887ce73384..887ce73384 100644
--- a/sysdeps/stub/atomicity.h
+++ b/sysdeps/generic/atomicity.h
diff --git a/sysdeps/stub/bind.c b/sysdeps/generic/bind.c
index 7e7f0d70b7..1c787820d8 100644
--- a/sysdeps/stub/bind.c
+++ b/sysdeps/generic/bind.c
@@ -32,3 +32,4 @@ bind (fd, addr, len)
 
 
 stub_warning (bind)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/bits/dirent.h b/sysdeps/generic/bits/dirent.h
index 2f7dca78aa..2f7dca78aa 100644
--- a/sysdeps/stub/bits/dirent.h
+++ b/sysdeps/generic/bits/dirent.h
diff --git a/sysdeps/stub/bits/elfclass.h b/sysdeps/generic/bits/elfclass.h
index 1ad12954b2..1ad12954b2 100644
--- a/sysdeps/stub/bits/elfclass.h
+++ b/sysdeps/generic/bits/elfclass.h
diff --git a/sysdeps/stub/bits/endian.h b/sysdeps/generic/bits/endian.h
index 597f079a0f..597f079a0f 100644
--- a/sysdeps/stub/bits/endian.h
+++ b/sysdeps/generic/bits/endian.h
diff --git a/sysdeps/stub/bits/errno.h b/sysdeps/generic/bits/errno.h
index e197c3603d..e197c3603d 100644
--- a/sysdeps/stub/bits/errno.h
+++ b/sysdeps/generic/bits/errno.h
diff --git a/sysdeps/stub/bits/fcntl.h b/sysdeps/generic/bits/fcntl.h
index 24a1c38be6..24a1c38be6 100644
--- a/sysdeps/stub/bits/fcntl.h
+++ b/sysdeps/generic/bits/fcntl.h
diff --git a/sysdeps/stub/bits/fenv.h b/sysdeps/generic/bits/fenv.h
index f45deb07c1..f45deb07c1 100644
--- a/sysdeps/stub/bits/fenv.h
+++ b/sysdeps/generic/bits/fenv.h
diff --git a/sysdeps/stub/bits/huge_val.h b/sysdeps/generic/bits/huge_val.h
index 8f137d1734..8f137d1734 100644
--- a/sysdeps/stub/bits/huge_val.h
+++ b/sysdeps/generic/bits/huge_val.h
diff --git a/sysdeps/stub/bits/ioctls.h b/sysdeps/generic/bits/ioctls.h
index 3b6178bfae..3b6178bfae 100644
--- a/sysdeps/stub/bits/ioctls.h
+++ b/sysdeps/generic/bits/ioctls.h
diff --git a/sysdeps/stub/bits/ipc.h b/sysdeps/generic/bits/ipc.h
index a5ecbd90b7..a5ecbd90b7 100644
--- a/sysdeps/stub/bits/ipc.h
+++ b/sysdeps/generic/bits/ipc.h
diff --git a/sysdeps/stub/bits/libc-lock.h b/sysdeps/generic/bits/libc-lock.h
index c24dcd047a..c24dcd047a 100644
--- a/sysdeps/stub/bits/libc-lock.h
+++ b/sysdeps/generic/bits/libc-lock.h
diff --git a/sysdeps/stub/bits/local_lim.h b/sysdeps/generic/bits/local_lim.h
index 42cc7ebbc9..42cc7ebbc9 100644
--- a/sysdeps/stub/bits/local_lim.h
+++ b/sysdeps/generic/bits/local_lim.h
diff --git a/sysdeps/stub/bits/mathinline.h b/sysdeps/generic/bits/mathinline.h
index 5498af6b63..5498af6b63 100644
--- a/sysdeps/stub/bits/mathinline.h
+++ b/sysdeps/generic/bits/mathinline.h
diff --git a/sysdeps/stub/bits/msq.h b/sysdeps/generic/bits/msq.h
index 37daa9bf8c..37daa9bf8c 100644
--- a/sysdeps/stub/bits/msq.h
+++ b/sysdeps/generic/bits/msq.h
diff --git a/sysdeps/stub/bits/nan.h b/sysdeps/generic/bits/nan.h
index ab38168ea4..ab38168ea4 100644
--- a/sysdeps/stub/bits/nan.h
+++ b/sysdeps/generic/bits/nan.h
diff --git a/sysdeps/stub/bits/posix_opt.h b/sysdeps/generic/bits/posix_opt.h
index 54f5a79aa2..54f5a79aa2 100644
--- a/sysdeps/stub/bits/posix_opt.h
+++ b/sysdeps/generic/bits/posix_opt.h
diff --git a/sysdeps/stub/bits/sem.h b/sysdeps/generic/bits/sem.h
index 1d3e41bd56..1d3e41bd56 100644
--- a/sysdeps/stub/bits/sem.h
+++ b/sysdeps/generic/bits/sem.h
diff --git a/sysdeps/stub/bits/setjmp.h b/sysdeps/generic/bits/setjmp.h
index 6620e5ab15..6620e5ab15 100644
--- a/sysdeps/stub/bits/setjmp.h
+++ b/sysdeps/generic/bits/setjmp.h
diff --git a/sysdeps/stub/bits/shm.h b/sysdeps/generic/bits/shm.h
index b41d0c1e86..b41d0c1e86 100644
--- a/sysdeps/stub/bits/shm.h
+++ b/sysdeps/generic/bits/shm.h
diff --git a/sysdeps/stub/bits/sigcontext.h b/sysdeps/generic/bits/sigcontext.h
index 46e4df8c64..46e4df8c64 100644
--- a/sysdeps/stub/bits/sigcontext.h
+++ b/sysdeps/generic/bits/sigcontext.h
diff --git a/sysdeps/stub/bits/signum.h b/sysdeps/generic/bits/signum.h
index 6b4693f64c..6b4693f64c 100644
--- a/sysdeps/stub/bits/signum.h
+++ b/sysdeps/generic/bits/signum.h
diff --git a/sysdeps/stub/bits/stat.h b/sysdeps/generic/bits/stat.h
index dab0cd00cb..dab0cd00cb 100644
--- a/sysdeps/stub/bits/stat.h
+++ b/sysdeps/generic/bits/stat.h
diff --git a/sysdeps/stub/bits/stdio_lim.h b/sysdeps/generic/bits/stdio_lim.h
index ef873777c9..ef873777c9 100644
--- a/sysdeps/stub/bits/stdio_lim.h
+++ b/sysdeps/generic/bits/stdio_lim.h
diff --git a/sysdeps/stub/bits/string.h b/sysdeps/generic/bits/string.h
index ad68b038b6..ad68b038b6 100644
--- a/sysdeps/stub/bits/string.h
+++ b/sysdeps/generic/bits/string.h
diff --git a/sysdeps/stub/bits/time.h b/sysdeps/generic/bits/time.h
index e41a991b44..e41a991b44 100644
--- a/sysdeps/stub/bits/time.h
+++ b/sysdeps/generic/bits/time.h
diff --git a/sysdeps/stub/bits/waitflags.h b/sysdeps/generic/bits/waitflags.h
index 127eb6ce4c..127eb6ce4c 100644
--- a/sysdeps/stub/bits/waitflags.h
+++ b/sysdeps/generic/bits/waitflags.h
diff --git a/sysdeps/stub/brdinit.c b/sysdeps/generic/brdinit.c
index 35c10b4a0d..35c10b4a0d 100644
--- a/sysdeps/stub/brdinit.c
+++ b/sysdeps/generic/brdinit.c
diff --git a/sysdeps/stub/brk.c b/sysdeps/generic/brk.c
index 100c462498..4db14f7591 100644
--- a/sysdeps/stub/brk.c
+++ b/sysdeps/generic/brk.c
@@ -31,3 +31,4 @@ __brk (addr)
 stub_warning (brk)
 
 weak_alias (__brk, brk)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/bsd-_setjmp.c b/sysdeps/generic/bsd-_setjmp.c
index 97d665191a..97d665191a 100644
--- a/sysdeps/stub/bsd-_setjmp.c
+++ b/sysdeps/generic/bsd-_setjmp.c
diff --git a/sysdeps/stub/bsd-setjmp.c b/sysdeps/generic/bsd-setjmp.c
index d53263ba62..d53263ba62 100644
--- a/sysdeps/stub/bsd-setjmp.c
+++ b/sysdeps/generic/bsd-setjmp.c
diff --git a/sysdeps/stub/chdir.c b/sysdeps/generic/chdir.c
index 2ff9c7176d..963885bd5e 100644
--- a/sysdeps/stub/chdir.c
+++ b/sysdeps/generic/chdir.c
@@ -37,3 +37,4 @@ __chdir (path)
 stub_warning (chdir)
 
 weak_alias (__chdir, chdir)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/chflags.c b/sysdeps/generic/chflags.c
index 267dede2bb..bf2a283b20 100644
--- a/sysdeps/stub/chflags.c
+++ b/sysdeps/generic/chflags.c
@@ -40,3 +40,4 @@ chflags (file, flags)
 }
 
 stub_warning (chflags)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/chmod.c b/sysdeps/generic/chmod.c
index 5906a6fd1b..3e76c93903 100644
--- a/sysdeps/stub/chmod.c
+++ b/sysdeps/generic/chmod.c
@@ -39,3 +39,4 @@ __chmod (file, mode)
 stub_warning (chmod)
 
 weak_alias (__chmod, chmod)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/chown.c b/sysdeps/generic/chown.c
index f92e536f8d..62753e06d0 100644
--- a/sysdeps/stub/chown.c
+++ b/sysdeps/generic/chown.c
@@ -40,3 +40,4 @@ __chown (file, owner, group)
 stub_warning (chown)
 
 weak_alias (__chown, chown)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/chroot.c b/sysdeps/generic/chroot.c
index 9c8daae40a..1852c08938 100644
--- a/sysdeps/stub/chroot.c
+++ b/sysdeps/generic/chroot.c
@@ -31,3 +31,4 @@ chroot (path)
 
 
 stub_warning (chroot)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/clock.c b/sysdeps/generic/clock.c
index ae9e657ce6..ac0dc46e4f 100644
--- a/sysdeps/stub/clock.c
+++ b/sysdeps/generic/clock.c
@@ -29,3 +29,4 @@ clock ()
 }
 
 stub_warning (clock)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/close.c b/sysdeps/generic/close.c
index ed9620637b..4e78ca12fe 100644
--- a/sysdeps/stub/close.c
+++ b/sysdeps/generic/close.c
@@ -36,3 +36,4 @@ __close (fd)
 stub_warning (close)
 
 weak_alias (__close, close)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/closedir.c b/sysdeps/generic/closedir.c
index 2f0edca05d..77e9a69352 100644
--- a/sysdeps/stub/closedir.c
+++ b/sysdeps/generic/closedir.c
@@ -32,3 +32,4 @@ __closedir (DIR *dirp)
 weak_alias (__closedir, closedir)
 
 stub_warning (closedir)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/confstr.h b/sysdeps/generic/confstr.h
index 988ec88c0c..988ec88c0c 100644
--- a/sysdeps/stub/confstr.h
+++ b/sysdeps/generic/confstr.h
diff --git a/sysdeps/stub/connect.c b/sysdeps/generic/connect.c
index fb8b50341a..cbea96a61d 100644
--- a/sysdeps/stub/connect.c
+++ b/sysdeps/generic/connect.c
@@ -35,3 +35,4 @@ __connect (fd, addr, len)
 weak_alias (__connect, connect)
 
 stub_warning (connect)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/console.c b/sysdeps/generic/console.c
index d48455b40d..d48455b40d 100644
--- a/sysdeps/stub/console.c
+++ b/sysdeps/generic/console.c
diff --git a/sysdeps/stub/ctermid.c b/sysdeps/generic/ctermid.c
index c6e8e5fe09..589ccfee0e 100644
--- a/sysdeps/stub/ctermid.c
+++ b/sysdeps/generic/ctermid.c
@@ -33,3 +33,4 @@ ctermid (s)
 
 
 stub_warning (ctermid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/cuserid.c b/sysdeps/generic/cuserid.c
index 3ddce3dcfc..1d9d17c7b6 100644
--- a/sysdeps/stub/cuserid.c
+++ b/sysdeps/generic/cuserid.c
@@ -32,3 +32,4 @@ cuserid (s)
 
 
 stub_warning (cuserid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/dbl2mpn.c b/sysdeps/generic/dbl2mpn.c
index 6d012610d9..6d012610d9 100644
--- a/sysdeps/stub/dbl2mpn.c
+++ b/sysdeps/generic/dbl2mpn.c
diff --git a/sysdeps/stub/defs.c b/sysdeps/generic/defs.c
index 3d4abea476..3d4abea476 100644
--- a/sysdeps/stub/defs.c
+++ b/sysdeps/generic/defs.c
diff --git a/sysdeps/stub/des_impl.c b/sysdeps/generic/des_impl.c
index b6a4a8eb13..e0a3af9dd9 100644
--- a/sysdeps/stub/des_impl.c
+++ b/sysdeps/generic/des_impl.c
@@ -25,3 +25,4 @@ _des_crypt (char *buf, unsigned len, struct desparams *desp)
 }
 
 stub_warning (_des_crypt)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/dirfd.c b/sysdeps/generic/dirfd.c
index 767bc215f8..a3f07a63f9 100644
--- a/sysdeps/stub/dirfd.c
+++ b/sysdeps/generic/dirfd.c
@@ -30,3 +30,4 @@ dirfd (dirp)
 }
 
 stub_warning (dirfd)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/dirstream.h b/sysdeps/generic/dirstream.h
index cb1e784d38..cb1e784d38 100644
--- a/sysdeps/stub/dirstream.h
+++ b/sysdeps/generic/dirstream.h
diff --git a/sysdeps/stub/dl-machine.h b/sysdeps/generic/dl-machine.h
index f787df3500..f787df3500 100644
--- a/sysdeps/stub/dl-machine.h
+++ b/sysdeps/generic/dl-machine.h
diff --git a/sysdeps/stub/dup.c b/sysdeps/generic/dup.c
index 2f433c610a..95fe18bf01 100644
--- a/sysdeps/stub/dup.c
+++ b/sysdeps/generic/dup.c
@@ -31,3 +31,4 @@ __dup (fd)
 stub_warning (dup)
 
 weak_alias (__dup, dup)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/dup2.c b/sysdeps/generic/dup2.c
index 88f4fbf6be..ded80d3e00 100644
--- a/sysdeps/stub/dup2.c
+++ b/sysdeps/generic/dup2.c
@@ -44,3 +44,4 @@ __dup2 (fd, fd2)
 stub_warning (dup2)
 
 weak_alias (__dup2, dup2)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_acoshl.c b/sysdeps/generic/e_acoshl.c
index 3383c14872..2c7e8ca3cd 100644
--- a/sysdeps/stub/e_acoshl.c
+++ b/sysdeps/generic/e_acoshl.c
@@ -11,3 +11,4 @@ __ieee754_acoshl (long double x)
 }
 
 stub_warning (__ieee754_acoshl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_acosl.c b/sysdeps/generic/e_acosl.c
index af1e6261c3..f7ee70d592 100644
--- a/sysdeps/stub/e_acosl.c
+++ b/sysdeps/generic/e_acosl.c
@@ -11,3 +11,4 @@ __ieee754_acosl (long double x)
 }
 
 stub_warning (__ieee754_acosl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_asinl.c b/sysdeps/generic/e_asinl.c
index ce8c8cdaea..271a375fa2 100644
--- a/sysdeps/stub/e_asinl.c
+++ b/sysdeps/generic/e_asinl.c
@@ -11,3 +11,4 @@ __ieee754_asinl (long double x)
 }
 
 stub_warning (__ieee754_asinl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_atan2l.c b/sysdeps/generic/e_atan2l.c
index 6c500d4c8a..00d43d95c2 100644
--- a/sysdeps/stub/e_atan2l.c
+++ b/sysdeps/generic/e_atan2l.c
@@ -11,3 +11,4 @@ __ieee754_atan2l (long double x, long double y)
 }
 
 stub_warning (__ieee754_atan2l)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_expl.c b/sysdeps/generic/e_expl.c
index 4ea8c79597..9d6a4bd4bd 100644
--- a/sysdeps/stub/e_expl.c
+++ b/sysdeps/generic/e_expl.c
@@ -11,3 +11,4 @@ __ieee754_expl (long double x)
 }
 
 stub_warning (__ieee754_expl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_fmodl.c b/sysdeps/generic/e_fmodl.c
index 25cc114808..950ba085b5 100644
--- a/sysdeps/stub/e_fmodl.c
+++ b/sysdeps/generic/e_fmodl.c
@@ -11,3 +11,4 @@ __ieee754_fmodl (long double x, long double y)
 }
 
 stub_warning (__ieee754_fmodl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_j0l.c b/sysdeps/generic/e_j0l.c
index ecb8a8ed16..1e36bf76ad 100644
--- a/sysdeps/stub/e_j0l.c
+++ b/sysdeps/generic/e_j0l.c
@@ -21,3 +21,4 @@ __ieee754_y0l (long double x)
 }
 
 stub_warning (__ieee754_y0l)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_j1l.c b/sysdeps/generic/e_j1l.c
index 24655700e3..a1d30e2501 100644
--- a/sysdeps/stub/e_j1l.c
+++ b/sysdeps/generic/e_j1l.c
@@ -21,3 +21,4 @@ __ieee754_y1l (long double x)
 }
 
 stub_warning (__ieee754_y1l)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_jnl.c b/sysdeps/generic/e_jnl.c
index 8ced34d461..78915ec817 100644
--- a/sysdeps/stub/e_jnl.c
+++ b/sysdeps/generic/e_jnl.c
@@ -21,3 +21,4 @@ __ieee754_ynl (int n, long double x)
 }
 
 stub_warning (__ieee754_ynl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_lgammal_r.c b/sysdeps/generic/e_lgammal_r.c
index d7fbbca4df..bba92bb5e2 100644
--- a/sysdeps/stub/e_lgammal_r.c
+++ b/sysdeps/generic/e_lgammal_r.c
@@ -11,3 +11,4 @@ __ieee754_lgammal_r (long double x, int *signgamp)
 }
 
 stub_warning (__ieee754_lgammal_r)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_log10l.c b/sysdeps/generic/e_log10l.c
index a414d04d74..fef310308a 100644
--- a/sysdeps/stub/e_log10l.c
+++ b/sysdeps/generic/e_log10l.c
@@ -11,3 +11,4 @@ __ieee754_log10l (long double x)
 }
 
 stub_warning (__ieee754_log10l)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_logl.c b/sysdeps/generic/e_logl.c
index 45248a375a..3fe7a48459 100644
--- a/sysdeps/stub/e_logl.c
+++ b/sysdeps/generic/e_logl.c
@@ -11,3 +11,4 @@ __ieee754_logl (long double x)
 }
 
 stub_warning (__ieee754_logl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_powl.c b/sysdeps/generic/e_powl.c
index 611dfb583c..96ec53943e 100644
--- a/sysdeps/stub/e_powl.c
+++ b/sysdeps/generic/e_powl.c
@@ -11,3 +11,4 @@ __ieee754_powl (long double x, long double y)
 }
 
 stub_warning (__ieee754_powl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_rem_pio2l.c b/sysdeps/generic/e_rem_pio2l.c
index eec7d793bb..847f5f98c6 100644
--- a/sysdeps/stub/e_rem_pio2l.c
+++ b/sysdeps/generic/e_rem_pio2l.c
@@ -11,3 +11,4 @@ __ieee754_rem_pio2l (long double x, long double *y)
 }
 
 stub_warning (__ieee754_rem_pio2l)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/e_sqrtl.c b/sysdeps/generic/e_sqrtl.c
index c583a27673..d5380809ed 100644
--- a/sysdeps/stub/e_sqrtl.c
+++ b/sysdeps/generic/e_sqrtl.c
@@ -11,3 +11,4 @@ __ieee754_sqrtl (long double x)
 }
 
 stub_warning (__ieee754_sqrtl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/errlist.c b/sysdeps/generic/errlist.c
index 65c9437587..65c9437587 100644
--- a/sysdeps/stub/errlist.c
+++ b/sysdeps/generic/errlist.c
diff --git a/sysdeps/stub/euidaccess.c b/sysdeps/generic/euidaccess.c
index f11c74b8f7..825c152bea 100644
--- a/sysdeps/stub/euidaccess.c
+++ b/sysdeps/generic/euidaccess.c
@@ -37,3 +37,4 @@ __euidaccess (file, type)
 }
 weak_alias (__euidaccess, euidaccess)
 stub_warning (euidaccess)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/exc2signal.c b/sysdeps/generic/exc2signal.c
index c9b58cd172..c9b58cd172 100644
--- a/sysdeps/stub/exc2signal.c
+++ b/sysdeps/generic/exc2signal.c
diff --git a/sysdeps/stub/execve.c b/sysdeps/generic/execve.c
index c57fb92f7c..fa708c36b9 100644
--- a/sysdeps/stub/execve.c
+++ b/sysdeps/generic/execve.c
@@ -41,3 +41,4 @@ __execve (path, argv, envp)
 stub_warning (execve)
 
 weak_alias (__execve, execve)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fchdir.c b/sysdeps/generic/fchdir.c
index b18dcc7986..9a6a9dc3d8 100644
--- a/sysdeps/stub/fchdir.c
+++ b/sysdeps/generic/fchdir.c
@@ -30,3 +30,4 @@ fchdir (fd)
 }
 
 stub_warning (fchdir)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fchflags.c b/sysdeps/generic/fchflags.c
index 5a477e7d5d..befca38bd6 100644
--- a/sysdeps/stub/fchflags.c
+++ b/sysdeps/generic/fchflags.c
@@ -40,3 +40,4 @@ fchflags (fd, flags)
 }
 
 stub_warning (fchflags)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fchmod.c b/sysdeps/generic/fchmod.c
index eba768fce7..81b1e4247e 100644
--- a/sysdeps/stub/fchmod.c
+++ b/sysdeps/generic/fchmod.c
@@ -39,3 +39,4 @@ __fchmod (fd, mode)
 stub_warning (fchmod)
 
 weak_alias (__fchmod, fchmod)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fchown.c b/sysdeps/generic/fchown.c
index 60b16aab61..d504dd4c7c 100644
--- a/sysdeps/stub/fchown.c
+++ b/sysdeps/generic/fchown.c
@@ -40,3 +40,4 @@ __fchown (fd, owner, group)
 stub_warning (fchown)
 
 weak_alias (__fchown, fchown)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fclrexcpt.c b/sysdeps/generic/fclrexcpt.c
index 50373e06a5..c760e54a3e 100644
--- a/sysdeps/stub/fclrexcpt.c
+++ b/sysdeps/generic/fclrexcpt.c
@@ -25,3 +25,4 @@ feclearexcept (int excepts)
 {
 }
 stub_warning (feclearexcept)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fcntl.c b/sysdeps/generic/fcntl.c
index 2c63a2d2c0..718e326719 100644
--- a/sysdeps/stub/fcntl.c
+++ b/sysdeps/generic/fcntl.c
@@ -37,3 +37,4 @@ __fcntl (fd, cmd)
 stub_warning (fcntl)
 
 weak_alias (__fcntl, fcntl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fdopen.c b/sysdeps/generic/fdopen.c
index 9cb12ea510..c7d7f556fa 100644
--- a/sysdeps/stub/fdopen.c
+++ b/sysdeps/generic/fdopen.c
@@ -30,3 +30,4 @@ fdopen (fd, mode)
 }
 
 stub_warning (fdopen)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fegetenv.c b/sysdeps/generic/fegetenv.c
index 5d10d84abc..4afe17a004 100644
--- a/sysdeps/stub/fegetenv.c
+++ b/sysdeps/generic/fegetenv.c
@@ -25,3 +25,4 @@ fegetenv (fenv_t *envp)
 {
 }
 stub_warning (fegetenv)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fegetround.c b/sysdeps/generic/fegetround.c
index db673c83aa..60b259450b 100644
--- a/sysdeps/stub/fegetround.c
+++ b/sysdeps/generic/fegetround.c
@@ -26,3 +26,4 @@ fegetround (void)
   return 0;
 }
 stub_warning (fegetround)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/feholdexcpt.c b/sysdeps/generic/feholdexcpt.c
index c52dbcfa5d..5cc9b38a28 100644
--- a/sysdeps/stub/feholdexcpt.c
+++ b/sysdeps/generic/feholdexcpt.c
@@ -26,3 +26,4 @@ feholdexcept (fenv_t *envp)
   return 0;		/* Signal failure.  */
 }
 stub_warning (feholdexcept)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fesetenv.c b/sysdeps/generic/fesetenv.c
index 57cad7c093..91619494c5 100644
--- a/sysdeps/stub/fesetenv.c
+++ b/sysdeps/generic/fesetenv.c
@@ -25,3 +25,4 @@ fesetenv (const fenv_t *envp)
 {
 }
 stub_warning (fesetenv)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fesetround.c b/sysdeps/generic/fesetround.c
index ed1d20fa62..cd77a76fcf 100644
--- a/sysdeps/stub/fesetround.c
+++ b/sysdeps/generic/fesetround.c
@@ -26,3 +26,4 @@ fesetround (int round)
   return 0;	/* Signal we are unable to set the direction.  */
 }
 stub_warning (fesetround)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/feupdateenv.c b/sysdeps/generic/feupdateenv.c
index 2e9c8fdac0..cc6f59d4ce 100644
--- a/sysdeps/stub/feupdateenv.c
+++ b/sysdeps/generic/feupdateenv.c
@@ -25,3 +25,4 @@ feupdateenv (const fenv_t *envp)
 {
 }
 stub_warning (feupdateenv)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fexecve.c b/sysdeps/generic/fexecve.c
index eddbe24d99..f2ea896cac 100644
--- a/sysdeps/stub/fexecve.c
+++ b/sysdeps/generic/fexecve.c
@@ -40,3 +40,4 @@ fexecve (fd, argv, envp)
 }
 
 stub_warning (fexecve)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fgetexcptflg.c b/sysdeps/generic/fgetexcptflg.c
index 18beff4359..94f36f7f21 100644
--- a/sysdeps/stub/fgetexcptflg.c
+++ b/sysdeps/generic/fgetexcptflg.c
@@ -25,3 +25,4 @@ fegetexceptflag (fexcept_t *flagp, int excepts)
 {
 }
 stub_warning (fegetexceptflag)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/flock.c b/sysdeps/generic/flock.c
index e0701387d4..b096637d20 100644
--- a/sysdeps/stub/flock.c
+++ b/sysdeps/generic/flock.c
@@ -33,3 +33,4 @@ __flock (fd, operation)
 weak_alias (__flock, flock)
 
 stub_warning (flock)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fork.c b/sysdeps/generic/fork.c
index a7f4e5d825..06a3235472 100644
--- a/sysdeps/stub/fork.c
+++ b/sysdeps/generic/fork.c
@@ -32,3 +32,4 @@ __fork ()
 stub_warning (fork)
 
 weak_alias (__fork, fork)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fpathconf.c b/sysdeps/generic/fpathconf.c
index 705f7552ee..761e5c215c 100644
--- a/sysdeps/stub/fpathconf.c
+++ b/sysdeps/generic/fpathconf.c
@@ -59,3 +59,4 @@ __fpathconf (fd, name)
 weak_alias (__fpathconf, fpathconf)
 
 stub_warning (fpathconf)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fpu_control.h b/sysdeps/generic/fpu_control.h
index e91638d008..e91638d008 100644
--- a/sysdeps/stub/fpu_control.h
+++ b/sysdeps/generic/fpu_control.h
diff --git a/sysdeps/stub/fraiseexcpt.c b/sysdeps/generic/fraiseexcpt.c
index b03192c3d6..5f24782652 100644
--- a/sysdeps/stub/fraiseexcpt.c
+++ b/sysdeps/generic/fraiseexcpt.c
@@ -25,3 +25,4 @@ feraiseexcept (int excepts)
 {
 }
 stub_warning (feraiseexcept)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fsetexcptflg.c b/sysdeps/generic/fsetexcptflg.c
index e352244e6f..b3a6375851 100644
--- a/sysdeps/stub/fsetexcptflg.c
+++ b/sysdeps/generic/fsetexcptflg.c
@@ -25,3 +25,4 @@ fesetexceptflag (const fexcept_t *flagp, int excepts)
 {
 }
 stub_warning (fesetexceptflag)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fstatfs.c b/sysdeps/generic/fstatfs.c
index e7c40d8006..e716e18b49 100644
--- a/sysdeps/stub/fstatfs.c
+++ b/sysdeps/generic/fstatfs.c
@@ -31,3 +31,4 @@ __fstatfs (int fd, struct statfs *buf)
 stub_warning (fstatfs)
 
 weak_alias (__fstatfs, fstatfs)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fstatfs64.c b/sysdeps/generic/fstatfs64.c
index b2dba0f38b..99a2452558 100644
--- a/sysdeps/stub/fstatfs64.c
+++ b/sysdeps/generic/fstatfs64.c
@@ -29,3 +29,4 @@ fstatfs64 (int fd, struct statfs64 *buf)
   return -1;
 }
 stub_warning (fstatfs64)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fsync.c b/sysdeps/generic/fsync.c
index d268adc065..9177cf88b0 100644
--- a/sysdeps/stub/fsync.c
+++ b/sysdeps/generic/fsync.c
@@ -30,3 +30,4 @@ fsync (fd)
 
 
 stub_warning (fsync)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/ftestexcept.c b/sysdeps/generic/ftestexcept.c
index 7227c21a48..c964790011 100644
--- a/sysdeps/stub/ftestexcept.c
+++ b/sysdeps/generic/ftestexcept.c
@@ -26,3 +26,4 @@ fetestexcept (int excepts)
   return 0;
 }
 stub_warning (fetestexcept)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/ftruncate.c b/sysdeps/generic/ftruncate.c
index c84ed4ab1b..8e067ac2b8 100644
--- a/sysdeps/stub/ftruncate.c
+++ b/sysdeps/generic/ftruncate.c
@@ -31,3 +31,4 @@ ftruncate (fd, length)
 }
 
 stub_warning (ftruncate)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fxstat.c b/sysdeps/generic/fxstat.c
index 0110c5fda0..b070b86179 100644
--- a/sysdeps/stub/fxstat.c
+++ b/sysdeps/generic/fxstat.c
@@ -47,3 +47,4 @@ __fxstat (int vers, int fd, struct stat *buf)
 stub_warning (fstat)
 
 weak_alias (__fxstat, _fxstat)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/fxstat64.c b/sysdeps/generic/fxstat64.c
index 93ec312d3e..c8da8a4271 100644
--- a/sysdeps/stub/fxstat64.c
+++ b/sysdeps/generic/fxstat64.c
@@ -45,3 +45,4 @@ __fxstat64 (int vers, int fd, struct stat64 *buf)
   return -1;
 }
 stub_warning (fstat64)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/gai_strerror.c b/sysdeps/generic/gai_strerror.c
index b63f0e2623..b63f0e2623 100644
--- a/sysdeps/stub/gai_strerror.c
+++ b/sysdeps/generic/gai_strerror.c
diff --git a/sysdeps/stub/getaddrinfo.c b/sysdeps/generic/getaddrinfo.c
index 5b8bb0ea94..c099723b3e 100644
--- a/sysdeps/stub/getaddrinfo.c
+++ b/sysdeps/generic/getaddrinfo.c
@@ -36,3 +36,4 @@ freeaddrinfo (struct addrinfo *ai)
   /* Nothing.  */
 }
 stub_warning (freeaddrinfo)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getcwd.c b/sysdeps/generic/getcwd.c
index 1ba732e6ec..6df4a08054 100644
--- a/sysdeps/stub/getcwd.c
+++ b/sysdeps/generic/getcwd.c
@@ -37,3 +37,4 @@ weak_alias (__getcwd, getcwd)
 
 stub_warning (__getcwd)
 stub_warning (getcwd)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getdents.c b/sysdeps/generic/getdents.c
index 652eda2bc7..06a6c030ed 100644
--- a/sysdeps/stub/getdents.c
+++ b/sysdeps/generic/getdents.c
@@ -34,3 +34,4 @@ __getdirentries (fd, buf, nbytes, basep)
 weak_alias (__getdirentries, getdirentries)
 
 stub_warning (getdirentries)
+#include <stub-tag.h>
diff --git a/sysdeps/generic/getdomain.c b/sysdeps/generic/getdomain.c
index ab9cbd4bd0..250aec68e2 100644
--- a/sysdeps/generic/getdomain.c
+++ b/sysdeps/generic/getdomain.c
@@ -54,5 +54,6 @@ getdomainname (name, len)
 }
 
 stub_warning (getdomainname)
+#include <stub-tag.h>
 
 #endif
diff --git a/sysdeps/stub/getdtsz.c b/sysdeps/generic/getdtsz.c
index 41b342fb3e..a4eb78488f 100644
--- a/sysdeps/stub/getdtsz.c
+++ b/sysdeps/generic/getdtsz.c
@@ -30,3 +30,4 @@ __getdtablesize ()
 stub_warning (getdtablesize)
 
 weak_alias (__getdtablesize, getdtablesize)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getegid.c b/sysdeps/generic/getegid.c
index f817b4c845..2b9b9032fd 100644
--- a/sysdeps/stub/getegid.c
+++ b/sysdeps/generic/getegid.c
@@ -29,3 +29,4 @@ __getegid ()
 stub_warning (getegid)
 
 weak_alias (__getegid, getegid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/geteuid.c b/sysdeps/generic/geteuid.c
index 6858a942ba..0a89417012 100644
--- a/sysdeps/stub/geteuid.c
+++ b/sysdeps/generic/geteuid.c
@@ -30,3 +30,4 @@ __geteuid ()
 stub_warning (geteuid)
 
 weak_alias (__geteuid, geteuid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getgid.c b/sysdeps/generic/getgid.c
index 3d90c3a440..d87aea1f5c 100644
--- a/sysdeps/stub/getgid.c
+++ b/sysdeps/generic/getgid.c
@@ -30,3 +30,4 @@ __getgid ()
 stub_warning (getgid)
 
 weak_alias (__getgid, getgid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getgroups.c b/sysdeps/generic/getgroups.c
index 6054bc391f..ae11496a4c 100644
--- a/sysdeps/stub/getgroups.c
+++ b/sysdeps/generic/getgroups.c
@@ -45,3 +45,4 @@ stub_warning (getgroups);
 #endif
 
 weak_alias (__getgroups, getgroups)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/gethostid.c b/sysdeps/generic/gethostid.c
index 47db79fc6b..96bb3ea7a7 100644
--- a/sysdeps/stub/gethostid.c
+++ b/sysdeps/generic/gethostid.c
@@ -29,3 +29,4 @@ gethostid ()
 
 
 stub_warning (gethostid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/gethostname.c b/sysdeps/generic/gethostname.c
index 93afd350d0..ad09b00827 100644
--- a/sysdeps/stub/gethostname.c
+++ b/sysdeps/generic/gethostname.c
@@ -33,3 +33,4 @@ __gethostname (name, len)
 stub_warning (gethostname)
 
 weak_alias (__gethostname, gethostname)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getitimer.c b/sysdeps/generic/getitimer.c
index 2c852e7a5c..5f4f258c49 100644
--- a/sysdeps/stub/getitimer.c
+++ b/sysdeps/generic/getitimer.c
@@ -39,3 +39,4 @@ __getitimer (which, value)
 stub_warning (getitimer)
 
 weak_alias (__getitimer, getitimer)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getlogin.c b/sysdeps/generic/getlogin.c
index 34acbc38a9..248d040d9f 100644
--- a/sysdeps/stub/getlogin.c
+++ b/sysdeps/generic/getlogin.c
@@ -30,3 +30,4 @@ getlogin (void)
 }
 
 stub_warning (getlogin)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getlogin_r.c b/sysdeps/generic/getlogin_r.c
index 1b6145c12d..7d40c1a107 100644
--- a/sysdeps/stub/getlogin_r.c
+++ b/sysdeps/generic/getlogin_r.c
@@ -33,3 +33,4 @@ getlogin_r (name, name_len)
 }
 
 stub_warning (getlogin_r)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getpagesize.c b/sysdeps/generic/getpagesize.c
index 363151be21..2289b973d7 100644
--- a/sysdeps/stub/getpagesize.c
+++ b/sysdeps/generic/getpagesize.c
@@ -29,3 +29,4 @@ __getpagesize ()
 stub_warning (getpagesize)
 
 weak_alias (__getpagesize, getpagesize)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getpeername.c b/sysdeps/generic/getpeername.c
index 5d513aca1b..bd38cb4def 100644
--- a/sysdeps/stub/getpeername.c
+++ b/sysdeps/generic/getpeername.c
@@ -33,3 +33,4 @@ getpeername (fd, addr, len)
 
 
 stub_warning (getpeername)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getpgid.c b/sysdeps/generic/getpgid.c
index 5de37f3e1b..7423e118f0 100644
--- a/sysdeps/stub/getpgid.c
+++ b/sysdeps/generic/getpgid.c
@@ -29,3 +29,4 @@ __getpgid (pid)
 weak_alias (__getpgid, getpgid)
 
 stub_warning (getpgid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getpid.c b/sysdeps/generic/getpid.c
index e8baf26f2e..8b2fb9cde7 100644
--- a/sysdeps/stub/getpid.c
+++ b/sysdeps/generic/getpid.c
@@ -30,3 +30,4 @@ __getpid ()
 stub_warning (getpid)
 
 weak_alias (__getpid, getpid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getppid.c b/sysdeps/generic/getppid.c
index e9e4fff68a..f05b6caf2c 100644
--- a/sysdeps/stub/getppid.c
+++ b/sysdeps/generic/getppid.c
@@ -30,3 +30,4 @@ __getppid ()
 stub_warning (getppid)
 
 weak_alias (__getppid, getppid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getpriority.c b/sysdeps/generic/getpriority.c
index a2dd7cb907..ce9eb59f0d 100644
--- a/sysdeps/stub/getpriority.c
+++ b/sysdeps/generic/getpriority.c
@@ -33,3 +33,4 @@ getpriority (which, who)
 }
 
 stub_warning (getpriority)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getrlimit.c b/sysdeps/generic/getrlimit.c
index 06f3eb94a4..c283f77038 100644
--- a/sysdeps/stub/getrlimit.c
+++ b/sysdeps/generic/getrlimit.c
@@ -30,3 +30,4 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
 weak_alias (__getrlimit, getrlimit)
 
 stub_warning (getrlimit)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getrlimit64.c b/sysdeps/generic/getrlimit64.c
index 6f12cad84b..6c581edf72 100644
--- a/sysdeps/stub/getrlimit64.c
+++ b/sysdeps/generic/getrlimit64.c
@@ -29,3 +29,4 @@ getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
 }
 
 stub_warning (getrlimit64)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getrusage.c b/sysdeps/generic/getrusage.c
index 1db5d08b86..a6f0e67826 100644
--- a/sysdeps/stub/getrusage.c
+++ b/sysdeps/generic/getrusage.c
@@ -32,3 +32,4 @@ __getrusage (who, usage)
 stub_warning (getrusage)
 
 weak_alias (__getrusage, getrusage)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getsid.c b/sysdeps/generic/getsid.c
index 5c65311ce0..11efbf67a8 100644
--- a/sysdeps/stub/getsid.c
+++ b/sysdeps/generic/getsid.c
@@ -28,3 +28,4 @@ getsid (pid_t pid)
   return (pid_t) -1;
 }
 stub_warning (getsid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getsockname.c b/sysdeps/generic/getsockname.c
index f0d46dbc3c..37095ff2b5 100644
--- a/sysdeps/stub/getsockname.c
+++ b/sysdeps/generic/getsockname.c
@@ -32,3 +32,4 @@ getsockname (fd, addr, len)
 
 
 stub_warning (getsockname)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getsockopt.c b/sysdeps/generic/getsockopt.c
index 6f3c866b46..0b151bd9ec 100644
--- a/sysdeps/stub/getsockopt.c
+++ b/sysdeps/generic/getsockopt.c
@@ -35,3 +35,4 @@ getsockopt (fd, level, optname, optval, optlen)
 }
 
 stub_warning (getsockopt)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getsysstats.c b/sysdeps/generic/getsysstats.c
index 0b5dfabf1d..d43a86ae5a 100644
--- a/sysdeps/stub/getsysstats.c
+++ b/sysdeps/generic/getsysstats.c
@@ -66,3 +66,4 @@ __get_avphys_pages ()
 weak_alias (__get_avphys_pages, get_avphys_pages)
 
 stub_warning (get_avphys_pages)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/gettimeofday.c b/sysdeps/generic/gettimeofday.c
index de26242eb2..ff7689d374 100644
--- a/sysdeps/stub/gettimeofday.c
+++ b/sysdeps/generic/gettimeofday.c
@@ -33,3 +33,4 @@ __gettimeofday (tv, tz)
 stub_warning (gettimeofday)
 
 weak_alias (__gettimeofday, gettimeofday)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/getuid.c b/sysdeps/generic/getuid.c
index 2afb9678b7..37afc6f6fc 100644
--- a/sysdeps/stub/getuid.c
+++ b/sysdeps/generic/getuid.c
@@ -30,3 +30,4 @@ __getuid ()
 stub_warning (getuid)
 
 weak_alias (__getuid, getuid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/gtty.c b/sysdeps/generic/gtty.c
index 8d89c132ca..3505b9f7bf 100644
--- a/sysdeps/stub/gtty.c
+++ b/sysdeps/generic/gtty.c
@@ -37,3 +37,4 @@ gtty (fd, params)
 }
 
 stub_warning (gtty)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/if_index.c b/sysdeps/generic/if_index.c
index ca859f75fc..c7022d8b07 100644
--- a/sysdeps/stub/if_index.c
+++ b/sysdeps/generic/if_index.c
@@ -49,3 +49,4 @@ if_nameindex (void)
   return NULL;
 }
 stub_warning (if_nameindex)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/init-first.c b/sysdeps/generic/init-first.c
index dacefdcb63..dacefdcb63 100644
--- a/sysdeps/stub/init-first.c
+++ b/sysdeps/generic/init-first.c
diff --git a/sysdeps/stub/init-posix.c b/sysdeps/generic/init-posix.c
index 8e37bb6861..8e37bb6861 100644
--- a/sysdeps/stub/init-posix.c
+++ b/sysdeps/generic/init-posix.c
diff --git a/sysdeps/stub/intr-msg.h b/sysdeps/generic/intr-msg.h
index 0186aa3323..0186aa3323 100644
--- a/sysdeps/stub/intr-msg.h
+++ b/sysdeps/generic/intr-msg.h
diff --git a/sysdeps/stub/ioctl.c b/sysdeps/generic/ioctl.c
index c7e0d31b4f..019fb0e0cd 100644
--- a/sysdeps/stub/ioctl.c
+++ b/sysdeps/generic/ioctl.c
@@ -32,3 +32,4 @@ __ioctl (fd, request)
 stub_warning (ioctl)
 
 weak_alias (__ioctl, ioctl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/isatty.c b/sysdeps/generic/isatty.c
index f5332f1f89..824d09b3cc 100644
--- a/sysdeps/stub/isatty.c
+++ b/sysdeps/generic/isatty.c
@@ -31,3 +31,4 @@ __isatty (fd)
 weak_alias (__isatty, isatty)
 
 stub_warning (isatty)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/isfdtype.c b/sysdeps/generic/isfdtype.c
index 395a931f5e..0d22a93477 100644
--- a/sysdeps/stub/isfdtype.c
+++ b/sysdeps/generic/isfdtype.c
@@ -28,3 +28,4 @@ isfdtype (int fildes, int fdtype)
   return -1;
 }
 stub_warning (isfdtype)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/jmp-unwind.c b/sysdeps/generic/jmp-unwind.c
index 083dc74a83..083dc74a83 100644
--- a/sysdeps/stub/jmp-unwind.c
+++ b/sysdeps/generic/jmp-unwind.c
diff --git a/sysdeps/stub/k_cosl.c b/sysdeps/generic/k_cosl.c
index 10016ab72e..61af3372a1 100644
--- a/sysdeps/stub/k_cosl.c
+++ b/sysdeps/generic/k_cosl.c
@@ -11,3 +11,4 @@ __kernel_cosl (long double x, long double y)
 }
 
 stub_warning (__kernel_cosl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/k_rem_pio2l.c b/sysdeps/generic/k_rem_pio2l.c
index 01bf158249..236eb30dd9 100644
--- a/sysdeps/stub/k_rem_pio2l.c
+++ b/sysdeps/generic/k_rem_pio2l.c
@@ -13,3 +13,4 @@ __kernel_rem_pio2l (long double *x, long double *y, int e0, int nx, int prec,
 }
 
 stub_warning (__kernel_rem_pio2l)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/k_sinl.c b/sysdeps/generic/k_sinl.c
index 40cf22a596..07dddcecb2 100644
--- a/sysdeps/stub/k_sinl.c
+++ b/sysdeps/generic/k_sinl.c
@@ -11,3 +11,4 @@ __kernel_sinl (long double x, long double y)
 }
 
 stub_warning (__kernel_sinl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/k_tanl.c b/sysdeps/generic/k_tanl.c
index 95ffc23bd9..1504a1cd90 100644
--- a/sysdeps/stub/k_tanl.c
+++ b/sysdeps/generic/k_tanl.c
@@ -11,3 +11,4 @@ __kernel_tanl (long double x, long double y, int iy)
 }
 
 stub_warning (__kernel_tanl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/kill.c b/sysdeps/generic/kill.c
index 9993d195e2..0d035d4bb6 100644
--- a/sysdeps/stub/kill.c
+++ b/sysdeps/generic/kill.c
@@ -34,3 +34,4 @@ __kill (pid, sig)
 stub_warning (kill)
 
 weak_alias (__kill, kill)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/killpg.c b/sysdeps/generic/killpg.c
index 91a62eed47..b9c8b8c26e 100644
--- a/sysdeps/stub/killpg.c
+++ b/sysdeps/generic/killpg.c
@@ -33,3 +33,4 @@ killpg (pgrp, sig)
 }
 
 stub_warning (killpg)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/lchown.c b/sysdeps/generic/lchown.c
index f3aa2a1425..e428798c30 100644
--- a/sysdeps/stub/lchown.c
+++ b/sysdeps/generic/lchown.c
@@ -40,3 +40,4 @@ __lchown (file, owner, group)
 stub_warning (lchown)
 
 weak_alias (__lchown, lchown)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/ldbl2mpn.c b/sysdeps/generic/ldbl2mpn.c
index e456d59e1d..e456d59e1d 100644
--- a/sysdeps/stub/ldbl2mpn.c
+++ b/sysdeps/generic/ldbl2mpn.c
diff --git a/sysdeps/stub/libc_fatal.c b/sysdeps/generic/libc_fatal.c
index a5489ed39f..a5489ed39f 100644
--- a/sysdeps/stub/libc_fatal.c
+++ b/sysdeps/generic/libc_fatal.c
diff --git a/sysdeps/stub/link.c b/sysdeps/generic/link.c
index 213dcdfadc..6d55a749b3 100644
--- a/sysdeps/stub/link.c
+++ b/sysdeps/generic/link.c
@@ -39,3 +39,4 @@ __link (from, to)
 stub_warning (link)
 
 weak_alias (__link, link)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/listen.c b/sysdeps/generic/listen.c
index 85fa895596..3d557136cf 100644
--- a/sysdeps/stub/listen.c
+++ b/sysdeps/generic/listen.c
@@ -33,3 +33,4 @@ listen (fd, n)
 
 
 stub_warning (listen)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/lockfile.c b/sysdeps/generic/lockfile.c
index 143e9901dc..143e9901dc 100644
--- a/sysdeps/stub/lockfile.c
+++ b/sysdeps/generic/lockfile.c
diff --git a/sysdeps/stub/longjmp-ts.c b/sysdeps/generic/longjmp-ts.c
index 201be7e867..201be7e867 100644
--- a/sysdeps/stub/longjmp-ts.c
+++ b/sysdeps/generic/longjmp-ts.c
diff --git a/sysdeps/stub/lseek.c b/sysdeps/generic/lseek.c
index 7d9e0964f8..879b05a1c4 100644
--- a/sysdeps/stub/lseek.c
+++ b/sysdeps/generic/lseek.c
@@ -49,3 +49,4 @@ __lseek (fd, offset, whence)
 stub_warning (lseek)
 
 weak_alias (__lseek, lseek)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/lseek64.c b/sysdeps/generic/lseek64.c
index 71d58ba1a6..a2ffe2e0bd 100644
--- a/sysdeps/stub/lseek64.c
+++ b/sysdeps/generic/lseek64.c
@@ -47,3 +47,4 @@ lseek64 (fd, offset, whence)
   return -1;
 }
 stub_warning (lseek64)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/lxstat64.c b/sysdeps/generic/lxstat64.c
index 78e0b82bde..7916fdca05 100644
--- a/sysdeps/stub/lxstat64.c
+++ b/sysdeps/generic/lxstat64.c
@@ -35,3 +35,4 @@ __lxstat64 (int vers, const char *file, struct stat64 *buf)
   return -1;
 }
 stub_warning (lstat64)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/machine-lock.h b/sysdeps/generic/machine-lock.h
index 3776bb0049..3776bb0049 100644
--- a/sysdeps/stub/machine-lock.h
+++ b/sysdeps/generic/machine-lock.h
diff --git a/sysdeps/stub/machine-sp.h b/sysdeps/generic/machine-sp.h
index 6d8ad485e2..6d8ad485e2 100644
--- a/sysdeps/stub/machine-sp.h
+++ b/sysdeps/generic/machine-sp.h
diff --git a/sysdeps/stub/madvise.c b/sysdeps/generic/madvise.c
index 244be3f3b9..5431bda111 100644
--- a/sysdeps/stub/madvise.c
+++ b/sysdeps/generic/madvise.c
@@ -24,10 +24,11 @@
    for the region starting at ADDR and extending LEN bytes.  */
 
 int
-madvise (caddr_t addr, size_t len, int advice)
+madvise (__ptr_t addr, size_t len, int advice)
 {
   __set_errno (ENOSYS);
   return -1;
 }
 
 stub_warning (madvise)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/mkdir.c b/sysdeps/generic/mkdir.c
index 9a6cac52db..fe6c719427 100644
--- a/sysdeps/stub/mkdir.c
+++ b/sysdeps/generic/mkdir.c
@@ -40,3 +40,4 @@ __mkdir (path, mode)
 stub_warning (mkdir)
 
 weak_alias (__mkdir, mkdir)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/mkfifo.c b/sysdeps/generic/mkfifo.c
index 5404b3b3ce..9163680bc9 100644
--- a/sysdeps/stub/mkfifo.c
+++ b/sysdeps/generic/mkfifo.c
@@ -40,3 +40,4 @@ mkfifo (path, mode)
 
 
 stub_warning (mkfifo)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/mkstemp.c b/sysdeps/generic/mkstemp.c
index ec78145ead..c84e8eb4c2 100644
--- a/sysdeps/stub/mkstemp.c
+++ b/sysdeps/generic/mkstemp.c
@@ -39,3 +39,4 @@ mkstemp (template)
 }
 
 stub_warning (mkstemp)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/mktemp.c b/sysdeps/generic/mktemp.c
index 7780140a7a..7d53f01c04 100644
--- a/sysdeps/stub/mktemp.c
+++ b/sysdeps/generic/mktemp.c
@@ -38,3 +38,4 @@ mktemp (template)
 }
 
 stub_warning (mktemp)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/mmap.c b/sysdeps/generic/mmap.c
index 02fb8d780d..fc43c0b09d 100644
--- a/sysdeps/stub/mmap.c
+++ b/sysdeps/generic/mmap.c
@@ -25,16 +25,17 @@
    is nonzero, it is the desired mapping address.  If the MAP_FIXED bit is
    set in FLAGS, the mapping will be at ADDR exactly (which must be
    page-aligned); otherwise the system chooses a convenient nearby address.
-   The return value is the actual mapping address chosen or (caddr_t) -1
+   The return value is the actual mapping address chosen or MAP_FAILED
    for errors (in which case `errno' is set).  A successful `mmap' call
    deallocates any previous mapping for the affected region.  */
 
-caddr_t
-__mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
+__ptr_t
+__mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
   __set_errno (ENOSYS);
-  return (caddr_t) -1;
+  return MAP_FAILED;
 }
 
 stub_warning (mmap)
+#include <stub-tag.h>
 weak_alias (__mmap, mmap)
diff --git a/sysdeps/stub/mpn2dbl.c b/sysdeps/generic/mpn2dbl.c
index 37ceab6fd6..37ceab6fd6 100644
--- a/sysdeps/stub/mpn2dbl.c
+++ b/sysdeps/generic/mpn2dbl.c
diff --git a/sysdeps/stub/mpn2flt.c b/sysdeps/generic/mpn2flt.c
index 53731bcf97..53731bcf97 100644
--- a/sysdeps/stub/mpn2flt.c
+++ b/sysdeps/generic/mpn2flt.c
diff --git a/sysdeps/stub/mpn2ldbl.c b/sysdeps/generic/mpn2ldbl.c
index c269ce689b..c269ce689b 100644
--- a/sysdeps/stub/mpn2ldbl.c
+++ b/sysdeps/generic/mpn2ldbl.c
diff --git a/sysdeps/stub/mprotect.c b/sysdeps/generic/mprotect.c
index 262fa850d4..d9252fe903 100644
--- a/sysdeps/stub/mprotect.c
+++ b/sysdeps/generic/mprotect.c
@@ -25,7 +25,7 @@
    (and sets errno).  */
 
 int
-__mprotect (caddr_t addr, size_t len, int prot)
+__mprotect (__ptr_t addr, size_t len, int prot)
 {
   __set_errno (ENOSYS);
   return -1;
@@ -33,3 +33,4 @@ __mprotect (caddr_t addr, size_t len, int prot)
 weak_alias (__mprotect, mprotect)
 
 stub_warning (mprotect)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/msgctl.c b/sysdeps/generic/msgctl.c
index 889a1efdcb..8a973397f4 100644
--- a/sysdeps/stub/msgctl.c
+++ b/sysdeps/generic/msgctl.c
@@ -34,3 +34,4 @@ msgctl (msqid, cmd, buf)
 }
 
 stub_warning (msgctl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/msgget.c b/sysdeps/generic/msgget.c
index 17f649e89d..c00804d37d 100644
--- a/sysdeps/stub/msgget.c
+++ b/sysdeps/generic/msgget.c
@@ -33,3 +33,4 @@ msgget (key, msgflg)
 }
 
 stub_warning (msgget)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/msgrcv.c b/sysdeps/generic/msgrcv.c
index 201c2cf4d5..e233b6d041 100644
--- a/sysdeps/stub/msgrcv.c
+++ b/sysdeps/generic/msgrcv.c
@@ -39,3 +39,4 @@ msgrcv (msqid, msgp, msgsz, msgtyp, msgflg)
 }
 
 stub_warning (msgrcv)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/msgsnd.c b/sysdeps/generic/msgsnd.c
index c7fffd7950..993895290b 100644
--- a/sysdeps/stub/msgsnd.c
+++ b/sysdeps/generic/msgsnd.c
@@ -38,3 +38,4 @@ msgsnd (msqid, msgp, msgsz, msgflg)
 }
 
 stub_warning (msgsnd)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/msync.c b/sysdeps/generic/msync.c
index c8cbe430a5..d1cb2d7c6d 100644
--- a/sysdeps/stub/msync.c
+++ b/sysdeps/generic/msync.c
@@ -25,10 +25,11 @@
    unpredictable before this is done.  */
 
 int
-msync (caddr_t addr, size_t len, int flags)
+msync (__ptr_t addr, size_t len, int flags)
 {
   __set_errno (ENOSYS);
   return -1;
 }
 
 stub_warning (msync)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/munmap.c b/sysdeps/generic/munmap.c
index 4802a58f7f..9c2217bb6d 100644
--- a/sysdeps/stub/munmap.c
+++ b/sysdeps/generic/munmap.c
@@ -24,11 +24,12 @@
    bytes.  Returns 0 if successful, -1 for errors (and sets errno).  */
 
 int
-__munmap (caddr_t addr, size_t len)
+__munmap (__ptr_t addr, size_t len)
 {
   __set_errno (ENOSYS);
   return -1;
 }
 
 stub_warning (munmap)
+#include <stub-tag.h>
 weak_alias (__munmap, munmap)
diff --git a/sysdeps/stub/nanosleep.c b/sysdeps/generic/nanosleep.c
index 0fcbb0d402..1f9704e2d9 100644
--- a/sysdeps/stub/nanosleep.c
+++ b/sysdeps/generic/nanosleep.c
@@ -32,3 +32,4 @@ stub_warning (nanosleep)
 
 weak_alias (__libc_nanosleep, __nanosleep)
 weak_alias (__libc_nanosleep, nanosleep)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/nice.c b/sysdeps/generic/nice.c
index 1e2e6a2a10..f58b8c4f52 100644
--- a/sysdeps/stub/nice.c
+++ b/sysdeps/generic/nice.c
@@ -30,3 +30,4 @@ nice (incr)
 }
 
 stub_warning (nice)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/nlist.c b/sysdeps/generic/nlist.c
index 006c902454..5d7a08e24c 100644
--- a/sysdeps/stub/nlist.c
+++ b/sysdeps/generic/nlist.c
@@ -40,3 +40,4 @@ nlist (file, nl)
 
 
 stub_warning (nlist)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/open.c b/sysdeps/generic/open.c
index 6b3800896b..cd7b0e051c 100644
--- a/sysdeps/stub/open.c
+++ b/sysdeps/generic/open.c
@@ -50,3 +50,4 @@ __open (file, oflag)
 stub_warning (open)
 
 weak_alias (__open, open)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/open64.c b/sysdeps/generic/open64.c
index c020d887bd..16e19730f4 100644
--- a/sysdeps/stub/open64.c
+++ b/sysdeps/generic/open64.c
@@ -50,3 +50,4 @@ __open64 (file, oflag)
 weak_alias (__open64, open64)
 
 stub_warning (open64)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/opendir.c b/sysdeps/generic/opendir.c
index fd8ad5029c..6b7f14e9f8 100644
--- a/sysdeps/stub/opendir.c
+++ b/sysdeps/generic/opendir.c
@@ -31,3 +31,4 @@ __opendir (const char *name)
 weak_alias (__opendir, opendir)
 
 stub_warning (opendir)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/pathconf.c b/sysdeps/generic/pathconf.c
index 4b0c94946d..b3c2c88a4b 100644
--- a/sysdeps/stub/pathconf.c
+++ b/sysdeps/generic/pathconf.c
@@ -38,3 +38,4 @@ __pathconf (path, name)
 weak_alias (__pathconf, pathconf)
 
 stub_warning (pathconf)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/pause.c b/sysdeps/generic/pause.c
index 22664e6c3b..18742e8101 100644
--- a/sysdeps/stub/pause.c
+++ b/sysdeps/generic/pause.c
@@ -31,3 +31,4 @@ pause ()
 }
 
 stub_warning (pause)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/pipe.c b/sysdeps/generic/pipe.c
index b566a19560..26cf5230d4 100644
--- a/sysdeps/stub/pipe.c
+++ b/sysdeps/generic/pipe.c
@@ -40,3 +40,4 @@ __pipe (__pipedes)
 stub_warning (pipe)
 
 weak_alias (__pipe, pipe)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/pipestream.c b/sysdeps/generic/pipestream.c
index c8ab70e916..eead474f74 100644
--- a/sysdeps/stub/pipestream.c
+++ b/sysdeps/generic/pipestream.c
@@ -57,3 +57,4 @@ pclose (stream)
 
 stub_warning (popen)
 stub_warning (pclose)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/poll.c b/sysdeps/generic/poll.c
index 509ebf8a24..f3d678e40d 100644
--- a/sysdeps/stub/poll.c
+++ b/sysdeps/generic/poll.c
@@ -36,3 +36,4 @@ poll (fds, nfds, timeout)
 }
 
 stub_warning (poll)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/pread.c b/sysdeps/generic/pread.c
index 8d937c76c5..5fdaf7b4af 100644
--- a/sysdeps/stub/pread.c
+++ b/sysdeps/generic/pread.c
@@ -41,3 +41,4 @@ pread (int fd, void *buf, size_t nbytes, off_t offset)
   return -1;
 }
 stub_warning (pread)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/pread64.c b/sysdeps/generic/pread64.c
index 4223646576..fdf622250b 100644
--- a/sysdeps/stub/pread64.c
+++ b/sysdeps/generic/pread64.c
@@ -41,3 +41,4 @@ pread64 (int fd, void *buf, size_t nbytes, off64_t offset)
   return -1;
 }
 stub_warning (pread64)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/profil.c b/sysdeps/generic/profil.c
index 9613108e3a..b70e20afd7 100644
--- a/sysdeps/stub/profil.c
+++ b/sysdeps/generic/profil.c
@@ -39,3 +39,4 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
 }
 weak_alias (__profil, profil)
 stub_warning (profil)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/ptrace.c b/sysdeps/generic/ptrace.c
index 2a0ba4c858..5ab62bccef 100644
--- a/sysdeps/stub/ptrace.c
+++ b/sysdeps/generic/ptrace.c
@@ -100,3 +100,4 @@ ptrace (request)
 
 
 stub_warning (ptrace)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/pwrite.c b/sysdeps/generic/pwrite.c
index ee670d9670..48a1dc6089 100644
--- a/sysdeps/stub/pwrite.c
+++ b/sysdeps/generic/pwrite.c
@@ -41,3 +41,4 @@ pwrite (int fd, const void *buf, size_t nbytes, off_t offset)
   return -1;
 }
 stub_warning (pwrite)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/pwrite64.c b/sysdeps/generic/pwrite64.c
index c8c77a1880..df229f877f 100644
--- a/sysdeps/stub/pwrite64.c
+++ b/sysdeps/generic/pwrite64.c
@@ -41,3 +41,4 @@ pwrite64 (int fd, const void *buf, size_t nbytes, off64_t offset)
   return -1;
 }
 stub_warning (pwrite64)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/raise.c b/sysdeps/generic/raise.c
index 97fd5fe931..9b698fd984 100644
--- a/sysdeps/stub/raise.c
+++ b/sysdeps/generic/raise.c
@@ -32,3 +32,4 @@ weak_alias (raise, gsignal)
 
 stub_warning (raise)
 stub_warning (gsignal)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/read.c b/sysdeps/generic/read.c
index b231a18ca1..57015150fa 100644
--- a/sysdeps/stub/read.c
+++ b/sysdeps/generic/read.c
@@ -44,3 +44,4 @@ stub_warning (read)
 
 weak_alias (__libc_read, __read)
 weak_alias (__libc_read, read)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/readdir.c b/sysdeps/generic/readdir.c
index 0f003c6c4c..94e837f2d3 100644
--- a/sysdeps/stub/readdir.c
+++ b/sysdeps/generic/readdir.c
@@ -30,3 +30,4 @@ __readdir (DIR *dirp)
 weak_alias (__readdir, readdir)
 
 stub_warning (readdir)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/readdir64.c b/sysdeps/generic/readdir64.c
index fbf4bf4d54..ce84340c8e 100644
--- a/sysdeps/stub/readdir64.c
+++ b/sysdeps/generic/readdir64.c
@@ -28,3 +28,4 @@ readdir64 (DIR *dirp)
   return NULL;
 }
 stub_warning (readdir64)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/readdir64_r.c b/sysdeps/generic/readdir64_r.c
index cb143cb40c..787bdcee9f 100644
--- a/sysdeps/stub/readdir64_r.c
+++ b/sysdeps/generic/readdir64_r.c
@@ -30,3 +30,4 @@ readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result)
   return -1;
 }
 stub_warning (readdir64_r)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/readdir_r.c b/sysdeps/generic/readdir_r.c
index 422e5a0566..ae14d18160 100644
--- a/sysdeps/stub/readdir_r.c
+++ b/sysdeps/generic/readdir_r.c
@@ -32,3 +32,4 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
 weak_alias (__readdir_r, readdir_r)
 
 stub_warning (readdir_r)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/readlink.c b/sysdeps/generic/readlink.c
index 2319f84dff..90d9beba60 100644
--- a/sysdeps/stub/readlink.c
+++ b/sysdeps/generic/readlink.c
@@ -34,3 +34,4 @@ __readlink (path, buf, len)
 stub_warning (readlink)
 
 weak_alias (__readlink, readlink)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/readv.c b/sysdeps/generic/readv.c
index 8dd22d9649..b210d53552 100644
--- a/sysdeps/stub/readv.c
+++ b/sysdeps/generic/readv.c
@@ -37,3 +37,4 @@ __readv (fd, vector, count)
 weak_alias (__readv, readv)
 
 stub_warning (readv)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/reboot.c b/sysdeps/generic/reboot.c
index 8139aee83f..c1bce46738 100644
--- a/sysdeps/stub/reboot.c
+++ b/sysdeps/generic/reboot.c
@@ -31,3 +31,4 @@ reboot (howto)
 
 
 stub_warning (reboot)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/recv.c b/sysdeps/generic/recv.c
index 3a9fdce3ec..e59e341b21 100644
--- a/sysdeps/stub/recv.c
+++ b/sysdeps/generic/recv.c
@@ -34,3 +34,4 @@ recv (fd, buf, n, flags)
 
 
 stub_warning (recv)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/recvfrom.c b/sysdeps/generic/recvfrom.c
index 931bdbb1b5..35b281a2a1 100644
--- a/sysdeps/stub/recvfrom.c
+++ b/sysdeps/generic/recvfrom.c
@@ -36,3 +36,4 @@ recvfrom (fd, buf, n, flags, addr, addr_len)
 }
 
 stub_warning (recvfrom)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/recvmsg.c b/sysdeps/generic/recvmsg.c
index 6e2ca69f8a..625e85aae9 100644
--- a/sysdeps/stub/recvmsg.c
+++ b/sysdeps/generic/recvmsg.c
@@ -32,3 +32,4 @@ recvmsg (fd, message, flags)
 }
 
 stub_warning (recvmsg)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/remove.c b/sysdeps/generic/remove.c
index df2d3ad33f..ae9251d7f6 100644
--- a/sysdeps/stub/remove.c
+++ b/sysdeps/generic/remove.c
@@ -29,3 +29,4 @@ remove (file)
 }
 
 stub_warning (remove)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/rename.c b/sysdeps/generic/rename.c
index 29e14401c2..887a046122 100644
--- a/sysdeps/stub/rename.c
+++ b/sysdeps/generic/rename.c
@@ -38,3 +38,4 @@ rename (old, new)
 
 
 stub_warning (rename)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/revoke.c b/sysdeps/generic/revoke.c
index cca051409b..5c7a608089 100644
--- a/sysdeps/stub/revoke.c
+++ b/sysdeps/generic/revoke.c
@@ -28,3 +28,4 @@ revoke (file)
   return -1;
 }
 stub_warning (revoke)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/rewinddir.c b/sysdeps/generic/rewinddir.c
index 4aa5a31569..bea002135c 100644
--- a/sysdeps/stub/rewinddir.c
+++ b/sysdeps/generic/rewinddir.c
@@ -32,3 +32,4 @@ rewinddir (dirp)
 
 
 stub_warning (rewinddir)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/rmdir.c b/sysdeps/generic/rmdir.c
index 8b705adaad..0ea404f860 100644
--- a/sysdeps/stub/rmdir.c
+++ b/sysdeps/generic/rmdir.c
@@ -38,3 +38,4 @@ __rmdir (path)
 stub_warning (rmdir)
 
 weak_alias (__rmdir, rmdir)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/s_atanl.c b/sysdeps/generic/s_atanl.c
index 2957d702d5..d9a7eb6f8f 100644
--- a/sysdeps/stub/s_atanl.c
+++ b/sysdeps/generic/s_atanl.c
@@ -12,3 +12,4 @@ __atanl (long double x)
 weak_alias (__atanl, atanl)
 
 stub_warning (atanl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/s_erfl.c b/sysdeps/generic/s_erfl.c
index 7ae25d6252..f329d58809 100644
--- a/sysdeps/stub/s_erfl.c
+++ b/sysdeps/generic/s_erfl.c
@@ -23,3 +23,4 @@ __erfcl (long double x)
 weak_alias (__erfcl, erfcl)
 
 stub_warning (erfcl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/s_exp2.c b/sysdeps/generic/s_exp2.c
index 5adda4107a..4e25d38130 100644
--- a/sysdeps/stub/s_exp2.c
+++ b/sysdeps/generic/s_exp2.c
@@ -12,3 +12,4 @@ __exp2 (double x)
 weak_alias (__exp2, exp2)
 
 stub_warning (exp2)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/s_exp2f.c b/sysdeps/generic/s_exp2f.c
index f763efbe69..7928a4ce3d 100644
--- a/sysdeps/stub/s_exp2f.c
+++ b/sysdeps/generic/s_exp2f.c
@@ -12,3 +12,4 @@ __exp2f (float x)
 weak_alias (__exp2f, exp2f)
 
 stub_warning (exp2f)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/s_exp2l.c b/sysdeps/generic/s_exp2l.c
index cab2cb2a69..46ecc4eae3 100644
--- a/sysdeps/stub/s_exp2l.c
+++ b/sysdeps/generic/s_exp2l.c
@@ -12,3 +12,4 @@ __exp2l (long double x)
 weak_alias (__exp2l, exp2l)
 
 stub_warning (exp2l)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/s_expm1l.c b/sysdeps/generic/s_expm1l.c
index 38798812ff..d49c68a1f8 100644
--- a/sysdeps/stub/s_expm1l.c
+++ b/sysdeps/generic/s_expm1l.c
@@ -12,3 +12,4 @@ __expm1l (long double x)
 weak_alias (__expm1l, expm1l)
 
 stub_warning (expm1l)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/s_log1pl.c b/sysdeps/generic/s_log1pl.c
index 9e51ce2d43..e5db9078bf 100644
--- a/sysdeps/stub/s_log1pl.c
+++ b/sysdeps/generic/s_log1pl.c
@@ -12,3 +12,4 @@ __log1pl (long double x)
 weak_alias (__log1pl, log1pl)
 
 stub_warning (log1pl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/s_log2l.c b/sysdeps/generic/s_log2l.c
index cc09569422..835cd4fed2 100644
--- a/sysdeps/stub/s_log2l.c
+++ b/sysdeps/generic/s_log2l.c
@@ -12,3 +12,4 @@ __log2l (long double x)
 weak_alias (__log2l, log2l)
 
 stub_warning (log2l)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sched_getp.c b/sysdeps/generic/sched_getp.c
index 1c87780e5b..f599f6459b 100644
--- a/sysdeps/stub/sched_getp.c
+++ b/sysdeps/generic/sched_getp.c
@@ -31,3 +31,4 @@ __sched_getparam (pid_t pid, struct sched_param *param)
 stub_warning (sched_getparam)
 
 weak_alias (__sched_getparam, sched_getparam)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sched_gets.c b/sysdeps/generic/sched_gets.c
index 78886e08d4..a10755fee5 100644
--- a/sysdeps/stub/sched_gets.c
+++ b/sysdeps/generic/sched_gets.c
@@ -31,3 +31,4 @@ __sched_getscheduler (pid_t pid)
 stub_warning (sched_getscheduler)
 
 weak_alias (__sched_getscheduler, sched_getscheduler)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sched_primax.c b/sysdeps/generic/sched_primax.c
index f43969822b..e7823699a3 100644
--- a/sysdeps/stub/sched_primax.c
+++ b/sysdeps/generic/sched_primax.c
@@ -30,3 +30,4 @@ __sched_get_priority_max (int algorithm)
 stub_warning (sched_get_priority_max)
 
 weak_alias (__sched_get_priority_max, sched_get_priority_max)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sched_primin.c b/sysdeps/generic/sched_primin.c
index 527e659326..3d1aa13848 100644
--- a/sysdeps/stub/sched_primin.c
+++ b/sysdeps/generic/sched_primin.c
@@ -30,3 +30,4 @@ __sched_get_priority_min (int algorithm)
 stub_warning (sched_get_priority_min)
 
 weak_alias (__sched_get_priority_min, sched_get_priority_min)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sched_rr_gi.c b/sysdeps/generic/sched_rr_gi.c
index 11197eefc3..9fac72b349 100644
--- a/sysdeps/stub/sched_rr_gi.c
+++ b/sysdeps/generic/sched_rr_gi.c
@@ -31,3 +31,4 @@ __sched_rr_get_interval (pid_t pid, struct timespec *t)
 stub_warning (sched_rr_get_interval)
 
 weak_alias (__sched_rr_get_interval, sched_rr_get_interval)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sched_setp.c b/sysdeps/generic/sched_setp.c
index d257a0e6e8..fea7c2ec36 100644
--- a/sysdeps/stub/sched_setp.c
+++ b/sysdeps/generic/sched_setp.c
@@ -31,3 +31,4 @@ __sched_setparam (pid_t pid, const struct sched_param *param)
 stub_warning (sched_setparam)
 
 weak_alias (__sched_setparam, sched_setparam)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sched_sets.c b/sysdeps/generic/sched_sets.c
index c842b2c8a1..7de95168e2 100644
--- a/sysdeps/stub/sched_sets.c
+++ b/sysdeps/generic/sched_sets.c
@@ -31,3 +31,4 @@ __sched_setscheduler (pid_t pid, int policy, const struct sched_param *param)
 stub_warning (sched_setscheduler)
 
 weak_alias (__sched_setscheduler, sched_setscheduler)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sched_yield.c b/sysdeps/generic/sched_yield.c
index d9e02da233..76190735f7 100644
--- a/sysdeps/stub/sched_yield.c
+++ b/sysdeps/generic/sched_yield.c
@@ -30,3 +30,4 @@ __sched_yield (void)
 stub_warning (sched_yield)
 
 weak_alias (__sched_yield, sched_yield)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/seekdir.c b/sysdeps/generic/seekdir.c
index 90bce7072a..c12d3af3c0 100644
--- a/sysdeps/stub/seekdir.c
+++ b/sysdeps/generic/seekdir.c
@@ -38,3 +38,4 @@ seekdir (dirp, pos)
 
 
 stub_warning (seekdir)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/select.c b/sysdeps/generic/select.c
index 82370209da..99fe6d7e2e 100644
--- a/sysdeps/stub/select.c
+++ b/sysdeps/generic/select.c
@@ -39,3 +39,4 @@ __select (nfds, readfds, writefds, exceptfds, timeout)
 stub_warning (select)
 
 weak_alias (__select, select)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/semctl.c b/sysdeps/generic/semctl.c
index 3da97eb3ed..297c26bb8a 100644
--- a/sysdeps/stub/semctl.c
+++ b/sysdeps/generic/semctl.c
@@ -35,3 +35,4 @@ semctl (semid, semnum, cmd, arg)
 }
 
 stub_warning (semctl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/semget.c b/sysdeps/generic/semget.c
index 3c82e6f266..2e21bc9ac0 100644
--- a/sysdeps/stub/semget.c
+++ b/sysdeps/generic/semget.c
@@ -34,3 +34,4 @@ semget (key, nsems, semflg)
 }
 
 stub_warning (semget)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/semop.c b/sysdeps/generic/semop.c
index 81aaac3a7e..64f5951451 100644
--- a/sysdeps/stub/semop.c
+++ b/sysdeps/generic/semop.c
@@ -33,3 +33,4 @@ semop (semid, sops, nsops)
 }
 
 stub_warning (semop)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/send.c b/sysdeps/generic/send.c
index a25eb72822..0ef82948ea 100644
--- a/sysdeps/stub/send.c
+++ b/sysdeps/generic/send.c
@@ -34,3 +34,4 @@ weak_alias (__send, send)
 
 
 stub_warning (send)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sendmsg.c b/sysdeps/generic/sendmsg.c
index fac260c256..20d8bd6f67 100644
--- a/sysdeps/stub/sendmsg.c
+++ b/sysdeps/generic/sendmsg.c
@@ -32,3 +32,4 @@ sendmsg (fd, message, flags)
 }
 
 stub_warning (sendmsg)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sendto.c b/sysdeps/generic/sendto.c
index 47dad95dbd..f9b3c87f68 100644
--- a/sysdeps/stub/sendto.c
+++ b/sysdeps/generic/sendto.c
@@ -35,3 +35,4 @@ sendto (fd, buf, n, flags, addr, addr_len)
 }
 
 stub_warning (sendto)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setdomain.c b/sysdeps/generic/setdomain.c
index 718905a856..7308d5ddb4 100644
--- a/sysdeps/stub/setdomain.c
+++ b/sysdeps/generic/setdomain.c
@@ -31,3 +31,4 @@ setdomainname (name, len)
 }
 
 stub_warning (setdomainname)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setegid.c b/sysdeps/generic/setegid.c
index 8159a18333..d34d222089 100644
--- a/sysdeps/stub/setegid.c
+++ b/sysdeps/generic/setegid.c
@@ -30,3 +30,4 @@ setegid (gid)
 
 
 stub_warning (setegid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/seteuid.c b/sysdeps/generic/seteuid.c
index 6254a20a33..9233828b97 100644
--- a/sysdeps/stub/seteuid.c
+++ b/sysdeps/generic/seteuid.c
@@ -30,3 +30,4 @@ seteuid (uid)
 
 
 stub_warning (seteuid)
+#include <stub-tag.h>
diff --git a/sysdeps/generic/setfpucw.c b/sysdeps/generic/setfpucw.c
index f7f61f6fcf..ba91a76715 100644
--- a/sysdeps/generic/setfpucw.c
+++ b/sysdeps/generic/setfpucw.c
@@ -17,7 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "fpu_control.h"
+#include <fpu_control.h>
 
 void
 __setfpucw (fpu_control_t set)
diff --git a/sysdeps/stub/setgid.c b/sysdeps/generic/setgid.c
index 3577cefe68..7b71ce77c2 100644
--- a/sysdeps/stub/setgid.c
+++ b/sysdeps/generic/setgid.c
@@ -34,3 +34,4 @@ __setgid (gid)
 stub_warning (setgid)
 
 weak_alias (__setgid, setgid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setgroups.c b/sysdeps/generic/setgroups.c
index 1602085334..e1c2b3e04a 100644
--- a/sysdeps/stub/setgroups.c
+++ b/sysdeps/generic/setgroups.c
@@ -32,3 +32,4 @@ setgroups (n, groups)
 
 
 stub_warning (setgroups)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sethostid.c b/sysdeps/generic/sethostid.c
index c95101244f..9bc808f15a 100644
--- a/sysdeps/stub/sethostid.c
+++ b/sysdeps/generic/sethostid.c
@@ -31,3 +31,4 @@ sethostid (id)
 
 
 stub_warning (sethostid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sethostname.c b/sysdeps/generic/sethostname.c
index 0d325aab42..1eba398942 100644
--- a/sysdeps/stub/sethostname.c
+++ b/sysdeps/generic/sethostname.c
@@ -32,3 +32,4 @@ sethostname (name, len)
 
 
 stub_warning (sethostname)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setitimer.c b/sysdeps/generic/setitimer.c
index 21af5173c9..d85311359f 100644
--- a/sysdeps/stub/setitimer.c
+++ b/sysdeps/generic/setitimer.c
@@ -41,3 +41,4 @@ __setitimer (which, new, old)
 stub_warning (setitimer)
 
 weak_alias (__setitimer, setitimer)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setjmp.c b/sysdeps/generic/setjmp.c
index 994f4ca602..8b1dfa6a83 100644
--- a/sysdeps/stub/setjmp.c
+++ b/sysdeps/generic/setjmp.c
@@ -34,3 +34,4 @@ __sigsetjmp (jmp_buf env, int savemask)
 
 
 stub_warning (__sigsetjmp)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setlogin.c b/sysdeps/generic/setlogin.c
index 2262b50cd7..5f2b5d8e58 100644
--- a/sysdeps/stub/setlogin.c
+++ b/sysdeps/generic/setlogin.c
@@ -29,3 +29,4 @@ setlogin (name)
 }
 
 stub_warning (setlogin)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setpgid.c b/sysdeps/generic/setpgid.c
index bca886c451..38329898e8 100644
--- a/sysdeps/stub/setpgid.c
+++ b/sysdeps/generic/setpgid.c
@@ -33,3 +33,4 @@ __setpgid (pid, pgid)
 stub_warning (setpgid)
 
 weak_alias (__setpgid, setpgid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setpriority.c b/sysdeps/generic/setpriority.c
index 908f8663ea..997bea82a6 100644
--- a/sysdeps/stub/setpriority.c
+++ b/sysdeps/generic/setpriority.c
@@ -32,3 +32,4 @@ setpriority (which, who, prio)
 }
 
 stub_warning (setpriority)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setregid.c b/sysdeps/generic/setregid.c
index 2e16bad143..85708fa50c 100644
--- a/sysdeps/stub/setregid.c
+++ b/sysdeps/generic/setregid.c
@@ -33,3 +33,4 @@ __setregid (effective_gid, real_gid)
 stub_warning (setregid)
 
 weak_alias (__setregid, setregid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setreuid.c b/sysdeps/generic/setreuid.c
index ddfb1c2a94..0e6017714d 100644
--- a/sysdeps/stub/setreuid.c
+++ b/sysdeps/generic/setreuid.c
@@ -33,3 +33,4 @@ __setreuid (effective_uid, real_uid)
 stub_warning (setreuid)
 
 weak_alias (__setreuid, setreuid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setrlimit.c b/sysdeps/generic/setrlimit.c
index 7f2db6fa47..b969ea19f7 100644
--- a/sysdeps/stub/setrlimit.c
+++ b/sysdeps/generic/setrlimit.c
@@ -33,3 +33,4 @@ setrlimit (resource, rlimits)
 
 
 stub_warning (setrlimit)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setrlimit64.c b/sysdeps/generic/setrlimit64.c
index 0f223f246c..3d1a12279f 100644
--- a/sysdeps/stub/setrlimit64.c
+++ b/sysdeps/generic/setrlimit64.c
@@ -32,3 +32,4 @@ setrlimit64 (resource, rlimits)
 }
 
 stub_warning (setrlimit64)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setsid.c b/sysdeps/generic/setsid.c
index 3ff4eccab1..e5cb58616e 100644
--- a/sysdeps/stub/setsid.c
+++ b/sysdeps/generic/setsid.c
@@ -32,3 +32,4 @@ __setsid ()
 stub_warning (setsid)
 
 weak_alias (__setsid, setsid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setsockopt.c b/sysdeps/generic/setsockopt.c
index 5fad292a57..ba876438e5 100644
--- a/sysdeps/stub/setsockopt.c
+++ b/sysdeps/generic/setsockopt.c
@@ -35,3 +35,4 @@ setsockopt (fd, level, optname, optval, optlen)
 }
 
 stub_warning (setsockopt)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/settimeofday.c b/sysdeps/generic/settimeofday.c
index 231413be58..15bfbbc9b7 100644
--- a/sysdeps/stub/settimeofday.c
+++ b/sysdeps/generic/settimeofday.c
@@ -32,3 +32,4 @@ __settimeofday (tv, tz)
 stub_warning (settimeofday)
 
 weak_alias (__settimeofday, settimeofday)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/setuid.c b/sysdeps/generic/setuid.c
index dd58f368d0..eb5383bc3d 100644
--- a/sysdeps/stub/setuid.c
+++ b/sysdeps/generic/setuid.c
@@ -34,3 +34,4 @@ __setuid (uid)
 stub_warning (setuid)
 
 weak_alias (__setuid, setuid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/shmat.c b/sysdeps/generic/shmat.c
index b33cad117b..ce2bf70018 100644
--- a/sysdeps/stub/shmat.c
+++ b/sysdeps/generic/shmat.c
@@ -35,3 +35,4 @@ shmat (shmid, shmaddr, shmflg)
 }
 
 stub_warning (shmat)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/shmctl.c b/sysdeps/generic/shmctl.c
index c03d20d44e..c9d0ee6fef 100644
--- a/sysdeps/stub/shmctl.c
+++ b/sysdeps/generic/shmctl.c
@@ -33,3 +33,4 @@ shmctl (shmid, cmd, buf)
 }
 
 stub_warning (shmctl)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/shmdt.c b/sysdeps/generic/shmdt.c
index ab9609e55f..9902d70b41 100644
--- a/sysdeps/stub/shmdt.c
+++ b/sysdeps/generic/shmdt.c
@@ -32,3 +32,4 @@ shmdt (shmaddr)
 }
 
 stub_warning (shmdt)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/shmget.c b/sysdeps/generic/shmget.c
index d86289b112..4f8eb63ea0 100644
--- a/sysdeps/stub/shmget.c
+++ b/sysdeps/generic/shmget.c
@@ -34,3 +34,4 @@ shmget (key, size, shmflg)
 }
 
 stub_warning (shmget)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/shutdown.c b/sysdeps/generic/shutdown.c
index 3e9754e6b6..55556793c0 100644
--- a/sysdeps/stub/shutdown.c
+++ b/sysdeps/generic/shutdown.c
@@ -36,3 +36,4 @@ shutdown (fd, how)
 
 
 stub_warning (shutdown)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigaction.c b/sysdeps/generic/sigaction.c
index e27741fd97..8efc060931 100644
--- a/sysdeps/stub/sigaction.c
+++ b/sysdeps/generic/sigaction.c
@@ -40,3 +40,4 @@ __sigaction (sig, act, oact)
 stub_warning (sigaction)
 
 weak_alias (__sigaction, sigaction)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigaltstack.c b/sysdeps/generic/sigaltstack.c
index 1737e5d080..b4b4e90b2d 100644
--- a/sysdeps/stub/sigaltstack.c
+++ b/sysdeps/generic/sigaltstack.c
@@ -31,3 +31,4 @@ sigaltstack (ss, oss)
 }
 
 stub_warning (sigaltstack)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigblock.c b/sysdeps/generic/sigblock.c
index aa7ef8845e..5eabb9dc08 100644
--- a/sysdeps/stub/sigblock.c
+++ b/sysdeps/generic/sigblock.c
@@ -30,3 +30,4 @@ __sigblock (mask)
 stub_warning (sigblock)
 
 weak_alias (__sigblock, sigblock)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigintr.c b/sysdeps/generic/sigintr.c
index c68b919867..a9a11e4410 100644
--- a/sysdeps/stub/sigintr.c
+++ b/sysdeps/generic/sigintr.c
@@ -32,3 +32,4 @@ siginterrupt (sig, interrupt)
 }
 
 stub_warning (siginterrupt)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/siglist.c b/sysdeps/generic/siglist.c
index ae03b1f73c..ae03b1f73c 100644
--- a/sysdeps/stub/siglist.c
+++ b/sysdeps/generic/siglist.c
diff --git a/sysdeps/stub/signal.c b/sysdeps/generic/signal.c
index 066a8cc79f..1ad3f1045e 100644
--- a/sysdeps/stub/signal.c
+++ b/sysdeps/generic/signal.c
@@ -35,3 +35,4 @@ weak_alias (signal, ssignal)
 
 stub_warning (signal)
 stub_warning (ssignal)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigpause.c b/sysdeps/generic/sigpause.c
index 3525e3536f..25dfff1ea5 100644
--- a/sysdeps/stub/sigpause.c
+++ b/sysdeps/generic/sigpause.c
@@ -40,3 +40,4 @@ __default_sigpause (mask)
 }
 weak_alias (__default_sigpause, sigpause)
 stub_warning (sigpause)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigpending.c b/sysdeps/generic/sigpending.c
index dd587ff7b0..2c1597a521 100644
--- a/sysdeps/stub/sigpending.c
+++ b/sysdeps/generic/sigpending.c
@@ -37,3 +37,4 @@ sigpending (set)
 }
 
 stub_warning (sigpending)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigprocmask.c b/sysdeps/generic/sigprocmask.c
index 739ebce5bb..739ebce5bb 100644
--- a/sysdeps/stub/sigprocmask.c
+++ b/sysdeps/generic/sigprocmask.c
diff --git a/sysdeps/stub/sigreturn.c b/sysdeps/generic/sigreturn.c
index c14e358ee2..13089a76bf 100644
--- a/sysdeps/stub/sigreturn.c
+++ b/sysdeps/generic/sigreturn.c
@@ -29,3 +29,4 @@ __sigreturn (context)
 stub_warning (sigreturn)
 
 weak_alias (__sigreturn, sigreturn)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigsetmask.c b/sysdeps/generic/sigsetmask.c
index b8e630d09c..4be31db02e 100644
--- a/sysdeps/stub/sigsetmask.c
+++ b/sysdeps/generic/sigsetmask.c
@@ -29,3 +29,4 @@ __sigsetmask (mask)
 stub_warning (sigsetmask)
 
 weak_alias (__sigsetmask, sigsetmask)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigstack.c b/sysdeps/generic/sigstack.c
index 6784b056b5..52b135a19f 100644
--- a/sysdeps/stub/sigstack.c
+++ b/sysdeps/generic/sigstack.c
@@ -31,3 +31,4 @@ sigstack (ss, oss)
 }
 
 stub_warning (sigstack)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigsuspend.c b/sysdeps/generic/sigsuspend.c
index a3f8935e9a..15166acfb7 100644
--- a/sysdeps/stub/sigsuspend.c
+++ b/sysdeps/generic/sigsuspend.c
@@ -32,3 +32,4 @@ sigsuspend (set)
 
 
 stub_warning (sigsuspend)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigvec.c b/sysdeps/generic/sigvec.c
index 444105480f..8cce744a03 100644
--- a/sysdeps/stub/sigvec.c
+++ b/sysdeps/generic/sigvec.c
@@ -36,3 +36,4 @@ __sigvec (sig, vec, ovec)
 stub_warning (sigvec)
 
 weak_alias (__sigvec, sigvec)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sigwait.c b/sysdeps/generic/sigwait.c
index 28b86aa698..f34bfdf179 100644
--- a/sysdeps/stub/sigwait.c
+++ b/sysdeps/generic/sigwait.c
@@ -29,3 +29,4 @@ __sigwait (const sigset_t *set, int *sig)
 weak_alias (__sigwait, sigwait)
 
 stub_warning (sigwait)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sleep.c b/sysdeps/generic/sleep.c
index fdc8b28887..65c1f9607d 100644
--- a/sysdeps/stub/sleep.c
+++ b/sysdeps/generic/sleep.c
@@ -38,3 +38,4 @@ __sleep (seconds)
 weak_alias (__sleep, sleep)
 
 stub_warning (sleep)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/socket.c b/sysdeps/generic/socket.c
index 9a0a1be5a0..b946c164e8 100644
--- a/sysdeps/stub/socket.c
+++ b/sysdeps/generic/socket.c
@@ -34,3 +34,4 @@ socket (domain, type, protocol)
 
 
 stub_warning (socket)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/socketpair.c b/sysdeps/generic/socketpair.c
index d2ba667843..f8c0d76889 100644
--- a/sysdeps/stub/socketpair.c
+++ b/sysdeps/generic/socketpair.c
@@ -36,3 +36,4 @@ socketpair (domain, type, protocol, fds)
 
 
 stub_warning (socketpair)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sstk.c b/sysdeps/generic/sstk.c
index 6e8567246f..0ca36ef9f4 100644
--- a/sysdeps/stub/sstk.c
+++ b/sysdeps/generic/sstk.c
@@ -32,3 +32,4 @@ sstk (increment)
 }
 
 stub_warning (sstk)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/start.c b/sysdeps/generic/start.c
index cf7efc931a..cf7efc931a 100644
--- a/sysdeps/stub/start.c
+++ b/sysdeps/generic/start.c
diff --git a/sysdeps/stub/statfs.c b/sysdeps/generic/statfs.c
index bae8eaa8ee..8cdd1e03b1 100644
--- a/sysdeps/stub/statfs.c
+++ b/sysdeps/generic/statfs.c
@@ -31,3 +31,4 @@ __statfs (const char *file, struct statfs *buf)
 weak_alias (__statfs, statfs)
 
 stub_warning (statfs)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/statfs64.c b/sysdeps/generic/statfs64.c
index 51cde7dd27..93b640eb74 100644
--- a/sysdeps/stub/statfs64.c
+++ b/sysdeps/generic/statfs64.c
@@ -29,3 +29,4 @@ statfs64 (const char *file, struct statfs64 *buf)
   return -1;
 }
 stub_warning (statfs64)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/stdio_init.c b/sysdeps/generic/stdio_init.c
index a8e733e811..a8e733e811 100644
--- a/sysdeps/stub/stdio_init.c
+++ b/sysdeps/generic/stdio_init.c
diff --git a/sysdeps/stub/stime.c b/sysdeps/generic/stime.c
index a2a17b530d..d41d6b400f 100644
--- a/sysdeps/stub/stime.c
+++ b/sysdeps/generic/stime.c
@@ -37,3 +37,4 @@ stime (when)
 }
 
 stub_warning (stime)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/strtsupp.c b/sysdeps/generic/strtsupp.c
index 202a1ce60d..202a1ce60d 100644
--- a/sysdeps/stub/strtsupp.c
+++ b/sysdeps/generic/strtsupp.c
diff --git a/sysdeps/stub/stty.c b/sysdeps/generic/stty.c
index d947ad0691..425bca42b1 100644
--- a/sysdeps/stub/stty.c
+++ b/sysdeps/generic/stty.c
@@ -37,3 +37,4 @@ stty (fd, params)
 }
 
 stub_warning (stty)
+#include <stub-tag.h>
diff --git a/sysdeps/generic/stub_warnings b/sysdeps/generic/stub_warnings
new file mode 100644
index 0000000000..a97994ba67
--- /dev/null
+++ b/sysdeps/generic/stub_warnings
@@ -0,0 +1,270 @@
+__longjmp.c
+_exit.c
+accept.c
+access.c
+acct.c
+adjtime.c
+alarm.c
+bind.c
+brk.c
+chdir.c
+chflags.c
+chmod.c
+chown.c
+chroot.c
+clock.c
+close.c
+closedir.c
+connect.c
+ctermid.c
+cuserid.c
+des_impl.c
+dirfd.c
+dup.c
+dup2.c
+e_acoshl.c
+e_acosl.c
+e_asinl.c
+e_atan2l.c
+e_expl.c
+e_fmodl.c
+e_j0l.c
+e_j1l.c
+e_jnl.c
+e_lgammal_r.c
+e_log10l.c
+e_logl.c
+e_powl.c
+e_rem_pio2l.c
+e_sqrtl.c
+euidaccess.c
+execve.c
+fchdir.c
+fchflags.c
+fchmod.c
+fchown.c
+fclrexcpt.c
+fcntl.c
+fdopen.c
+fegetenv.c
+fegetround.c
+feholdexcpt.c
+fesetenv.c
+fesetround.c
+feupdateenv.c
+fexecve.c
+fgetexcptflg.c
+flock.c
+fork.c
+fpathconf.c
+fraiseexcpt.c
+fsetexcptflg.c
+fstatfs.c
+fstatfs64.c
+fsync.c
+ftestexcept.c
+ftruncate.c
+fxstat.c
+fxstat64.c
+getaddrinfo.c
+getcwd.c
+getdents.c
+getdomain.c
+getdtsz.c
+getegid.c
+geteuid.c
+getgid.c
+getgroups.c
+gethostid.c
+gethostname.c
+getitimer.c
+getlogin.c
+getlogin_r.c
+getpagesize.c
+getpeername.c
+getpgid.c
+getpid.c
+getppid.c
+getpriority.c
+getrlimit.c
+getrlimit64.c
+getrusage.c
+getsockname.c
+getsockopt.c
+getsysstats.c
+gettimeofday.c
+getuid.c
+gtty.c
+if_index.c
+ioctl.c
+isatty.c
+isfdtype.c
+k_cosl.c
+k_rem_pio2l.c
+k_sinl.c
+k_tanl.c
+kill.c
+killpg.c
+lchown.c
+link.c
+listen.c
+lseek.c
+lseek64.c
+lxstat64.c
+madvise.c
+mkdir.c
+mkfifo.c
+mkstemp.c
+mktemp.c
+mprotect.c
+msgctl.c
+msgget.c
+msgrcv.c
+msgsnd.c
+msync.c
+nanosleep.c
+nice.c
+nlist.c
+open.c
+open64.c
+opendir.c
+pathconf.c
+pause.c
+pipe.c
+pipestream.c
+poll.c
+pread.c
+pread64.c
+profil.c
+ptrace.c
+pwrite.c
+pwrite64.c
+raise.c
+read.c
+readdir.c
+readdir64.c
+readdir64_r.c
+readdir_r.c
+readlink.c
+readv.c
+reboot.c
+recv.c
+recvfrom.c
+recvmsg.c
+remove.c
+rename.c
+revoke.c
+rewinddir.c
+rmdir.c
+s_atanl.c
+s_erfl.c
+s_exp2.c
+s_exp2f.c
+s_exp2l.c
+s_expm1l.c
+s_log1pl.c
+s_log2l.c
+sched_getp.c
+sched_gets.c
+sched_primax.c
+sched_primin.c
+sched_rr_gi.c
+sched_setp.c
+sched_sets.c
+sched_yield.c
+seekdir.c
+select.c
+semctl.c
+semget.c
+semop.c
+send.c
+sendmsg.c
+sendto.c
+setdomain.c
+setegid.c
+seteuid.c
+setgid.c
+setgroups.c
+sethostid.c
+sethostname.c
+setitimer.c
+setjmp.c
+setlogin.c
+setpgid.c
+setpriority.c
+setregid.c
+setreuid.c
+setrlimit.c
+setrlimit64.c
+setsid.c
+setsockopt.c
+settimeofday.c
+setuid.c
+shmat.c
+shmctl.c
+shmdt.c
+shmget.c
+shutdown.c
+sigaction.c
+sigaltstack.c
+sigblock.c
+sigintr.c
+signal.c
+sigpause.c
+sigpending.c
+sigreturn.c
+sigsetmask.c
+sigstack.c
+sigsuspend.c
+sigvec.c
+sigwait.c
+sleep.c
+socket.c
+socketpair.c
+sstk.c
+statfs.c
+statfs64.c
+stime.c
+stty.c
+swapoff.c
+swapon.c
+symlink.c
+sync.c
+syscall.c
+sysconf.c
+system.c
+sysv_signal.c
+tcdrain.c
+tcflow.c
+tcflush.c
+tcgetattr.c
+tcgetpgrp.c
+tcsendbrk.c
+tcsetattr.c
+tcsetpgrp.c
+telldir.c
+tempname.c
+time.c
+times.c
+truncate.c
+ttyname.c
+ttyname_r.c
+ualarm.c
+ulimit.c
+umask.c
+unlink.c
+usleep.c
+ustat.c
+utime.c
+utimes.c
+vdprintf.c
+vhangup.c
+wait.c
+wait3.c
+wait4.c
+waitpid.c
+write.c
+writev.c
+xmknod.c
+xstat.c
+xstat64.c
diff --git a/sysdeps/stub/swapoff.c b/sysdeps/generic/swapoff.c
index 3b3fd9a8a1..49e4815c41 100644
--- a/sysdeps/stub/swapoff.c
+++ b/sysdeps/generic/swapoff.c
@@ -28,3 +28,4 @@ swapoff (const char *path)
 }
 
 stub_warning (swapoff)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/swapon.c b/sysdeps/generic/swapon.c
index cbaa1c2fe3..c466e8cea7 100644
--- a/sysdeps/stub/swapon.c
+++ b/sysdeps/generic/swapon.c
@@ -31,3 +31,4 @@ swapon (path)
 }
 
 stub_warning (swapon)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/symlink.c b/sysdeps/generic/symlink.c
index abdaf4a1c5..87365aa8d5 100644
--- a/sysdeps/stub/symlink.c
+++ b/sysdeps/generic/symlink.c
@@ -39,3 +39,4 @@ __symlink (from, to)
 stub_warning (symlink)
 
 weak_alias (__symlink, symlink)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sync.c b/sysdeps/generic/sync.c
index aed63b1437..aa04edf524 100644
--- a/sysdeps/stub/sync.c
+++ b/sysdeps/generic/sync.c
@@ -29,3 +29,4 @@ sync ()
 
 
 stub_warning (sync)
+#include <stub-tag.h>
diff --git a/sysdeps/generic/sys/mman.h b/sysdeps/generic/sys/mman.h
index 6e41a923d5..f8ca3f03ee 100644
--- a/sysdeps/generic/sys/mman.h
+++ b/sysdeps/generic/sys/mman.h
@@ -76,7 +76,7 @@
 #endif
 
 /* Return value of `mmap' in case of an error.  */
-#define MAP_FAILED	((__caddr_t) -1)
+#define MAP_FAILED	((__ptr_t) -1)
 
 
 __BEGIN_DECLS
@@ -89,41 +89,41 @@ __BEGIN_DECLS
    for errors (in which case `errno' is set).  A successful `mmap' call
    deallocates any previous mapping for the affected region.  */
 
-extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			      int __flags, int __fd, __off_t __offset));
+extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			  int __flags, int __fd, __off_t __offset));
 #ifndef __USE_FILE_OFFSET64
-extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			    int __flags, int __fd, __off_t __offset));
+extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			int __flags, int __fd, __off_t __offset));
 #else
-extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			    int __flags, int __fd, __off_t __offset))
+extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			int __flags, int __fd, __off_t __offset))
      __asm__ ("mmap64");
 #endif
 #ifdef __USE_LARGEFILE64
-extern __caddr_t mmap64 __P ((__caddr_t __addr, size_t __len, int __prot,
-			      int __flags, int __fd, __off64_t __offset));
+extern __ptr_t mmap64 __P ((__ptr_t __addr, size_t __len, int __prot,
+			  int __flags, int __fd, __off64_t __offset));
 #endif
 
 /* Deallocate any mapping for the region starting at ADDR and extending LEN
    bytes.  Returns 0 if successful, -1 for errors (and sets errno).  */
-extern int __munmap __P ((__caddr_t __addr, size_t __len));
-extern int munmap __P ((__caddr_t __addr, size_t __len));
+extern int __munmap __P ((__ptr_t __addr, size_t __len));
+extern int munmap __P ((__ptr_t __addr, size_t __len));
 
 /* Change the memory protection of the region starting at ADDR and
    extending LEN bytes to PROT.  Returns 0 if successful, -1 for errors
    (and sets errno).  */
-extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
-extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
+extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
+extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
 
 /* Synchronize the region starting at ADDR and extending LEN bytes with the
    file it maps.  Filesystem operations on a file being mapped are
    unpredictable before this is done.  Flags are from the MS_* set.  */
-extern int msync __P ((__caddr_t __addr, size_t __len, int __flags));
+extern int msync __P ((__ptr_t __addr, size_t __len, int __flags));
 
 #ifdef __USE_BSD
 /* Advise the system about particular usage patterns the program follows
    for the region starting at ADDR and extending LEN bytes.  */
-extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice));
+extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice));
 #endif
 
 __END_DECLS
diff --git a/sysdeps/stub/sys/param.h b/sysdeps/generic/sys/param.h
index 1dafdda403..1dafdda403 100644
--- a/sysdeps/stub/sys/param.h
+++ b/sysdeps/generic/sys/param.h
diff --git a/sysdeps/stub/sys/reboot.h b/sysdeps/generic/sys/reboot.h
index bada28dd6c..bada28dd6c 100644
--- a/sysdeps/stub/sys/reboot.h
+++ b/sysdeps/generic/sys/reboot.h
diff --git a/sysdeps/stub/sys/syscall.h b/sysdeps/generic/sys/syscall.h
index 719bd08904..719bd08904 100644
--- a/sysdeps/stub/sys/syscall.h
+++ b/sysdeps/generic/sys/syscall.h
diff --git a/sysdeps/stub/syscall.c b/sysdeps/generic/syscall.c
index 4903b409b5..8c20b7ead0 100644
--- a/sysdeps/stub/syscall.c
+++ b/sysdeps/generic/syscall.c
@@ -32,3 +32,4 @@ syscall (callno)
 }
 
 stub_warning (syscall)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sysconf.c b/sysdeps/generic/sysconf.c
index 3d3c0e9759..b3fa62aa9a 100644
--- a/sysdeps/stub/sysconf.c
+++ b/sysdeps/generic/sysconf.c
@@ -252,3 +252,4 @@ __sysconf (name)
 weak_alias (__sysconf, sysconf)
 
 stub_warning (sysconf)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sysdep.c b/sysdeps/generic/sysdep.c
index 5442eee00d..5442eee00d 100644
--- a/sysdeps/stub/sysdep.c
+++ b/sysdeps/generic/sysdep.c
diff --git a/sysdeps/stub/system.c b/sysdeps/generic/system.c
index 311ccfe756..5476d0f157 100644
--- a/sysdeps/stub/system.c
+++ b/sysdeps/generic/system.c
@@ -35,3 +35,4 @@ weak_alias (__libc_system, system)
 
 
 stub_warning (system)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/sysv_signal.c b/sysdeps/generic/sysv_signal.c
index 4d3e15aad0..d8db7d5f8d 100644
--- a/sysdeps/stub/sysv_signal.c
+++ b/sysdeps/generic/sysv_signal.c
@@ -40,3 +40,4 @@ __sysv_signal (sig, handler)
 weak_alias (__sysv_signal, sysv_signal)
 
 stub_warning (sysv_signal)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/tcdrain.c b/sysdeps/generic/tcdrain.c
index cda0f167ea..2bd91b32b0 100644
--- a/sysdeps/stub/tcdrain.c
+++ b/sysdeps/generic/tcdrain.c
@@ -36,3 +36,4 @@ weak_alias (__libc_tcdrain, tcdrain)
 
 
 stub_warning (tcdrain)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/tcflow.c b/sysdeps/generic/tcflow.c
index e8fc81cfce..b1c091dfa1 100644
--- a/sysdeps/stub/tcflow.c
+++ b/sysdeps/generic/tcflow.c
@@ -50,3 +50,4 @@ tcflow (fd, action)
 
 
 stub_warning (tcflow)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/tcflush.c b/sysdeps/generic/tcflush.c
index 28cd558536..627f62e421 100644
--- a/sysdeps/stub/tcflush.c
+++ b/sysdeps/generic/tcflush.c
@@ -43,3 +43,4 @@ tcflush (fd, queue_selector)
 
 
 stub_warning(tcflush);
+#include <stub-tag.h>
diff --git a/sysdeps/stub/tcgetattr.c b/sysdeps/generic/tcgetattr.c
index 9e80969653..bb7543482d 100644
--- a/sysdeps/stub/tcgetattr.c
+++ b/sysdeps/generic/tcgetattr.c
@@ -43,3 +43,4 @@ __tcgetattr (fd, termios_p)
 stub_warning (tcgetattr)
 
 weak_alias (__tcgetattr, tcgetattr)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/tcgetpgrp.c b/sysdeps/generic/tcgetpgrp.c
index a6e711a95d..91ed22c2c9 100644
--- a/sysdeps/stub/tcgetpgrp.c
+++ b/sysdeps/generic/tcgetpgrp.c
@@ -37,3 +37,4 @@ tcgetpgrp (fd)
 
 
 stub_warning (tcgetpgrp)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/tcsendbrk.c b/sysdeps/generic/tcsendbrk.c
index 5f127e43f6..a741eedd2b 100644
--- a/sysdeps/stub/tcsendbrk.c
+++ b/sysdeps/generic/tcsendbrk.c
@@ -37,3 +37,4 @@ tcsendbreak (fd, duration)
 
 
 stub_warning (tcsendbreak)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/tcsetattr.c b/sysdeps/generic/tcsetattr.c
index 7904ea2c08..e1b54c5e14 100644
--- a/sysdeps/stub/tcsetattr.c
+++ b/sysdeps/generic/tcsetattr.c
@@ -94,3 +94,4 @@ bad_speed (speed)
 
 
 stub_warning (tcsetattr)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/tcsetpgrp.c b/sysdeps/generic/tcsetpgrp.c
index 741c3b3158..e48ee69a66 100644
--- a/sysdeps/stub/tcsetpgrp.c
+++ b/sysdeps/generic/tcsetpgrp.c
@@ -38,3 +38,4 @@ tcsetpgrp (fd, pgrp_id)
 
 
 stub_warning (tcsetpgrp)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/telldir.c b/sysdeps/generic/telldir.c
index 85217e9a0e..3400829cb7 100644
--- a/sysdeps/stub/telldir.c
+++ b/sysdeps/generic/telldir.c
@@ -38,3 +38,4 @@ telldir (dirp)
 
 
 stub_warning (telldir)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/tempname.c b/sysdeps/generic/tempname.c
index d87c54f86a..f5d1ed0345 100644
--- a/sysdeps/stub/tempname.c
+++ b/sysdeps/generic/tempname.c
@@ -43,3 +43,4 @@ __stdio_gen_tempname (buf, bufsize, dir, pfx, dir_search, lenptr, streamptr,
 }
 
 stub_warning (__stdio_gen_tempname)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/thread_state.h b/sysdeps/generic/thread_state.h
index 060282e4b7..060282e4b7 100644
--- a/sysdeps/stub/thread_state.h
+++ b/sysdeps/generic/thread_state.h
diff --git a/sysdeps/stub/time.c b/sysdeps/generic/time.c
index 412ef1dc23..461aedd7c0 100644
--- a/sysdeps/stub/time.c
+++ b/sysdeps/generic/time.c
@@ -32,3 +32,4 @@ time (timer)
 }
 
 stub_warning (time)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/times.c b/sysdeps/generic/times.c
index 78676135ee..e51ced0f0a 100644
--- a/sysdeps/stub/times.c
+++ b/sysdeps/generic/times.c
@@ -40,3 +40,4 @@ __times (buffer)
 stub_warning (times)
 
 weak_alias (__times, times)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/trampoline.c b/sysdeps/generic/trampoline.c
index 4fd699e775..4fd699e775 100644
--- a/sysdeps/stub/trampoline.c
+++ b/sysdeps/generic/trampoline.c
diff --git a/sysdeps/stub/truncate.c b/sysdeps/generic/truncate.c
index c6257b68ba..20e9fe0787 100644
--- a/sysdeps/stub/truncate.c
+++ b/sysdeps/generic/truncate.c
@@ -30,3 +30,4 @@ truncate (path, length)
 }
 
 stub_warning (truncate)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/ttyname.c b/sysdeps/generic/ttyname.c
index 56e844cbbc..e62dea21bc 100644
--- a/sysdeps/stub/ttyname.c
+++ b/sysdeps/generic/ttyname.c
@@ -35,3 +35,4 @@ ttyname (fd)
 
 
 stub_warning (ttyname)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/ttyname_r.c b/sysdeps/generic/ttyname_r.c
index 6599d60b8b..6e8a9d6179 100644
--- a/sysdeps/stub/ttyname_r.c
+++ b/sysdeps/generic/ttyname_r.c
@@ -34,3 +34,4 @@ ttyname_r (fd, buf, buflen)
 
 
 stub_warning (ttyname_r)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/ualarm.c b/sysdeps/generic/ualarm.c
index 5972e240eb..b2c8da3c19 100644
--- a/sysdeps/stub/ualarm.c
+++ b/sysdeps/generic/ualarm.c
@@ -34,3 +34,4 @@ ualarm (value, interval)
 }
 
 stub_warning (ualarm)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/udiv_qrnnd.c b/sysdeps/generic/udiv_qrnnd.c
index d32796c04d..d32796c04d 100644
--- a/sysdeps/stub/udiv_qrnnd.c
+++ b/sysdeps/generic/udiv_qrnnd.c
diff --git a/sysdeps/stub/ulimit.c b/sysdeps/generic/ulimit.c
index 7643e31ce7..3d90170b50 100644
--- a/sysdeps/stub/ulimit.c
+++ b/sysdeps/generic/ulimit.c
@@ -38,3 +38,4 @@ __ulimit (cmd, newlimit)
 weak_alias (__ulimit, ulimit)
 
 stub_warning (ulimit)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/umask.c b/sysdeps/generic/umask.c
index 58b369d6fe..584780dd3b 100644
--- a/sysdeps/stub/umask.c
+++ b/sysdeps/generic/umask.c
@@ -31,3 +31,4 @@ __umask (mask)
 stub_warning (umask)
 
 weak_alias (__umask, umask)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/unlink.c b/sysdeps/generic/unlink.c
index fd303b8662..545a24abe0 100644
--- a/sysdeps/stub/unlink.c
+++ b/sysdeps/generic/unlink.c
@@ -38,3 +38,4 @@ __unlink (name)
 stub_warning (unlink)
 
 weak_alias (__unlink, unlink)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/usleep.c b/sysdeps/generic/usleep.c
index 7ee41b63fa..8c0e851d6d 100644
--- a/sysdeps/stub/usleep.c
+++ b/sysdeps/generic/usleep.c
@@ -29,3 +29,4 @@ usleep (useconds)
 }
 
 stub_warning (usleep)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/ustat.c b/sysdeps/generic/ustat.c
index 660b3087ad..5371641f40 100644
--- a/sysdeps/stub/ustat.c
+++ b/sysdeps/generic/ustat.c
@@ -30,3 +30,4 @@ ustat (dev, ust)
   return -1;
 }
 stub_warning (ustat)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/utime.c b/sysdeps/generic/utime.c
index b69e4903ad..40b554daa3 100644
--- a/sysdeps/stub/utime.c
+++ b/sysdeps/generic/utime.c
@@ -40,3 +40,4 @@ utime (file, times)
 
 
 stub_warning (utime)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/utimes.c b/sysdeps/generic/utimes.c
index 1cdc8fac33..438673bf17 100644
--- a/sysdeps/stub/utimes.c
+++ b/sysdeps/generic/utimes.c
@@ -40,3 +40,4 @@ __utimes (file, tvp)
 weak_alias (__utimes, utimes)
 
 stub_warning (utimes)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/vdprintf.c b/sysdeps/generic/vdprintf.c
index b99116923c..29e7fd3ab2 100644
--- a/sysdeps/stub/vdprintf.c
+++ b/sysdeps/generic/vdprintf.c
@@ -30,3 +30,4 @@ vdprintf (int d, const char *format, va_list arg)
 }
 
 stub_warning (vdprintf)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/vhangup.c b/sysdeps/generic/vhangup.c
index 94925285e8..2e112b14a6 100644
--- a/sysdeps/stub/vhangup.c
+++ b/sysdeps/generic/vhangup.c
@@ -30,3 +30,4 @@ vhangup ()
 }
 
 stub_warning (vhangup)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/wait.c b/sysdeps/generic/wait.c
index 8b186afd50..6f1db03f2d 100644
--- a/sysdeps/stub/wait.c
+++ b/sysdeps/generic/wait.c
@@ -31,3 +31,4 @@ __wait (stat_loc)
 stub_warning (wait)
 
 weak_alias (__wait, wait)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/wait3.c b/sysdeps/generic/wait3.c
index b0c71afb51..4df9d420df 100644
--- a/sysdeps/stub/wait3.c
+++ b/sysdeps/generic/wait3.c
@@ -43,3 +43,4 @@ __wait3 (stat_loc, options, usage)
 stub_warning (wait3)
 
 weak_alias (__wait3, wait3)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/wait4.c b/sysdeps/generic/wait4.c
index e67e37bdec..d29d80c73e 100644
--- a/sysdeps/stub/wait4.c
+++ b/sysdeps/generic/wait4.c
@@ -33,3 +33,4 @@ __wait4 (pid, stat_loc, options, usage)
 stub_warning (wait4)
 
 weak_alias (__wait4, wait4)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/waitpid.c b/sysdeps/generic/waitpid.c
index 0e52335f19..66d8915556 100644
--- a/sysdeps/stub/waitpid.c
+++ b/sysdeps/generic/waitpid.c
@@ -49,3 +49,4 @@ weak_alias (__libc_waitpid, __waitpid)
 weak_alias (__libc_waitpid, waitpid)
 
 stub_warning (waitpid)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/write.c b/sysdeps/generic/write.c
index d4fee7bdb2..6f98a83623 100644
--- a/sysdeps/stub/write.c
+++ b/sysdeps/generic/write.c
@@ -45,3 +45,4 @@ stub_warning (write)
 
 weak_alias (__libc_write, __write)
 weak_alias (__libc_write, write)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/writev.c b/sysdeps/generic/writev.c
index d18d73cddc..fc6bc20095 100644
--- a/sysdeps/stub/writev.c
+++ b/sysdeps/generic/writev.c
@@ -37,3 +37,4 @@ __writev (fd, vector, count)
 weak_alias (__writev, writev)
 
 stub_warning (writev)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/xmknod.c b/sysdeps/generic/xmknod.c
index 35234c2d81..6759801638 100644
--- a/sysdeps/stub/xmknod.c
+++ b/sysdeps/generic/xmknod.c
@@ -38,3 +38,4 @@ __xmknod (int vers, const char *path, mode_t mode, dev_t *dev)
 stub_warning (__xmknod)
 
 weak_alias (__xmknod, _xmknod)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/xstat.c b/sysdeps/generic/xstat.c
index 31fd3a0ed6..02f097f160 100644
--- a/sysdeps/stub/xstat.c
+++ b/sysdeps/generic/xstat.c
@@ -36,3 +36,4 @@ __xstat (int vers, const char *file, struct stat *buf)
 stub_warning (stat)
 
 weak_alias (__xstat, _xstat)
+#include <stub-tag.h>
diff --git a/sysdeps/stub/xstat64.c b/sysdeps/generic/xstat64.c
index 8eb1d177df..8d85360cb8 100644
--- a/sysdeps/stub/xstat64.c
+++ b/sysdeps/generic/xstat64.c
@@ -34,3 +34,4 @@ __xstat64 (int vers, const char *file, struct stat64 *buf)
   return -1;
 }
 stub_warning (stat64)
+#include <stub-tag.h>
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h
index ef808d2e7d..80fcc48a2b 100644
--- a/sysdeps/i386/i486/bits/string.h
+++ b/sysdeps/i386/i486/bits/string.h
@@ -979,6 +979,14 @@ __strchr_g (__const char *__s, int __c)
 }
 
 
+/* Find the first occurrence of C in S.  This is the BSD name.  */
+#define _HAVE_STRING_ARCH_index 1
+#define index(s, c) \
+  (__extension__ (__builtin_constant_p (c)				      \
+		  ? __strchr_c (s, ((c) & 0xff) << 8)			      \
+		  : __strchr_g (s, c)))
+
+
 /* Find the last occurrence of C in S.  */
 #define _HAVE_STRING_ARCH_strrchr 1
 #define strrchr(s, c) \
@@ -1067,6 +1075,14 @@ __strrchr_g (__const char *__s, int __c)
 #endif
 
 
+/* Find the last occurrence of C in S.  This is the BSD name.  */
+#define _HAVE_STRING_ARCH_rindex 1
+#define rindex(s, c) \
+  (__extension__ (__builtin_constant_p (c)				      \
+		  ? __strrchr_c (s, ((c) & 0xff) << 8)			      \
+		  : __strrchr_g (s, c)))
+
+
 /* Return the length of the initial segment of S which
    consists entirely of characters not in REJECT.  */
 #define _HAVE_STRING_ARCH_strcspn 1
diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c
index dc4b024bb8..8b4c3455c1 100644
--- a/sysdeps/mach/hurd/mmap.c
+++ b/sysdeps/mach/hurd/mmap.c
@@ -27,12 +27,12 @@
    is nonzero, it is the desired mapping address.  If the MAP_FIXED bit is
    set in FLAGS, the mapping will be at ADDR exactly (which must be
    page-aligned); otherwise the system chooses a convenient nearby address.
-   The return value is the actual mapping address chosen or (caddr_t) -1
+   The return value is the actual mapping address chosen or (__ptr_t) -1
    for errors (in which case `errno' is set).  A successful `mmap' call
    deallocates any previous mapping for the affected region.  */
 
-caddr_t
-__mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
+__ptr_t
+__mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
   error_t err;
   vm_prot_t vmprot;
@@ -49,7 +49,7 @@ __mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
       /* A specific address is requested.  It need not be page-aligned;
 	 it just needs to be congruent with the object offset.  */
       if ((mapaddr & (vm_page_size - 1)) != pageoff)
-	return (caddr_t) (long int) __hurd_fail (EINVAL);
+	return (__ptr_t) (long int) __hurd_fail (EINVAL);
       else
 	/* We will add back PAGEOFF after mapping.  */
 	mapaddr -= pageoff;
@@ -66,7 +66,7 @@ __mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
   switch (flags & MAP_TYPE)
     {
     default:
-      return (caddr_t) (long int) __hurd_fail (EINVAL);
+      return (__ptr_t) (long int) __hurd_fail (EINVAL);
 
     case MAP_ANON:
       memobj = MACH_PORT_NULL;
@@ -77,7 +77,7 @@ __mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
       {
 	mach_port_t robj, wobj;
 	if (err = HURD_DPORT_USE (fd, __io_map (port, &robj, &wobj)))
-	  return (caddr_t) (long int) __hurd_dfail (fd, err);
+	  return (__ptr_t) (long int) __hurd_dfail (fd, err);
 	switch (prot & (PROT_READ|PROT_WRITE))
 	  {
 	  case PROT_READ:
@@ -106,7 +106,7 @@ __mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 	    else
 	      {
 		__mach_port_deallocate (__mach_task_self (), wobj);
-		return (caddr_t) (long int) __hurd_fail (EACCES);
+		return (__ptr_t) (long int) __hurd_fail (EACCES);
 	      }
 	    break;
 	  }
@@ -144,12 +144,12 @@ __mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
     __mach_port_deallocate (__mach_task_self (), memobj);
 
   if (err)
-    return (caddr_t) (long int) __hurd_fail (err);
+    return (__ptr_t) (long int) __hurd_fail (err);
 
   /* Adjust the mapping address for the offset-within-page.  */
   mapaddr += pageoff;
 
-  return (caddr_t) mapaddr;
+  return (__ptr_t) mapaddr;
 }
 
 weak_alias (__mmap, mmap)
diff --git a/sysdeps/mach/mprotect.c b/sysdeps/mach/mprotect.c
index f98c663862..f297cdbf4c 100644
--- a/sysdeps/mach/mprotect.c
+++ b/sysdeps/mach/mprotect.c
@@ -26,7 +26,7 @@
    (and sets errno).  */
 
 int
-__mprotect (caddr_t addr, size_t len, int prot)
+__mprotect (__ptr_t addr, size_t len, int prot)
 {
   kern_return_t err;
   vm_prot_t vmprot;
diff --git a/sysdeps/mach/munmap.c b/sysdeps/mach/munmap.c
index 6b3e07d1cf..79f54e14ad 100644
--- a/sysdeps/mach/munmap.c
+++ b/sysdeps/mach/munmap.c
@@ -25,7 +25,7 @@
    bytes.  Returns 0 if successful, -1 for errors (and sets errno).  */
 
 int
-__munmap (caddr_t addr, size_t len)
+__munmap (__ptr_t addr, size_t len)
 {
   kern_return_t err;
   if (err = __vm_deallocate (__mach_task_self (),
diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile
index 0e837ca2e7..f8cdb0277a 100644
--- a/sysdeps/unix/Makefile
+++ b/sysdeps/unix/Makefile
@@ -19,7 +19,7 @@
 # The unix-specific configure fragment writes `unix-generated' in config.make.
 config-generated := $(config-generated) $(unix-generated)
 
-ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\
+ifeq (,$(filter-out $(sysdep_dir)/generic/ $(common-objpfx),\
 	$(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/bits/local_lim.h))))))
 
 ifneq (,$(wildcard $(sysincludedir)/sys/param.h))
@@ -43,7 +43,7 @@ common-generated := $(common-generated) local_lim.h mk-local_lim
 
 endif
 
-ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\
+ifeq (,$(filter-out $(sysdep_dir)/generic/ $(common-objpfx),\
 	$(patsubst %/sys/param.h,%/,\
 		   $(firstword $(wildcard $(+sysdep_dirs:%=%/sys/param.h))))))
 
@@ -126,11 +126,11 @@ endif # misc
 
 endif # No sysdep sys/param.h.
 
-ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\
+ifeq (,$(filter-out $(sysdep_dir)/generic/ $(common-objpfx),\
 	$(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/bits/errno.h))))))
 
 # These need to exist before any compiling is done,
-# so cpp doesn't instead find the stub versions.
+# so cpp doesn't instead find the generic versions.
 before-compile := $(before-compile) $(common-objpfx)bits/errno.h
 
 $(common-objpfx)bits/errno.h: $(common-objpfx)make-errnos
@@ -155,7 +155,7 @@ common-generated := $(common-generated) \
 		    errnos.h errnos make-errnos make-errnos.c
 endif
 
-ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\
+ifeq (,$(filter-out $(sysdep_dir)/generic/ $(common-objpfx),\
 	$(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/bits/ioctls.h))))))
 
 before-compile := $(before-compile) $(common-objpfx)bits/ioctls.h
@@ -211,7 +211,7 @@ common-generated := $(common-generated) \
 endif
 
 ifeq ($(subdir),stdio-common)
-ifeq (,$(filter-out $(sysdep_dir)/stub/ $(objpfx),\
+ifeq (,$(filter-out $(sysdep_dir)/generic/ $(objpfx),\
 	$(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/errlist.c))))))
 
 before-compile: $(objpfx)errlist.c
@@ -228,7 +228,7 @@ generated := $(generated) make_errlist errlist.c
 endif
 endif # stdio-common
 
-ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\
+ifeq (,$(filter-out $(sysdep_dir)/generic/ $(common-objpfx),\
 	$(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/sys/syscall.h))))))
 
 # The syscall code assumes a file <sys/syscall.h> that defines macros
diff --git a/sysdeps/unix/bsd/osf/sys/mman.h b/sysdeps/unix/bsd/osf/sys/mman.h
index 816f271e30..cf0bf45673 100644
--- a/sysdeps/unix/bsd/osf/sys/mman.h
+++ b/sysdeps/unix/bsd/osf/sys/mman.h
@@ -77,7 +77,7 @@
 #define MS_INVALIDATE	4		/* Invalidate cached pages.  */
 
 /* Return value of `mmap' in case of an error.  */
-#define MAP_FAILED	((__caddr_t) -1)
+#define MAP_FAILED	((__ptr_t) -1)
 
 
 __BEGIN_DECLS
@@ -90,31 +90,31 @@ __BEGIN_DECLS
    for errors (in which case `errno' is set).  A successful `mmap' call
    deallocates any previous mapping for the affected region.  */
 
-extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			      int __flags, int __fd, off_t __offset));
-extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			    int __flags, int __fd, off_t __offset));
+extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			  int __flags, int __fd, off_t __offset));
+extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			int __flags, int __fd, off_t __offset));
 
 /* Deallocate any mapping for the region starting at ADDR and extending LEN
    bytes.  Returns 0 if successful, -1 for errors (and sets errno).  */
-extern int __munmap __P ((__caddr_t __addr, size_t __len));
-extern int munmap __P ((__caddr_t __addr, size_t __len));
+extern int __munmap __P ((__ptr_t __addr, size_t __len));
+extern int munmap __P ((__ptr_t __addr, size_t __len));
 
 /* Change the memory protection of the region starting at ADDR and
    extending LEN bytes to PROT.  Returns 0 if successful, -1 for errors
    (and sets errno).  */
-extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
-extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
+extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
+extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
 
 /* Synchronize the region starting at ADDR and extending LEN bytes with the
    file it maps.  Filesystem operations on a file being mapped are
    unpredictable before this is done.  */
-extern int msync __P ((__caddr_t __addr, size_t __len, int __flags));
+extern int msync __P ((__ptr_t __addr, size_t __len, int __flags));
 
 #ifdef __USE_BSD
 /* Advise the system about particular usage patterns the program follows
    for the region starting at ADDR and extending LEN bytes.  */
-extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice));
+extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice));
 #endif
 
 __END_DECLS
diff --git a/sysdeps/unix/bsd/sun/sunos4/mmap.c b/sysdeps/unix/bsd/sun/sunos4/mmap.c
index 7c373c41af..8400aaa1db 100644
--- a/sysdeps/unix/bsd/sun/sunos4/mmap.c
+++ b/sysdeps/unix/bsd/sun/sunos4/mmap.c
@@ -25,16 +25,16 @@
    is nonzero, it is the desired mapping address.  If the MAP_FIXED bit is
    set in FLAGS, the mapping will be at ADDR exactly (which must be
    page-aligned); otherwise the system chooses a convenient nearby address.
-   The return value is the actual mapping address chosen or (caddr_t) -1
+   The return value is the actual mapping address chosen or MAP_FAILED
    for errors (in which case `errno' is set).  A successful `mmap' call
    deallocates any previous mapping for the affected region.  */
 
-extern caddr_t __mmap_syscall (caddr_t addr, size_t len,
+extern __ptr_t __mmap_syscall (__ptr_t addr, size_t len,
 			       int prot, int flags, int fd, off_t offset);
 
 
-caddr_t
-__mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
+__ptr_t
+__mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
   return __mmap_syscall (addr, len, prot, flags | _MAP_NEW, fd, offset);
 }
diff --git a/sysdeps/unix/bsd/sun/sunos4/sys/mman.h b/sysdeps/unix/bsd/sun/sunos4/sys/mman.h
index d2a8998d9a..420aed9296 100644
--- a/sysdeps/unix/bsd/sun/sunos4/sys/mman.h
+++ b/sysdeps/unix/bsd/sun/sunos4/sys/mman.h
@@ -74,7 +74,7 @@
 #define	MS_INVALIDATE	0x2		/* Invalidate caches.  */
 
 /* Return value of `mmap' in case of an error.  */
-#define MAP_FAILED	((__caddr_t) -1)
+#define MAP_FAILED	((__ptr_t) -1)
 
 
 __BEGIN_DECLS
@@ -87,31 +87,31 @@ __BEGIN_DECLS
    for errors (in which case `errno' is set).  A successful `mmap' call
    deallocates any previous mapping for the affected region.  */
 
-extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			      int __flags, int __fd, __off_t __offset));
-extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			    int __flags, int __fd, __off_t __offset));
+extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			  int __flags, int __fd, __off_t __offset));
+extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			int __flags, int __fd, __off_t __offset));
 
 /* Deallocate any mapping for the region starting at ADDR and extending LEN
    bytes.  Returns 0 if successful, -1 for errors (and sets errno).  */
-extern int __munmap __P ((__caddr_t __addr, size_t __len));
-extern int munmap __P ((__caddr_t __addr, size_t __len));
+extern int __munmap __P ((__ptr_t __addr, size_t __len));
+extern int munmap __P ((__ptr_t __addr, size_t __len));
 
 /* Change the memory protection of the region starting at ADDR and
    extending LEN bytes to PROT.  Returns 0 if successful, -1 for errors
    (and sets errno).  */
-extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
-extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
+extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
+extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
 
 /* Synchronize the region starting at ADDR and extending LEN bytes with the
    file it maps.  Filesystem operations on a file being mapped are
    unpredictable before this is done.  */
-extern int msync __P ((__caddr_t __addr, size_t __len, int __flags));
+extern int msync __P ((__ptr_t __addr, size_t __len, int __flags));
 
 #ifdef __USE_BSD
 /* Advise the system about particular usage patterns the program follows
    for the region starting at ADDR and extending LEN bytes.  */
-extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice));
+extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice));
 #endif
 
 __END_DECLS
diff --git a/sysdeps/unix/bsd/ultrix4/sys/mman.h b/sysdeps/unix/bsd/ultrix4/sys/mman.h
index 4262fce438..b884ba51ac 100644
--- a/sysdeps/unix/bsd/ultrix4/sys/mman.h
+++ b/sysdeps/unix/bsd/ultrix4/sys/mman.h
@@ -58,7 +58,7 @@
 #endif
 
 /* Return value of `mmap' in case of an error.  */
-#define MAP_FAILED	((__caddr_t) -1)
+#define MAP_FAILED	((__ptr_t) -1)
 
 
 __BEGIN_DECLS
@@ -71,33 +71,33 @@ __BEGIN_DECLS
    for errors (in which case `errno' is set).  A successful `mmap' call
    deallocates any previous mapping for the affected region.  */
 
-extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			      int __flags, int __fd, off_t __offset));
-extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			    int __flags, int __fd, off_t __offset));
+extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			  int __flags, int __fd, off_t __offset));
+extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			int __flags, int __fd, off_t __offset));
 
 /* Deallocate any mapping for the region starting at ADDR and extending LEN
    bytes.  Returns 0 if successful, -1 for errors (and sets errno).  */
-extern int __munmap __P ((__caddr_t __addr, size_t __len));
-extern int munmap __P ((__caddr_t __addr, size_t __len));
+extern int __munmap __P ((__ptr_t __addr, size_t __len));
+extern int munmap __P ((__ptr_t __addr, size_t __len));
 
 /* Change the memory protection of the region starting at ADDR and
    extending LEN bytes to PROT.  Returns 0 if successful, -1 for errors
    (and sets errno).  */
-extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
-extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
+extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
+extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
 
 /* Ultrix 4 does not implement `msync' or `madvise'.  */
 
 /* Synchronize the region starting at ADDR and extending LEN bytes with the
    file it maps.  Filesystem operations on a file being mapped are
    unpredictable before this is done.  */
-extern int msync __P ((caddr_t __addr, size_t __len));
+extern int msync __P ((__ptr_t __addr, size_t __len));
 
 #ifdef __USE_BSD
 /* Advise the system about particular usage patterns the program follows
    for the region starting at ADDR and extending LEN bytes.  */
-extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice));
+extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice));
 #endif
 
 __END_DECLS
diff --git a/sysdeps/unix/sysv/irix4/sys/mman.h b/sysdeps/unix/sysv/irix4/sys/mman.h
index c3a923832a..ff1918ec88 100644
--- a/sysdeps/unix/sysv/irix4/sys/mman.h
+++ b/sysdeps/unix/sysv/irix4/sys/mman.h
@@ -68,7 +68,7 @@
 #define	MS_INVALIDATE	 0x2		/* Invalidate caches.  */
 
 /* Return value of `mmap' in case of an error.  */
-#define MAP_FAILED	((__caddr_t) -1)
+#define MAP_FAILED	((__ptr_t) -1)
 
 
 __BEGIN_DECLS
@@ -81,31 +81,31 @@ __BEGIN_DECLS
    for errors (in which case `errno' is set).  A successful `mmap' call
    deallocates any previous mapping for the affected region.  */
 
-extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			      int __flags, int __fd, __off_t __offset));
-extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			    int __flags, int __fd, __off_t __offset));
+extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			  int __flags, int __fd, __off_t __offset));
+extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			int __flags, int __fd, __off_t __offset));
 
 /* Deallocate any mapping for the region starting at ADDR and extending LEN
    bytes.  Returns 0 if successful, -1 for errors (and sets errno).  */
-extern int __munmap __P ((__caddr_t __addr, size_t __len));
-extern int munmap __P ((__caddr_t __addr, size_t __len));
+extern int __munmap __P ((__ptr_t __addr, size_t __len));
+extern int munmap __P ((__ptr_t __addr, size_t __len));
 
 /* Change the memory protection of the region starting at ADDR and
    extending LEN bytes to PROT.  Returns 0 if successful, -1 for errors
    (and sets errno).  */
-extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
-extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
+extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
+extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
 
 /* Synchronize the region starting at ADDR and extending LEN bytes with the
    file it maps.  Filesystem operations on a file being mapped are
    unpredictable before this is done.  */
-extern int msync __P ((caddr_t __addr, size_t __len, int __flags));
+extern int msync __P ((__ptr_t __addr, size_t __len, int __flags));
 
 #ifdef __USE_BSD
 /* Advise the system about particular usage patterns the program follows
    for the region starting at ADDR and extending LEN bytes.  */
-extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice));
+extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice));
 #endif
 
 __END_DECLS
diff --git a/sysdeps/unix/sysv/linux/madvise.c b/sysdeps/unix/sysv/linux/madvise.c
index 72b7d76543..c223184aac 100644
--- a/sysdeps/unix/sysv/linux/madvise.c
+++ b/sysdeps/unix/sysv/linux/madvise.c
@@ -1 +1 @@
-#include <sysdeps/stub/madvise.c>
+#include <sysdeps/generic/madvise.c>
diff --git a/sysdeps/unix/sysv/linux/sys/mman.h b/sysdeps/unix/sysv/linux/sys/mman.h
index 129702e33c..ea326e2cd9 100644
--- a/sysdeps/unix/sysv/linux/sys/mman.h
+++ b/sysdeps/unix/sysv/linux/sys/mman.h
@@ -30,7 +30,7 @@
 #include <bits/mman.h>
 
 /* Return value of `mmap' in case of an error.  */
-#define MAP_FAILED	((__caddr_t) -1)
+#define MAP_FAILED	((__ptr_t) -1)
 
 __BEGIN_DECLS
 /* Map addresses starting near ADDR and extending for LEN bytes.  from
@@ -42,41 +42,41 @@ __BEGIN_DECLS
    for errors (in which case `errno' is set).  A successful `mmap' call
    deallocates any previous mapping for the affected region.  */
 
-extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			      int __flags, int __fd, __off_t __offset));
+extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			  int __flags, int __fd, __off_t __offset));
 #ifndef __USE_FILE_OFFSET64
-extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			    int __flags, int __fd, __off_t __offset));
+extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			int __flags, int __fd, __off_t __offset));
 #else
-extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot,
-			    int __flags, int __fd, __off_t __offset))
+extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
+			int __flags, int __fd, __off_t __offset))
      __asm__ ("mmap64");
 #endif
 #ifdef __USE_LARGEFILE64
-extern __caddr_t mmap64 __P ((__caddr_t __addr, size_t __len, int __prot,
-			      int __flags, int __fd, __off64_t __offset));
+extern __ptr_t mmap64 __P ((__ptr_t __addr, size_t __len, int __prot,
+			  int __flags, int __fd, __off64_t __offset));
 #endif
 
 /* Deallocate any mapping for the region starting at ADDR and extending LEN
    bytes.  Returns 0 if successful, -1 for errors (and sets errno).  */
-extern int __munmap __P ((__caddr_t __addr, size_t __len));
-extern int munmap __P ((__caddr_t __addr, size_t __len));
+extern int __munmap __P ((__ptr_t __addr, size_t __len));
+extern int munmap __P ((__ptr_t __addr, size_t __len));
 
 /* Change the memory protection of the region starting at ADDR and
    extending LEN bytes to PROT.  Returns 0 if successful, -1 for errors
    (and sets errno).  */
-extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
-extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot));
+extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
+extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot));
 
 /* Synchronize the region starting at ADDR and extending LEN bytes with the
    file it maps.  Filesystem operations on a file being mapped are
    unpredictable before this is done.  Flags are from the MS_* set.  */
-extern int msync __P ((__caddr_t __addr, size_t __len, int __flags));
+extern int msync __P ((__ptr_t __addr, size_t __len, int __flags));
 
 #ifdef __USE_BSD
 /* Advise the system about particular usage patterns the program follows
    for the region starting at ADDR and extending LEN bytes.  */
-extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice));
+extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice));
 #endif
 
 /* Cause all currently mapped pages of the process to be memory resident
@@ -90,22 +90,21 @@ extern int munlockall __P ((void));
 
 /* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to
    be memory resident.  */
-extern int mlock __P ((__caddr_t __addr, size_t __len));
+extern int mlock __P ((__ptr_t __addr, size_t __len));
 
 /* Unlock whole pages previously mapped by the range [ADDR,ADDR+LEN).  */
-extern int munlock __P ((__caddr_t __addr, size_t __len));
+extern int munlock __P ((__ptr_t __addr, size_t __len));
 
 #ifdef __USE_MISC
 /* Remap pages mapped by the range [ADDR,ADDR+OLD_LEN) to new length
    NEW_LEN.  If MAY_MOVE is MREMAP_MAYMOVE the returned address may
    differ from ADDR.  */
-extern __caddr_t __mremap __P ((__caddr_t __addr, size_t __old_len,
-				size_t __new_len, int __may_move));
-extern __caddr_t mremap __P ((__caddr_t __addr, size_t __old_len,
-			      size_t __new_len, int __may_move));
+extern __ptr_t __mremap __P ((__ptr_t __addr, size_t __old_len,
+			    size_t __new_len, int __may_move));
+extern __ptr_t mremap __P ((__ptr_t __addr, size_t __old_len,
+			  size_t __new_len, int __may_move));
 #endif
 
 __END_DECLS
 
-
 #endif	/* _SYS_MMAN_H */