Moved to csu/errno-loc.c.

772 files changed, 106 insertions, 5974 deletions

diff --git a/sysdeps/generic/strtsupp.c b/bare/strtsupp.c
index c66495bb3d..c66495bb3d 100644
--- a/sysdeps/generic/strtsupp.c
+++ b/bare/strtsupp.c
diff --git a/sysdeps/generic/errno.c b/csu/errno.c
index 03d661b717..03d661b717 100644
--- a/sysdeps/generic/errno.c
+++ b/csu/errno.c
diff --git a/sysdeps/generic/init-first.c b/csu/init-first.c
index fa21274c73..fa21274c73 100644
--- a/sysdeps/generic/init-first.c
+++ b/csu/init-first.c
diff --git a/sysdeps/generic/libc-start.c b/csu/libc-start.c
index 194db6b1ec..194db6b1ec 100644
--- a/sysdeps/generic/libc-start.c
+++ b/csu/libc-start.c
diff --git a/sysdeps/generic/libc-tls.c b/csu/libc-tls.c
index 3544e396da..3544e396da 100644
--- a/sysdeps/generic/libc-tls.c
+++ b/csu/libc-tls.c
diff --git a/sysdeps/generic/start.c b/csu/start.c
index 08f985c482..08f985c482 100644
--- a/sysdeps/generic/start.c
+++ b/csu/start.c
diff --git a/sysdeps/generic/sysdep.c b/csu/sysdep.c
index 5442eee00d..5442eee00d 100644
--- a/sysdeps/generic/sysdep.c
+++ b/csu/sysdep.c
diff --git a/sysdeps/generic/memcpy_chk.c b/debug/memcpy_chk.c
index 638cd0e4fb..638cd0e4fb 100644
--- a/sysdeps/generic/memcpy_chk.c
+++ b/debug/memcpy_chk.c
diff --git a/sysdeps/generic/memmove_chk.c b/debug/memmove_chk.c
index f3b74d23d9..f3b74d23d9 100644
--- a/sysdeps/generic/memmove_chk.c
+++ b/debug/memmove_chk.c
diff --git a/sysdeps/generic/mempcpy_chk.c b/debug/mempcpy_chk.c
index 5297bbab92..5297bbab92 100644
--- a/sysdeps/generic/mempcpy_chk.c
+++ b/debug/mempcpy_chk.c
diff --git a/sysdeps/generic/memset_chk.c b/debug/memset_chk.c
index d6206ffc99..d6206ffc99 100644
--- a/sysdeps/generic/memset_chk.c
+++ b/debug/memset_chk.c
diff --git a/sysdeps/generic/readonly-area.c b/debug/readonly-area.c
index 4b8172f193..4b8172f193 100644
--- a/sysdeps/generic/readonly-area.c
+++ b/debug/readonly-area.c
diff --git a/sysdeps/generic/segfault.c b/debug/segfault.c
index f141fff661..f141fff661 100644
--- a/sysdeps/generic/segfault.c
+++ b/debug/segfault.c
diff --git a/sysdeps/generic/stpcpy_chk.c b/debug/stpcpy_chk.c
index dacda0115a..dacda0115a 100644
--- a/sysdeps/generic/stpcpy_chk.c
+++ b/debug/stpcpy_chk.c
diff --git a/sysdeps/generic/stpncpy_chk.c b/debug/stpncpy_chk.c
index d136339dea..d136339dea 100644
--- a/sysdeps/generic/stpncpy_chk.c
+++ b/debug/stpncpy_chk.c
diff --git a/sysdeps/generic/strcat_chk.c b/debug/strcat_chk.c
index b3fb3470b7..b3fb3470b7 100644
--- a/sysdeps/generic/strcat_chk.c
+++ b/debug/strcat_chk.c
diff --git a/sysdeps/generic/strcpy_chk.c b/debug/strcpy_chk.c
index a4d909feda..a4d909feda 100644
--- a/sysdeps/generic/strcpy_chk.c
+++ b/debug/strcpy_chk.c
diff --git a/sysdeps/generic/strncat_chk.c b/debug/strncat_chk.c
index 953b435a4b..953b435a4b 100644
--- a/sysdeps/generic/strncat_chk.c
+++ b/debug/strncat_chk.c
diff --git a/sysdeps/generic/strncpy_chk.c b/debug/strncpy_chk.c
index bdede7738b..bdede7738b 100644
--- a/sysdeps/generic/strncpy_chk.c
+++ b/debug/strncpy_chk.c
diff --git a/sysdeps/generic/fdopendir.c b/dirent/fdopendir.c
index ed30e89e7e..ed30e89e7e 100644
--- a/sysdeps/generic/fdopendir.c
+++ b/dirent/fdopendir.c
diff --git a/sysdeps/generic/getdents.c b/dirent/getdents.c
index 1b1b7c7e8f..1b1b7c7e8f 100644
--- a/sysdeps/generic/getdents.c
+++ b/dirent/getdents.c
diff --git a/sysdeps/generic/getdents64.c b/dirent/getdents64.c
index cb30e76545..cb30e76545 100644
--- a/sysdeps/generic/getdents64.c
+++ b/dirent/getdents64.c
diff --git a/sysdeps/generic/opendir.c b/dirent/opendir.c
index 771013f6eb..771013f6eb 100644
--- a/sysdeps/generic/opendir.c
+++ b/dirent/opendir.c
diff --git a/sysdeps/generic/readdir.c b/dirent/readdir.c
index 893b246d41..893b246d41 100644
--- a/sysdeps/generic/readdir.c
+++ b/dirent/readdir.c
diff --git a/sysdeps/generic/readdir64.c b/dirent/readdir64.c
index 0c18bd9440..0c18bd9440 100644
--- a/sysdeps/generic/readdir64.c
+++ b/dirent/readdir64.c
diff --git a/sysdeps/generic/readdir64_r.c b/dirent/readdir64_r.c
index cf9e952e1a..cf9e952e1a 100644
--- a/sysdeps/generic/readdir64_r.c
+++ b/dirent/readdir64_r.c
diff --git a/sysdeps/generic/readdir_r.c b/dirent/readdir_r.c
index ad45dfa504..ad45dfa504 100644
--- a/sysdeps/generic/readdir_r.c
+++ b/dirent/readdir_r.c
diff --git a/sysdeps/generic/rewinddir.c b/dirent/rewinddir.c
index e78d316880..e78d316880 100644
--- a/sysdeps/generic/rewinddir.c
+++ b/dirent/rewinddir.c
diff --git a/sysdeps/generic/scandir64.c b/dirent/scandir64.c
index 68608de9a0..68608de9a0 100644
--- a/sysdeps/generic/scandir64.c
+++ b/dirent/scandir64.c
diff --git a/sysdeps/generic/seekdir.c b/dirent/seekdir.c
index c3828cde0f..c3828cde0f 100644
--- a/sysdeps/generic/seekdir.c
+++ b/dirent/seekdir.c
diff --git a/sysdeps/generic/telldir.c b/dirent/telldir.c
index 7b14452327..7b14452327 100644
--- a/sysdeps/generic/telldir.c
+++ b/dirent/telldir.c
diff --git a/sysdeps/generic/versionsort64.c b/dirent/versionsort64.c
index e471827023..e471827023 100644
--- a/sysdeps/generic/versionsort64.c
+++ b/dirent/versionsort64.c
diff --git a/sysdeps/generic/enbl-secure.c b/elf/enbl-secure.c
index fac3b9c527..fac3b9c527 100644
--- a/sysdeps/generic/enbl-secure.c
+++ b/elf/enbl-secure.c
diff --git a/sysdeps/generic/readelflib.c b/elf/readelflib.c
index 26444ad6b2..26444ad6b2 100644
--- a/sysdeps/generic/readelflib.c
+++ b/elf/readelflib.c
diff --git a/sysdeps/generic/prof-freq.c b/gmon/prof-freq.c
index ffcc67931b..ffcc67931b 100644
--- a/sysdeps/generic/prof-freq.c
+++ b/gmon/prof-freq.c
diff --git a/sysdeps/generic/profil.c b/gmon/profil.c
index 8736375858..8736375858 100644
--- a/sysdeps/generic/profil.c
+++ b/gmon/profil.c
diff --git a/sysdeps/generic/sprofil.c b/gmon/sprofil.c
index 037ed4672e..037ed4672e 100644
--- a/sysdeps/generic/sprofil.c
+++ b/gmon/sprofil.c
diff --git a/sysdeps/generic/setgroups.c b/grp/setgroups.c
index 74bae72974..74bae72974 100644
--- a/sysdeps/generic/setgroups.c
+++ b/grp/setgroups.c
diff --git a/sysdeps/generic/exc2signal.c b/hurd/exc2signal.c
index de044bbcf4..de044bbcf4 100644
--- a/sysdeps/generic/exc2signal.c
+++ b/hurd/exc2signal.c
diff --git a/sysdeps/generic/longjmp-ts.c b/hurd/longjmp-ts.c
index e9c297a20b..e9c297a20b 100644
--- a/sysdeps/generic/longjmp-ts.c
+++ b/hurd/longjmp-ts.c
diff --git a/sysdeps/generic/trampoline.c b/hurd/trampoline.c
index 7045a0d0ab..7045a0d0ab 100644
--- a/sysdeps/generic/trampoline.c
+++ b/hurd/trampoline.c
diff --git a/sysdeps/generic/getipv4sourcefilter.c b/inet/getipv4sourcefilter.c
index e95697778a..e95697778a 100644
--- a/sysdeps/generic/getipv4sourcefilter.c
+++ b/inet/getipv4sourcefilter.c
diff --git a/sysdeps/generic/getsourcefilter.c b/inet/getsourcefilter.c
index 373550beb3..373550beb3 100644
--- a/sysdeps/generic/getsourcefilter.c
+++ b/inet/getsourcefilter.c
diff --git a/sysdeps/generic/herrno-loc.c b/inet/herrno-loc.c
index fd6deeb330..fd6deeb330 100644
--- a/sysdeps/generic/herrno-loc.c
+++ b/inet/herrno-loc.c
diff --git a/sysdeps/generic/htonl.c b/inet/htonl.c
index dfee1b0545..dfee1b0545 100644
--- a/sysdeps/generic/htonl.c
+++ b/inet/htonl.c
diff --git a/sysdeps/generic/htons.c b/inet/htons.c
index 95c94de8a3..95c94de8a3 100644
--- a/sysdeps/generic/htons.c
+++ b/inet/htons.c
diff --git a/sysdeps/generic/if_index.c b/inet/if_index.c
index f217f37642..f217f37642 100644
--- a/sysdeps/generic/if_index.c
+++ b/inet/if_index.c
diff --git a/sysdeps/generic/ifaddrs.c b/inet/ifaddrs.c
index 330aae3b39..330aae3b39 100644
--- a/sysdeps/generic/ifaddrs.c
+++ b/inet/ifaddrs.c
diff --git a/sysdeps/generic/ifreq.c b/inet/ifreq.c
index 55e833bdb3..55e833bdb3 100644
--- a/sysdeps/generic/ifreq.c
+++ b/inet/ifreq.c
diff --git a/sysdeps/generic/setipv4sourcefilter.c b/inet/setipv4sourcefilter.c
index db2b8433bb..db2b8433bb 100644
--- a/sysdeps/generic/setipv4sourcefilter.c
+++ b/inet/setipv4sourcefilter.c
diff --git a/sysdeps/generic/setsourcefilter.c b/inet/setsourcefilter.c
index 870f5e2c38..870f5e2c38 100644
--- a/sysdeps/generic/setsourcefilter.c
+++ b/inet/setsourcefilter.c
diff --git a/sysdeps/generic/euidaccess.c b/io/euidaccess.c
index 028fe9085c..028fe9085c 100644
--- a/sysdeps/generic/euidaccess.c
+++ b/io/euidaccess.c
diff --git a/sysdeps/generic/fchdir.c b/io/fchdir.c
index db1e4f8f35..db1e4f8f35 100644
--- a/sysdeps/generic/fchdir.c
+++ b/io/fchdir.c
diff --git a/sysdeps/generic/fchmod.c b/io/fchmod.c
index 4b5eacb3eb..4b5eacb3eb 100644
--- a/sysdeps/generic/fchmod.c
+++ b/io/fchmod.c
diff --git a/sysdeps/generic/fchown.c b/io/fchown.c
index e0d42dd293..e0d42dd293 100644
--- a/sysdeps/generic/fchown.c
+++ b/io/fchown.c
diff --git a/sysdeps/generic/fchownat.c b/io/fchownat.c
index f6921c9012..f6921c9012 100644
--- a/sysdeps/generic/fchownat.c
+++ b/io/fchownat.c
diff --git a/sysdeps/generic/fcntl.c b/io/fcntl.c
index db6fbc399c..db6fbc399c 100644
--- a/sysdeps/generic/fcntl.c
+++ b/io/fcntl.c
diff --git a/sysdeps/generic/flock.c b/io/flock.c
index db3bfcfcbe..db3bfcfcbe 100644
--- a/sysdeps/generic/flock.c
+++ b/io/flock.c
diff --git a/sysdeps/generic/fstatfs.c b/io/fstatfs.c
index 4a1a996cbc..4a1a996cbc 100644
--- a/sysdeps/generic/fstatfs.c
+++ b/io/fstatfs.c
diff --git a/sysdeps/generic/fstatfs64.c b/io/fstatfs64.c
index 249b97ea44..249b97ea44 100644
--- a/sysdeps/generic/fstatfs64.c
+++ b/io/fstatfs64.c
diff --git a/sysdeps/generic/fstatvfs.c b/io/fstatvfs.c
index c5f75a7c97..c5f75a7c97 100644
--- a/sysdeps/generic/fstatvfs.c
+++ b/io/fstatvfs.c
diff --git a/sysdeps/generic/fstatvfs64.c b/io/fstatvfs64.c
index 47d4e266e2..47d4e266e2 100644
--- a/sysdeps/generic/fstatvfs64.c
+++ b/io/fstatvfs64.c
diff --git a/sysdeps/generic/fxstat.c b/io/fxstat.c
index b750daca63..b750daca63 100644
--- a/sysdeps/generic/fxstat.c
+++ b/io/fxstat.c
diff --git a/sysdeps/generic/fxstat64.c b/io/fxstat64.c
index 865ba49484..865ba49484 100644
--- a/sysdeps/generic/fxstat64.c
+++ b/io/fxstat64.c
diff --git a/sysdeps/generic/fxstatat.c b/io/fxstatat.c
index 62f7fe3efb..62f7fe3efb 100644
--- a/sysdeps/generic/fxstatat.c
+++ b/io/fxstatat.c
diff --git a/sysdeps/generic/fxstatat64.c b/io/fxstatat64.c
index ba95b73e81..ba95b73e81 100644
--- a/sysdeps/generic/fxstatat64.c
+++ b/io/fxstatat64.c
diff --git a/sysdeps/generic/getcwd.c b/io/getcwd.c
index c472d1d7a6..c472d1d7a6 100644
--- a/sysdeps/generic/getcwd.c
+++ b/io/getcwd.c
diff --git a/sysdeps/generic/isatty.c b/io/isatty.c
index 9b0410c614..9b0410c614 100644
--- a/sysdeps/generic/isatty.c
+++ b/io/isatty.c
diff --git a/sysdeps/generic/lchmod.c b/io/lchmod.c
index 524b24c1ed..524b24c1ed 100644
--- a/sysdeps/generic/lchmod.c
+++ b/io/lchmod.c
diff --git a/sysdeps/generic/lchown.c b/io/lchown.c
index 4e0330e526..4e0330e526 100644
--- a/sysdeps/generic/lchown.c
+++ b/io/lchown.c
diff --git a/sysdeps/generic/link.c b/io/link.c
index 70c9949704..70c9949704 100644
--- a/sysdeps/generic/link.c
+++ b/io/link.c
diff --git a/sysdeps/generic/lockf.c b/io/lockf.c
index 7b23f66bc9..7b23f66bc9 100644
--- a/sysdeps/generic/lockf.c
+++ b/io/lockf.c
diff --git a/sysdeps/generic/lockf64.c b/io/lockf64.c
index e3b110cd3f..e3b110cd3f 100644
--- a/sysdeps/generic/lockf64.c
+++ b/io/lockf64.c
diff --git a/sysdeps/generic/lseek64.c b/io/lseek64.c
index d0a8cff03e..d0a8cff03e 100644
--- a/sysdeps/generic/lseek64.c
+++ b/io/lseek64.c
diff --git a/sysdeps/generic/lxstat.c b/io/lxstat.c
index 23d4442b5c..23d4442b5c 100644
--- a/sysdeps/generic/lxstat.c
+++ b/io/lxstat.c
diff --git a/sysdeps/generic/lxstat64.c b/io/lxstat64.c
index 596ecd2277..596ecd2277 100644
--- a/sysdeps/generic/lxstat64.c
+++ b/io/lxstat64.c
diff --git a/sysdeps/generic/mkdir.c b/io/mkdir.c
index 8037dfb3ee..8037dfb3ee 100644
--- a/sysdeps/generic/mkdir.c
+++ b/io/mkdir.c
diff --git a/sysdeps/generic/mkdirat.c b/io/mkdirat.c
index ccea3aa8d8..ccea3aa8d8 100644
--- a/sysdeps/generic/mkdirat.c
+++ b/io/mkdirat.c
diff --git a/sysdeps/generic/mkfifo.c b/io/mkfifo.c
index 614ebe97c3..614ebe97c3 100644
--- a/sysdeps/generic/mkfifo.c
+++ b/io/mkfifo.c
diff --git a/sysdeps/generic/mkfifoat.c b/io/mkfifoat.c
index 48c38c8182..48c38c8182 100644
--- a/sysdeps/generic/mkfifoat.c
+++ b/io/mkfifoat.c
diff --git a/sysdeps/generic/mknod.c b/io/mknod.c
index 7d43593a25..7d43593a25 100644
--- a/sysdeps/generic/mknod.c
+++ b/io/mknod.c
diff --git a/sysdeps/generic/mknodat.c b/io/mknodat.c
index ac515b5b48..ac515b5b48 100644
--- a/sysdeps/generic/mknodat.c
+++ b/io/mknodat.c
diff --git a/sysdeps/generic/open.c b/io/open.c
index 188110b3f3..188110b3f3 100644
--- a/sysdeps/generic/open.c
+++ b/io/open.c
diff --git a/sysdeps/generic/open64.c b/io/open64.c
index d9a38112ac..d9a38112ac 100644
--- a/sysdeps/generic/open64.c
+++ b/io/open64.c
diff --git a/sysdeps/generic/openat.c b/io/openat.c
index f3f699ca23..f3f699ca23 100644
--- a/sysdeps/generic/openat.c
+++ b/io/openat.c
diff --git a/sysdeps/generic/openat64.c b/io/openat64.c
index 87952d38d6..87952d38d6 100644
--- a/sysdeps/generic/openat64.c
+++ b/io/openat64.c
diff --git a/sysdeps/generic/pipe.c b/io/pipe.c
index babaf9c24b..babaf9c24b 100644
--- a/sysdeps/generic/pipe.c
+++ b/io/pipe.c
diff --git a/sysdeps/generic/poll.c b/io/poll.c
index 9f2f191764..9f2f191764 100644
--- a/sysdeps/generic/poll.c
+++ b/io/poll.c
diff --git a/sysdeps/generic/posix_fadvise.c b/io/posix_fadvise.c
index 92f8bb8974..92f8bb8974 100644
--- a/sysdeps/generic/posix_fadvise.c
+++ b/io/posix_fadvise.c
diff --git a/sysdeps/generic/posix_fadvise64.c b/io/posix_fadvise64.c
index e7eae5e6e3..e7eae5e6e3 100644
--- a/sysdeps/generic/posix_fadvise64.c
+++ b/io/posix_fadvise64.c
diff --git a/sysdeps/generic/posix_fallocate.c b/io/posix_fallocate.c
index 218b4adbe3..218b4adbe3 100644
--- a/sysdeps/generic/posix_fallocate.c
+++ b/io/posix_fallocate.c
diff --git a/sysdeps/generic/posix_fallocate64.c b/io/posix_fallocate64.c
index 80c1cd385d..80c1cd385d 100644
--- a/sysdeps/generic/posix_fallocate64.c
+++ b/io/posix_fallocate64.c
diff --git a/sysdeps/generic/read.c b/io/read.c
index 3943edd689..3943edd689 100644
--- a/sysdeps/generic/read.c
+++ b/io/read.c
diff --git a/sysdeps/generic/readlink.c b/io/readlink.c
index 779b809eaa..779b809eaa 100644
--- a/sysdeps/generic/readlink.c
+++ b/io/readlink.c
diff --git a/sysdeps/generic/rmdir.c b/io/rmdir.c
index 5a16fd4284..5a16fd4284 100644
--- a/sysdeps/generic/rmdir.c
+++ b/io/rmdir.c
diff --git a/sysdeps/generic/sendfile.c b/io/sendfile.c
index 98dc9a814d..98dc9a814d 100644
--- a/sysdeps/generic/sendfile.c
+++ b/io/sendfile.c
diff --git a/sysdeps/generic/sendfile64.c b/io/sendfile64.c
index 76b961e22a..76b961e22a 100644
--- a/sysdeps/generic/sendfile64.c
+++ b/io/sendfile64.c
diff --git a/sysdeps/generic/statfs.c b/io/statfs.c
index af4a9ea4e5..af4a9ea4e5 100644
--- a/sysdeps/generic/statfs.c
+++ b/io/statfs.c
diff --git a/sysdeps/generic/statfs64.c b/io/statfs64.c
index cf1a7d82a4..cf1a7d82a4 100644
--- a/sysdeps/generic/statfs64.c
+++ b/io/statfs64.c
diff --git a/sysdeps/generic/statvfs.c b/io/statvfs.c
index 22e24cfeeb..22e24cfeeb 100644
--- a/sysdeps/generic/statvfs.c
+++ b/io/statvfs.c
diff --git a/sysdeps/generic/statvfs64.c b/io/statvfs64.c
index 4424abdbea..4424abdbea 100644
--- a/sysdeps/generic/statvfs64.c
+++ b/io/statvfs64.c
diff --git a/sysdeps/generic/symlink.c b/io/symlink.c
index e6c6709f1a..e6c6709f1a 100644
--- a/sysdeps/generic/symlink.c
+++ b/io/symlink.c
diff --git a/sysdeps/generic/ttyname.c b/io/ttyname.c
index 088ba918a8..088ba918a8 100644
--- a/sysdeps/generic/ttyname.c
+++ b/io/ttyname.c
diff --git a/sysdeps/generic/ttyname_r.c b/io/ttyname_r.c
index 14c1209096..14c1209096 100644
--- a/sysdeps/generic/ttyname_r.c
+++ b/io/ttyname_r.c
diff --git a/sysdeps/generic/umask.c b/io/umask.c
index 588d57e1ce..588d57e1ce 100644
--- a/sysdeps/generic/umask.c
+++ b/io/umask.c
diff --git a/sysdeps/generic/unlink.c b/io/unlink.c
index 1ec6d87ae1..1ec6d87ae1 100644
--- a/sysdeps/generic/unlink.c
+++ b/io/unlink.c
diff --git a/sysdeps/generic/unlinkat.c b/io/unlinkat.c
index f9a08b9903..f9a08b9903 100644
--- a/sysdeps/generic/unlinkat.c
+++ b/io/unlinkat.c
diff --git a/sysdeps/generic/utime.c b/io/utime.c
index 3a3bcc38cc..3a3bcc38cc 100644
--- a/sysdeps/generic/utime.c
+++ b/io/utime.c
diff --git a/sysdeps/generic/write.c b/io/write.c
index 928d43ced2..928d43ced2 100644
--- a/sysdeps/generic/write.c
+++ b/io/write.c
diff --git a/sysdeps/generic/xmknod.c b/io/xmknod.c
index c2daa46e07..c2daa46e07 100644
--- a/sysdeps/generic/xmknod.c
+++ b/io/xmknod.c
diff --git a/sysdeps/generic/xmknodat.c b/io/xmknodat.c
index 56d88c7b0f..56d88c7b0f 100644
--- a/sysdeps/generic/xmknodat.c
+++ b/io/xmknodat.c
diff --git a/sysdeps/generic/xstat.c b/io/xstat.c
index e7328cc10e..e7328cc10e 100644
--- a/sysdeps/generic/xstat.c
+++ b/io/xstat.c
diff --git a/sysdeps/generic/xstat64.c b/io/xstat64.c
index 2fb94cf331..2fb94cf331 100644
--- a/sysdeps/generic/xstat64.c
+++ b/io/xstat64.c
diff --git a/sysdeps/generic/libc_fatal.c b/libio/libc_fatal.c
index be23849829..be23849829 100644
--- a/sysdeps/generic/libc_fatal.c
+++ b/libio/libc_fatal.c
diff --git a/sysdeps/generic/endutxent.c b/login/endutxent.c
index 2a93081c83..2a93081c83 100644
--- a/sysdeps/generic/endutxent.c
+++ b/login/endutxent.c
diff --git a/sysdeps/generic/getpt.c b/login/getpt.c
index cd7107e5d6..cd7107e5d6 100644
--- a/sysdeps/generic/getpt.c
+++ b/login/getpt.c
diff --git a/sysdeps/generic/getutmp.c b/login/getutmp.c
index 275c1a8738..275c1a8738 100644
--- a/sysdeps/generic/getutmp.c
+++ b/login/getutmp.c
diff --git a/sysdeps/generic/getutmpx.c b/login/getutmpx.c
index 5f53f22e6c..5f53f22e6c 100644
--- a/sysdeps/generic/getutmpx.c
+++ b/login/getutmpx.c
diff --git a/sysdeps/generic/getutxent.c b/login/getutxent.c
index 4961dee051..4961dee051 100644
--- a/sysdeps/generic/getutxent.c
+++ b/login/getutxent.c
diff --git a/sysdeps/generic/getutxid.c b/login/getutxid.c
index ba9d5b79d8..ba9d5b79d8 100644
--- a/sysdeps/generic/getutxid.c
+++ b/login/getutxid.c
diff --git a/sysdeps/generic/getutxline.c b/login/getutxline.c
index 74149534c4..74149534c4 100644
--- a/sysdeps/generic/getutxline.c
+++ b/login/getutxline.c
diff --git a/sysdeps/generic/grantpt.c b/login/grantpt.c
index 65da95b308..65da95b308 100644
--- a/sysdeps/generic/grantpt.c
+++ b/login/grantpt.c
diff --git a/sysdeps/generic/ptsname.c b/login/ptsname.c
index c16e056a97..c16e056a97 100644
--- a/sysdeps/generic/ptsname.c
+++ b/login/ptsname.c
diff --git a/sysdeps/generic/pututxline.c b/login/pututxline.c
index 1ed5178862..1ed5178862 100644
--- a/sysdeps/generic/pututxline.c
+++ b/login/pututxline.c
diff --git a/sysdeps/generic/setutxent.c b/login/setutxent.c
index b6cd282644..b6cd282644 100644
--- a/sysdeps/generic/setutxent.c
+++ b/login/setutxent.c
diff --git a/sysdeps/generic/unlockpt.c b/login/unlockpt.c
index c5c4890f59..c5c4890f59 100644
--- a/sysdeps/generic/unlockpt.c
+++ b/login/unlockpt.c
diff --git a/sysdeps/generic/updwtmp.c b/login/updwtmp.c
index 415e1dbd42..415e1dbd42 100644
--- a/sysdeps/generic/updwtmp.c
+++ b/login/updwtmp.c
diff --git a/sysdeps/generic/updwtmpx.c b/login/updwtmpx.c
index 13a7045286..13a7045286 100644
--- a/sysdeps/generic/updwtmpx.c
+++ b/login/updwtmpx.c
diff --git a/sysdeps/generic/utmp_file.c b/login/utmp_file.c
index e7743bfac8..e7743bfac8 100644
--- a/sysdeps/generic/utmp_file.c
+++ b/login/utmp_file.c
diff --git a/sysdeps/generic/utmpxname.c b/login/utmpxname.c
index 06ff80b982..06ff80b982 100644
--- a/sysdeps/generic/utmpxname.c
+++ b/login/utmpxname.c
diff --git a/sysdeps/generic/mig-reply.c b/mach/mig-reply.c
index 3b02028858..3b02028858 100644
--- a/sysdeps/generic/mig-reply.c
+++ b/mach/mig-reply.c
diff --git a/sysdeps/generic/morecore.c b/malloc/morecore.c
index 0a66ef5a85..0a66ef5a85 100644
--- a/sysdeps/generic/morecore.c
+++ b/malloc/morecore.c
diff --git a/sysdeps/generic/e_log2l.c b/math/e_log2l.c
index 681904bfbb..681904bfbb 100644
--- a/sysdeps/generic/e_log2l.c
+++ b/math/e_log2l.c
diff --git a/sysdeps/generic/e_logl.c b/math/e_logl.c
index 9ba9cfc799..9ba9cfc799 100644
--- a/sysdeps/generic/e_logl.c
+++ b/math/e_logl.c
diff --git a/sysdeps/generic/e_powl.c b/math/e_powl.c
index afc2248b6b..afc2248b6b 100644
--- a/sysdeps/generic/e_powl.c
+++ b/math/e_powl.c
diff --git a/sysdeps/generic/e_rem_pio2l.c b/math/e_rem_pio2l.c
index 617215516b..617215516b 100644
--- a/sysdeps/generic/e_rem_pio2l.c
+++ b/math/e_rem_pio2l.c
diff --git a/sysdeps/generic/e_scalb.c b/math/e_scalb.c
index a7664db546..606af53724 100644
--- a/sysdeps/generic/e_scalb.c
+++ b/math/e_scalb.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: e_scalb.c,v 1.6 1995/05/10 20:46:09 jtc Exp $";
  */
 
 #include <fenv.h>
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef _SCALB_INT
diff --git a/sysdeps/generic/e_scalbf.c b/math/e_scalbf.c
index 5c6326bc16..95a72eb56d 100644
--- a/sysdeps/generic/e_scalbf.c
+++ b/math/e_scalbf.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: e_scalbf.c,v 1.3 1995/05/10 20:46:12 jtc Exp $";
 #endif
 
 #include <fenv.h>
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef _SCALB_INT
diff --git a/sysdeps/generic/e_scalbl.c b/math/e_scalbl.c
index a34369c0b5..1f5677d9f4 100644
--- a/sysdeps/generic/e_scalbl.c
+++ b/math/e_scalbl.c
@@ -25,7 +25,7 @@ static char rcsid[] = "$NetBSD: $";
  */
 
 #include <fenv.h>
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef _SCALB_INT
diff --git a/sysdeps/generic/e_sinhl.c b/math/e_sinhl.c
index 4cec79cb2d..4cec79cb2d 100644
--- a/sysdeps/generic/e_sinhl.c
+++ b/math/e_sinhl.c
diff --git a/sysdeps/generic/e_sqrtl.c b/math/e_sqrtl.c
index 7680bdb145..7680bdb145 100644
--- a/sysdeps/generic/e_sqrtl.c
+++ b/math/e_sqrtl.c
diff --git a/sysdeps/generic/fclrexcpt.c b/math/fclrexcpt.c
index 560e326ee3..560e326ee3 100644
--- a/sysdeps/generic/fclrexcpt.c
+++ b/math/fclrexcpt.c
diff --git a/sysdeps/generic/fedisblxcpt.c b/math/fedisblxcpt.c
index e1e9065aac..e1e9065aac 100644
--- a/sysdeps/generic/fedisblxcpt.c
+++ b/math/fedisblxcpt.c
diff --git a/sysdeps/generic/feenablxcpt.c b/math/feenablxcpt.c
index 678271f360..678271f360 100644
--- a/sysdeps/generic/feenablxcpt.c
+++ b/math/feenablxcpt.c
diff --git a/sysdeps/generic/fegetenv.c b/math/fegetenv.c
index 4a878cc41b..4a878cc41b 100644
--- a/sysdeps/generic/fegetenv.c
+++ b/math/fegetenv.c
diff --git a/sysdeps/generic/fegetexcept.c b/math/fegetexcept.c
index 1870689e8d..1870689e8d 100644
--- a/sysdeps/generic/fegetexcept.c
+++ b/math/fegetexcept.c
diff --git a/sysdeps/generic/fegetround.c b/math/fegetround.c
index cf7a774929..cf7a774929 100644
--- a/sysdeps/generic/fegetround.c
+++ b/math/fegetround.c
diff --git a/sysdeps/generic/feholdexcpt.c b/math/feholdexcpt.c
index 8680d1e492..8680d1e492 100644
--- a/sysdeps/generic/feholdexcpt.c
+++ b/math/feholdexcpt.c
diff --git a/sysdeps/generic/fesetenv.c b/math/fesetenv.c
index 936d6c121b..936d6c121b 100644
--- a/sysdeps/generic/fesetenv.c
+++ b/math/fesetenv.c
diff --git a/sysdeps/generic/fesetround.c b/math/fesetround.c
index 5b14826390..5b14826390 100644
--- a/sysdeps/generic/fesetround.c
+++ b/math/fesetround.c
diff --git a/sysdeps/generic/feupdateenv.c b/math/feupdateenv.c
index 3e6aed4fdf..3e6aed4fdf 100644
--- a/sysdeps/generic/feupdateenv.c
+++ b/math/feupdateenv.c
diff --git a/sysdeps/generic/fgetexcptflg.c b/math/fgetexcptflg.c
index aea2e0ffaf..aea2e0ffaf 100644
--- a/sysdeps/generic/fgetexcptflg.c
+++ b/math/fgetexcptflg.c
diff --git a/sysdeps/generic/fpu_control.c b/math/fpu_control.c
index cd8eeff99d..cd8eeff99d 100644
--- a/sysdeps/generic/fpu_control.c
+++ b/math/fpu_control.c
diff --git a/sysdeps/generic/fraiseexcpt.c b/math/fraiseexcpt.c
index 764634a3b1..764634a3b1 100644
--- a/sysdeps/generic/fraiseexcpt.c
+++ b/math/fraiseexcpt.c
diff --git a/sysdeps/generic/fsetexcptflg.c b/math/fsetexcptflg.c
index 8d0f0ff64b..8d0f0ff64b 100644
--- a/sysdeps/generic/fsetexcptflg.c
+++ b/math/fsetexcptflg.c
diff --git a/sysdeps/generic/ftestexcept.c b/math/ftestexcept.c
index 4be3fb770f..4be3fb770f 100644
--- a/sysdeps/generic/ftestexcept.c
+++ b/math/ftestexcept.c
diff --git a/sysdeps/generic/k_cosl.c b/math/k_cosl.c
index 29b83d6273..29b83d6273 100644
--- a/sysdeps/generic/k_cosl.c
+++ b/math/k_cosl.c
diff --git a/sysdeps/generic/k_rem_pio2l.c b/math/k_rem_pio2l.c
index 236eb30dd9..236eb30dd9 100644
--- a/sysdeps/generic/k_rem_pio2l.c
+++ b/math/k_rem_pio2l.c
diff --git a/sysdeps/generic/k_sincosl.c b/math/k_sincosl.c
index aa038c26c4..aa038c26c4 100644
--- a/sysdeps/generic/k_sincosl.c
+++ b/math/k_sincosl.c
diff --git a/sysdeps/generic/k_sinl.c b/math/k_sinl.c
index ea1d71f61b..ea1d71f61b 100644
--- a/sysdeps/generic/k_sinl.c
+++ b/math/k_sinl.c
diff --git a/sysdeps/generic/k_tanl.c b/math/k_tanl.c
index 9993c6b998..9993c6b998 100644
--- a/sysdeps/generic/k_tanl.c
+++ b/math/k_tanl.c
diff --git a/sysdeps/generic/s_asinhl.c b/math/s_asinhl.c
index 1d5cf47a4f..1d5cf47a4f 100644
--- a/sysdeps/generic/s_asinhl.c
+++ b/math/s_asinhl.c
diff --git a/sysdeps/generic/s_atanl.c b/math/s_atanl.c
index d9a7eb6f8f..d9a7eb6f8f 100644
--- a/sysdeps/generic/s_atanl.c
+++ b/math/s_atanl.c
diff --git a/sysdeps/generic/s_cacos.c b/math/s_cacos.c
index 07b6bdcb9c..07b6bdcb9c 100644
--- a/sysdeps/generic/s_cacos.c
+++ b/math/s_cacos.c
diff --git a/sysdeps/generic/s_cacosf.c b/math/s_cacosf.c
index 265184e38d..265184e38d 100644
--- a/sysdeps/generic/s_cacosf.c
+++ b/math/s_cacosf.c
diff --git a/sysdeps/generic/s_cacosh.c b/math/s_cacosh.c
index 1ae8708d49..1ae8708d49 100644
--- a/sysdeps/generic/s_cacosh.c
+++ b/math/s_cacosh.c
diff --git a/sysdeps/generic/s_cacoshf.c b/math/s_cacoshf.c
index 52c35505e0..52c35505e0 100644
--- a/sysdeps/generic/s_cacoshf.c
+++ b/math/s_cacoshf.c
diff --git a/sysdeps/generic/s_cacoshl.c b/math/s_cacoshl.c
index 4e5e2b3e3e..4e5e2b3e3e 100644
--- a/sysdeps/generic/s_cacoshl.c
+++ b/math/s_cacoshl.c
diff --git a/sysdeps/generic/s_cacosl.c b/math/s_cacosl.c
index a7ceff891b..a7ceff891b 100644
--- a/sysdeps/generic/s_cacosl.c
+++ b/math/s_cacosl.c
diff --git a/sysdeps/generic/s_casin.c b/math/s_casin.c
index 2d5b06cf78..2d5b06cf78 100644
--- a/sysdeps/generic/s_casin.c
+++ b/math/s_casin.c
diff --git a/sysdeps/generic/s_casinf.c b/math/s_casinf.c
index 5278dbbf78..5278dbbf78 100644
--- a/sysdeps/generic/s_casinf.c
+++ b/math/s_casinf.c
diff --git a/sysdeps/generic/s_casinh.c b/math/s_casinh.c
index a574add70e..a574add70e 100644
--- a/sysdeps/generic/s_casinh.c
+++ b/math/s_casinh.c
diff --git a/sysdeps/generic/s_casinhf.c b/math/s_casinhf.c
index 7037ab937c..7037ab937c 100644
--- a/sysdeps/generic/s_casinhf.c
+++ b/math/s_casinhf.c
diff --git a/sysdeps/generic/s_casinhl.c b/math/s_casinhl.c
index 376b2347a0..376b2347a0 100644
--- a/sysdeps/generic/s_casinhl.c
+++ b/math/s_casinhl.c
diff --git a/sysdeps/generic/s_casinl.c b/math/s_casinl.c
index f303c05ae6..f303c05ae6 100644
--- a/sysdeps/generic/s_casinl.c
+++ b/math/s_casinl.c
diff --git a/sysdeps/generic/s_catan.c b/math/s_catan.c
index 1d0673ad6a..1d0673ad6a 100644
--- a/sysdeps/generic/s_catan.c
+++ b/math/s_catan.c
diff --git a/sysdeps/generic/s_catanf.c b/math/s_catanf.c
index 25eec2b1b5..25eec2b1b5 100644
--- a/sysdeps/generic/s_catanf.c
+++ b/math/s_catanf.c
diff --git a/sysdeps/generic/s_catanh.c b/math/s_catanh.c
index e15c073f96..e15c073f96 100644
--- a/sysdeps/generic/s_catanh.c
+++ b/math/s_catanh.c
diff --git a/sysdeps/generic/s_catanhf.c b/math/s_catanhf.c
index d2422e6111..d2422e6111 100644
--- a/sysdeps/generic/s_catanhf.c
+++ b/math/s_catanhf.c
diff --git a/sysdeps/generic/s_catanhl.c b/math/s_catanhl.c
index c3fb0ce5ff..c3fb0ce5ff 100644
--- a/sysdeps/generic/s_catanhl.c
+++ b/math/s_catanhl.c
diff --git a/sysdeps/generic/s_catanl.c b/math/s_catanl.c
index 6cb45e5bee..6cb45e5bee 100644
--- a/sysdeps/generic/s_catanl.c
+++ b/math/s_catanl.c
diff --git a/sysdeps/generic/s_cbrtl.c b/math/s_cbrtl.c
index d668e377af..d668e377af 100644
--- a/sysdeps/generic/s_cbrtl.c
+++ b/math/s_cbrtl.c
diff --git a/sysdeps/generic/s_ccos.c b/math/s_ccos.c
index 1b244d7079..1b244d7079 100644
--- a/sysdeps/generic/s_ccos.c
+++ b/math/s_ccos.c
diff --git a/sysdeps/generic/s_ccosf.c b/math/s_ccosf.c
index 4b154deac5..4b154deac5 100644
--- a/sysdeps/generic/s_ccosf.c
+++ b/math/s_ccosf.c
diff --git a/sysdeps/generic/s_ccosh.c b/math/s_ccosh.c
index f5b29db24b..f5b29db24b 100644
--- a/sysdeps/generic/s_ccosh.c
+++ b/math/s_ccosh.c
diff --git a/sysdeps/generic/s_ccoshf.c b/math/s_ccoshf.c
index f400d34f0b..f400d34f0b 100644
--- a/sysdeps/generic/s_ccoshf.c
+++ b/math/s_ccoshf.c
diff --git a/sysdeps/generic/s_ccoshl.c b/math/s_ccoshl.c
index 61ffb49ca0..61ffb49ca0 100644
--- a/sysdeps/generic/s_ccoshl.c
+++ b/math/s_ccoshl.c
diff --git a/sysdeps/generic/s_ccosl.c b/math/s_ccosl.c
index 4ebe2c347d..4ebe2c347d 100644
--- a/sysdeps/generic/s_ccosl.c
+++ b/math/s_ccosl.c
diff --git a/sysdeps/generic/s_cexp.c b/math/s_cexp.c
index 5a299b7687..5a299b7687 100644
--- a/sysdeps/generic/s_cexp.c
+++ b/math/s_cexp.c
diff --git a/sysdeps/generic/s_cexpf.c b/math/s_cexpf.c
index 7b68fc365c..7b68fc365c 100644
--- a/sysdeps/generic/s_cexpf.c
+++ b/math/s_cexpf.c
diff --git a/sysdeps/generic/s_cexpl.c b/math/s_cexpl.c
index cf6bc974a9..cf6bc974a9 100644
--- a/sysdeps/generic/s_cexpl.c
+++ b/math/s_cexpl.c
diff --git a/sysdeps/generic/s_clog.c b/math/s_clog.c
index f796024b47..f796024b47 100644
--- a/sysdeps/generic/s_clog.c
+++ b/math/s_clog.c
diff --git a/sysdeps/generic/s_clog10.c b/math/s_clog10.c
index 62c2ca724a..62c2ca724a 100644
--- a/sysdeps/generic/s_clog10.c
+++ b/math/s_clog10.c
diff --git a/sysdeps/generic/s_clog10f.c b/math/s_clog10f.c
index eed81f368c..eed81f368c 100644
--- a/sysdeps/generic/s_clog10f.c
+++ b/math/s_clog10f.c
diff --git a/sysdeps/generic/s_clog10l.c b/math/s_clog10l.c
index f901543d05..f901543d05 100644
--- a/sysdeps/generic/s_clog10l.c
+++ b/math/s_clog10l.c
diff --git a/sysdeps/generic/s_clogf.c b/math/s_clogf.c
index 21e3b57b7f..21e3b57b7f 100644
--- a/sysdeps/generic/s_clogf.c
+++ b/math/s_clogf.c
diff --git a/sysdeps/generic/s_clogl.c b/math/s_clogl.c
index 43118f768c..43118f768c 100644
--- a/sysdeps/generic/s_clogl.c
+++ b/math/s_clogl.c
diff --git a/sysdeps/generic/s_cpow.c b/math/s_cpow.c
index 86536cc95b..86536cc95b 100644
--- a/sysdeps/generic/s_cpow.c
+++ b/math/s_cpow.c
diff --git a/sysdeps/generic/s_cpowf.c b/math/s_cpowf.c
index 58eaa1aa06..58eaa1aa06 100644
--- a/sysdeps/generic/s_cpowf.c
+++ b/math/s_cpowf.c
diff --git a/sysdeps/generic/s_cpowl.c b/math/s_cpowl.c
index 4c358b3ebe..4c358b3ebe 100644
--- a/sysdeps/generic/s_cpowl.c
+++ b/math/s_cpowl.c
diff --git a/sysdeps/generic/s_cproj.c b/math/s_cproj.c
index 8e7ca41df8..8e7ca41df8 100644
--- a/sysdeps/generic/s_cproj.c
+++ b/math/s_cproj.c
diff --git a/sysdeps/generic/s_cprojf.c b/math/s_cprojf.c
index 83df13cfa9..83df13cfa9 100644
--- a/sysdeps/generic/s_cprojf.c
+++ b/math/s_cprojf.c
diff --git a/sysdeps/generic/s_cprojl.c b/math/s_cprojl.c
index c70cdc47db..c70cdc47db 100644
--- a/sysdeps/generic/s_cprojl.c
+++ b/math/s_cprojl.c
diff --git a/sysdeps/generic/s_csin.c b/math/s_csin.c
index eb380e2c3f..eb380e2c3f 100644
--- a/sysdeps/generic/s_csin.c
+++ b/math/s_csin.c
diff --git a/sysdeps/generic/s_csinf.c b/math/s_csinf.c
index 8004743bd3..8004743bd3 100644
--- a/sysdeps/generic/s_csinf.c
+++ b/math/s_csinf.c
diff --git a/sysdeps/generic/s_csinh.c b/math/s_csinh.c
index f0e0cc61f1..f0e0cc61f1 100644
--- a/sysdeps/generic/s_csinh.c
+++ b/math/s_csinh.c
diff --git a/sysdeps/generic/s_csinhf.c b/math/s_csinhf.c
index e4bb704268..e4bb704268 100644
--- a/sysdeps/generic/s_csinhf.c
+++ b/math/s_csinhf.c
diff --git a/sysdeps/generic/s_csinhl.c b/math/s_csinhl.c
index 226075634d..226075634d 100644
--- a/sysdeps/generic/s_csinhl.c
+++ b/math/s_csinhl.c
diff --git a/sysdeps/generic/s_csinl.c b/math/s_csinl.c
index f7a1c43600..f7a1c43600 100644
--- a/sysdeps/generic/s_csinl.c
+++ b/math/s_csinl.c
diff --git a/sysdeps/generic/s_csqrt.c b/math/s_csqrt.c
index 04ed410a16..04ed410a16 100644
--- a/sysdeps/generic/s_csqrt.c
+++ b/math/s_csqrt.c
diff --git a/sysdeps/generic/s_csqrtf.c b/math/s_csqrtf.c
index 2fba69ce1b..2fba69ce1b 100644
--- a/sysdeps/generic/s_csqrtf.c
+++ b/math/s_csqrtf.c
diff --git a/sysdeps/generic/s_csqrtl.c b/math/s_csqrtl.c
index 9d00946c51..9d00946c51 100644
--- a/sysdeps/generic/s_csqrtl.c
+++ b/math/s_csqrtl.c
diff --git a/sysdeps/generic/s_ctan.c b/math/s_ctan.c
index 0464ab86d5..0464ab86d5 100644
--- a/sysdeps/generic/s_ctan.c
+++ b/math/s_ctan.c
diff --git a/sysdeps/generic/s_ctanf.c b/math/s_ctanf.c
index 58d9d13298..58d9d13298 100644
--- a/sysdeps/generic/s_ctanf.c
+++ b/math/s_ctanf.c
diff --git a/sysdeps/generic/s_ctanh.c b/math/s_ctanh.c
index fe38dae291..fe38dae291 100644
--- a/sysdeps/generic/s_ctanh.c
+++ b/math/s_ctanh.c
diff --git a/sysdeps/generic/s_ctanhf.c b/math/s_ctanhf.c
index c331dbaabb..c331dbaabb 100644
--- a/sysdeps/generic/s_ctanhf.c
+++ b/math/s_ctanhf.c
diff --git a/sysdeps/generic/s_ctanhl.c b/math/s_ctanhl.c
index 77ca8f8717..77ca8f8717 100644
--- a/sysdeps/generic/s_ctanhl.c
+++ b/math/s_ctanhl.c
diff --git a/sysdeps/generic/s_ctanl.c b/math/s_ctanl.c
index 89379a5ff9..89379a5ff9 100644
--- a/sysdeps/generic/s_ctanl.c
+++ b/math/s_ctanl.c
diff --git a/sysdeps/generic/s_erfl.c b/math/s_erfl.c
index f329d58809..f329d58809 100644
--- a/sysdeps/generic/s_erfl.c
+++ b/math/s_erfl.c
diff --git a/sysdeps/generic/s_expm1l.c b/math/s_expm1l.c
index b69d6aeb97..b69d6aeb97 100644
--- a/sysdeps/generic/s_expm1l.c
+++ b/math/s_expm1l.c
diff --git a/sysdeps/generic/s_fdim.c b/math/s_fdim.c
index 5804e631c3..5804e631c3 100644
--- a/sysdeps/generic/s_fdim.c
+++ b/math/s_fdim.c
diff --git a/sysdeps/generic/s_fdimf.c b/math/s_fdimf.c
index 2f3ce303ae..2f3ce303ae 100644
--- a/sysdeps/generic/s_fdimf.c
+++ b/math/s_fdimf.c
diff --git a/sysdeps/generic/s_fdiml.c b/math/s_fdiml.c
index 70246bafbd..70246bafbd 100644
--- a/sysdeps/generic/s_fdiml.c
+++ b/math/s_fdiml.c
diff --git a/sysdeps/generic/s_fma.c b/math/s_fma.c
index e5ff5a7228..e5ff5a7228 100644
--- a/sysdeps/generic/s_fma.c
+++ b/math/s_fma.c
diff --git a/sysdeps/generic/s_fmaf.c b/math/s_fmaf.c
index caa7f3afe8..caa7f3afe8 100644
--- a/sysdeps/generic/s_fmaf.c
+++ b/math/s_fmaf.c
diff --git a/sysdeps/generic/s_fmal.c b/math/s_fmal.c
index b89e88b9a3..b89e88b9a3 100644
--- a/sysdeps/generic/s_fmal.c
+++ b/math/s_fmal.c
diff --git a/sysdeps/generic/s_fmax.c b/math/s_fmax.c
index f93e14f28c..f93e14f28c 100644
--- a/sysdeps/generic/s_fmax.c
+++ b/math/s_fmax.c
diff --git a/sysdeps/generic/s_fmaxf.c b/math/s_fmaxf.c
index 6f368e18b0..6f368e18b0 100644
--- a/sysdeps/generic/s_fmaxf.c
+++ b/math/s_fmaxf.c
diff --git a/sysdeps/generic/s_fmaxl.c b/math/s_fmaxl.c
index 68c7060f42..68c7060f42 100644
--- a/sysdeps/generic/s_fmaxl.c
+++ b/math/s_fmaxl.c
diff --git a/sysdeps/generic/s_fmin.c b/math/s_fmin.c
index 78f02da74a..78f02da74a 100644
--- a/sysdeps/generic/s_fmin.c
+++ b/math/s_fmin.c
diff --git a/sysdeps/generic/s_fminf.c b/math/s_fminf.c
index d6aa9ccf62..d6aa9ccf62 100644
--- a/sysdeps/generic/s_fminf.c
+++ b/math/s_fminf.c
diff --git a/sysdeps/generic/s_fminl.c b/math/s_fminl.c
index 5c1610aa85..5c1610aa85 100644
--- a/sysdeps/generic/s_fminl.c
+++ b/math/s_fminl.c
diff --git a/sysdeps/generic/s_ldexp.c b/math/s_ldexp.c
index 12c336fad4..62e123cd01 100644
--- a/sysdeps/generic/s_ldexp.c
+++ b/math/s_ldexp.c
@@ -14,7 +14,7 @@
 static char rcsid[] = "$NetBSD: s_ldexp.c,v 1.6 1995/05/10 20:47:40 jtc Exp $";
 #endif
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 #include <errno.h>
 
diff --git a/sysdeps/generic/s_ldexpf.c b/math/s_ldexpf.c
index 631db422a3..1ea5e09f8f 100644
--- a/sysdeps/generic/s_ldexpf.c
+++ b/math/s_ldexpf.c
@@ -17,7 +17,7 @@
 static char rcsid[] = "$NetBSD: s_ldexpf.c,v 1.3 1995/05/10 20:47:42 jtc Exp $";
 #endif
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 #include <errno.h>
 
diff --git a/sysdeps/generic/s_ldexpl.c b/math/s_ldexpl.c
index 123a6b3b58..df8b29f94d 100644
--- a/sysdeps/generic/s_ldexpl.c
+++ b/math/s_ldexpl.c
@@ -18,7 +18,7 @@
 static char rcsid[] = "$NetBSD: $";
 #endif
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 #include <errno.h>
 
diff --git a/sysdeps/generic/s_log1pl.c b/math/s_log1pl.c
index e5db9078bf..e5db9078bf 100644
--- a/sysdeps/generic/s_log1pl.c
+++ b/math/s_log1pl.c
diff --git a/sysdeps/generic/s_nan.c b/math/s_nan.c
index 9b2c50558b..9b2c50558b 100644
--- a/sysdeps/generic/s_nan.c
+++ b/math/s_nan.c
diff --git a/sysdeps/generic/s_nanf.c b/math/s_nanf.c
index 2e1b1eb911..2e1b1eb911 100644
--- a/sysdeps/generic/s_nanf.c
+++ b/math/s_nanf.c
diff --git a/sysdeps/generic/s_nanl.c b/math/s_nanl.c
index 9709b92383..9709b92383 100644
--- a/sysdeps/generic/s_nanl.c
+++ b/math/s_nanl.c
diff --git a/sysdeps/generic/s_nextafter.c b/math/s_nextafter.c
index c2d799d5df..9c678b79c5 100644
--- a/sysdeps/generic/s_nextafter.c
+++ b/math/s_nextafter.c
@@ -25,7 +25,7 @@ static char rcsid[] = "$NetBSD: s_nextafter.c,v 1.8 1995/05/10 20:47:58 jtc Exp
 #define __nexttoward __internal___nexttoward
 #define nexttoward __internal_nexttoward
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 #include <float.h>
 
diff --git a/sysdeps/generic/s_nexttowardf.c b/math/s_nexttowardf.c
index 4f502c210e..1a1026612e 100644
--- a/sysdeps/generic/s_nexttowardf.c
+++ b/math/s_nexttowardf.c
@@ -20,7 +20,7 @@
  *   Special cases:
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 #include <float.h>
 
diff --git a/sysdeps/generic/s_nexttowardl.c b/math/s_nexttowardl.c
index 73c3610fc1..73c3610fc1 100644
--- a/sysdeps/generic/s_nexttowardl.c
+++ b/math/s_nexttowardl.c
diff --git a/sysdeps/generic/s_significand.c b/math/s_significand.c
index f95b6481c2..4a02dbcba1 100644
--- a/sysdeps/generic/s_significand.c
+++ b/math/s_significand.c
@@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: s_significand.c,v 1.6 1995/05/10 20:48:11 jtc Ex
  * for exercising the fraction-part(F) IEEE 754-1985 test vector.
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/s_significandf.c b/math/s_significandf.c
index cf5eb59efc..69de1e6b0e 100644
--- a/sysdeps/generic/s_significandf.c
+++ b/math/s_significandf.c
@@ -17,7 +17,7 @@
 static char rcsid[] = "$NetBSD: s_significandf.c,v 1.3 1995/05/10 20:48:13 jtc Exp $";
 #endif
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/s_significandl.c b/math/s_significandl.c
index d84e806fdc..9fa0e4ff91 100644
--- a/sysdeps/generic/s_significandl.c
+++ b/math/s_significandl.c
@@ -24,7 +24,7 @@ static char rcsid[] = "$NetBSD: $";
  * for exercising the fraction-part(F) IEEE 754-1985 test vector.
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/s_tanhl.c b/math/s_tanhl.c
index bc9a2d7f48..bc9a2d7f48 100644
--- a/sysdeps/generic/s_tanhl.c
+++ b/math/s_tanhl.c
diff --git a/sysdeps/generic/setfpucw.c b/math/setfpucw.c
index cb50f9f3f1..cb50f9f3f1 100644
--- a/sysdeps/generic/setfpucw.c
+++ b/math/setfpucw.c
diff --git a/sysdeps/generic/t_sincosl.c b/math/t_sincosl.c
index 6b271e6ff1..6b271e6ff1 100644
--- a/sysdeps/generic/t_sincosl.c
+++ b/math/t_sincosl.c
diff --git a/sysdeps/generic/w_acos.c b/math/w_acos.c
index 5a1158ea7a..f4e6e3c910 100644
--- a/sysdeps/generic/w_acos.c
+++ b/math/w_acos.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_acos.c,v 1.6 1995/05/10 20:48:26 jtc Exp $";
  * wrap_acos(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_acosf.c b/math/w_acosf.c
index 28260ddd3e..a8998efb84 100644
--- a/sysdeps/generic/w_acosf.c
+++ b/math/w_acosf.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_acosf.c,v 1.3 1995/05/10 20:48:29 jtc Exp $";
  * wrap_acosf(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_acosh.c b/math/w_acosh.c
index 2b5d60f7ea..e8322ec667 100644
--- a/sysdeps/generic/w_acosh.c
+++ b/math/w_acosh.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_acosh.c,v 1.6 1995/05/10 20:48:31 jtc Exp $";
  * wrapper acosh(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_acoshf.c b/math/w_acoshf.c
index f701983dc2..62f94b80e7 100644
--- a/sysdeps/generic/w_acoshf.c
+++ b/math/w_acoshf.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: w_acoshf.c,v 1.3 1995/05/10 20:48:33 jtc Exp $";
  * wrapper acoshf(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_acoshl.c b/math/w_acoshl.c
index a37d4c15d9..ae67911ae5 100644
--- a/sysdeps/generic/w_acoshl.c
+++ b/math/w_acoshl.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper acoshl(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_acosl.c b/math/w_acosl.c
index cd9cecf2f9..9ab4de899f 100644
--- a/sysdeps/generic/w_acosl.c
+++ b/math/w_acosl.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrap_acosl(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_asin.c b/math/w_asin.c
index a7ca4ef9fd..d531fbd26a 100644
--- a/sysdeps/generic/w_asin.c
+++ b/math/w_asin.c
@@ -19,7 +19,7 @@ static char rcsid[] = "$NetBSD: w_asin.c,v 1.6 1995/05/10 20:48:35 jtc Exp $";
  */
 
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_asinf.c b/math/w_asinf.c
index d7f7a253b0..b19b5c54e3 100644
--- a/sysdeps/generic/w_asinf.c
+++ b/math/w_asinf.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: w_asinf.c,v 1.3 1995/05/10 20:48:37 jtc Exp $";
  */
 
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_asinl.c b/math/w_asinl.c
index 0ac3038e95..fb5ee35fc0 100644
--- a/sysdeps/generic/w_asinl.c
+++ b/math/w_asinl.c
@@ -23,7 +23,7 @@ static char rcsid[] = "$NetBSD: $";
  */
 
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_atan2.c b/math/w_atan2.c
index 801baa2347..f0a10d4102 100644
--- a/sysdeps/generic/w_atan2.c
+++ b/math/w_atan2.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_atan2.c,v 1.6 1995/05/10 20:48:39 jtc Exp $";
  * wrapper atan2(y,x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_atan2f.c b/math/w_atan2f.c
index 09caa06f00..efb08f076b 100644
--- a/sysdeps/generic/w_atan2f.c
+++ b/math/w_atan2f.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_atan2f.c,v 1.3 1995/05/10 20:48:42 jtc Exp $";
  * wrapper atan2f(y,x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_atan2l.c b/math/w_atan2l.c
index 2897c8c5f9..9672e9615f 100644
--- a/sysdeps/generic/w_atan2l.c
+++ b/math/w_atan2l.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper atan2l(y,x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_atanh.c b/math/w_atanh.c
index e7995b1830..b81f65c311 100644
--- a/sysdeps/generic/w_atanh.c
+++ b/math/w_atanh.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_atanh.c,v 1.6 1995/05/10 20:48:43 jtc Exp $";
  * wrapper atanh(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_atanhf.c b/math/w_atanhf.c
index 0b24f2c71a..52a144c05a 100644
--- a/sysdeps/generic/w_atanhf.c
+++ b/math/w_atanhf.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_atanhf.c,v 1.3 1995/05/10 20:48:45 jtc Exp $";
  * wrapper atanhf(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_atanhl.c b/math/w_atanhl.c
index d675fc6fe7..5ce53b847d 100644
--- a/sysdeps/generic/w_atanhl.c
+++ b/math/w_atanhl.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper atanhl(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_cosh.c b/math/w_cosh.c
index 709f485c6d..033a034059 100644
--- a/sysdeps/generic/w_cosh.c
+++ b/math/w_cosh.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_cosh.c,v 1.6 1995/05/10 20:48:47 jtc Exp $";
  * wrapper cosh(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_coshf.c b/math/w_coshf.c
index c38fd1d93f..8e24ca9adc 100644
--- a/sysdeps/generic/w_coshf.c
+++ b/math/w_coshf.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_coshf.c,v 1.3 1995/05/10 20:48:49 jtc Exp $";
  * wrapper coshf(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_coshl.c b/math/w_coshl.c
index cc1929a9ec..5f4623a81a 100644
--- a/sysdeps/generic/w_coshl.c
+++ b/math/w_coshl.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper coshl(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_drem.c b/math/w_drem.c
index 9e2b1e7472..9e2b1e7472 100644
--- a/sysdeps/generic/w_drem.c
+++ b/math/w_drem.c
diff --git a/sysdeps/generic/w_dremf.c b/math/w_dremf.c
index b740ea304c..c3d391d634 100644
--- a/sysdeps/generic/w_dremf.c
+++ b/math/w_dremf.c
@@ -5,7 +5,7 @@
  * Placed into the Public Domain, 1994.
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 float
diff --git a/sysdeps/generic/w_dreml.c b/math/w_dreml.c
index aa73eedc49..aa73eedc49 100644
--- a/sysdeps/generic/w_dreml.c
+++ b/math/w_dreml.c
diff --git a/sysdeps/generic/w_exp10.c b/math/w_exp10.c
index 597506f22f..9447d8fa2a 100644
--- a/sysdeps/generic/w_exp10.c
+++ b/math/w_exp10.c
@@ -17,7 +17,7 @@
  * wrapper exp10(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_exp10f.c b/math/w_exp10f.c
index 1c510a3bfa..78e71be069 100644
--- a/sysdeps/generic/w_exp10f.c
+++ b/math/w_exp10f.c
@@ -17,7 +17,7 @@
  * wrapper expf10(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_exp10l.c b/math/w_exp10l.c
index aebddcb201..368ed77304 100644
--- a/sysdeps/generic/w_exp10l.c
+++ b/math/w_exp10l.c
@@ -18,7 +18,7 @@
  * wrapper exp10l(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_exp2.c b/math/w_exp2.c
index ccf6a1cd6a..446e5ea91c 100644
--- a/sysdeps/generic/w_exp2.c
+++ b/math/w_exp2.c
@@ -3,7 +3,7 @@
  */
 
 #include <float.h>
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 static const double o_threshold= (double) DBL_MAX_EXP;
diff --git a/sysdeps/generic/w_exp2f.c b/math/w_exp2f.c
index 13cfc9a19f..9120c88b60 100644
--- a/sysdeps/generic/w_exp2f.c
+++ b/math/w_exp2f.c
@@ -3,7 +3,7 @@
  */
 
 #include <float.h>
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 static const float o_threshold= (float) FLT_MAX_EXP;
diff --git a/sysdeps/generic/w_exp2l.c b/math/w_exp2l.c
index f492301223..fea5425ac4 100644
--- a/sysdeps/generic/w_exp2l.c
+++ b/math/w_exp2l.c
@@ -3,7 +3,7 @@
  */
 
 #include <float.h>
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 static const long double o_threshold = (long double) LDBL_MAX_EXP;
diff --git a/sysdeps/generic/w_expl.c b/math/w_expl.c
index 70096a820c..70096a820c 100644
--- a/sysdeps/generic/w_expl.c
+++ b/math/w_expl.c
diff --git a/sysdeps/generic/w_fmod.c b/math/w_fmod.c
index 0ceeb98c55..43a1d8ef5c 100644
--- a/sysdeps/generic/w_fmod.c
+++ b/math/w_fmod.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_fmod.c,v 1.6 1995/05/10 20:48:55 jtc Exp $";
  * wrapper fmod(x,y)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_fmodf.c b/math/w_fmodf.c
index 9afe5ddfdd..2bd133f2d7 100644
--- a/sysdeps/generic/w_fmodf.c
+++ b/math/w_fmodf.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_fmodf.c,v 1.3 1995/05/10 20:48:57 jtc Exp $";
  * wrapper fmodf(x,y)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_fmodl.c b/math/w_fmodl.c
index 71ed4a94a4..7b9a297cfd 100644
--- a/sysdeps/generic/w_fmodl.c
+++ b/math/w_fmodl.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper fmodl(x,y)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_hypot.c b/math/w_hypot.c
index e91db17083..ab929f78ad 100644
--- a/sysdeps/generic/w_hypot.c
+++ b/math/w_hypot.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_hypot.c,v 1.6 1995/05/10 20:49:07 jtc Exp $";
  * wrapper hypot(x,y)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_hypotf.c b/math/w_hypotf.c
index a7e5c1fdb6..b6be39e39f 100644
--- a/sysdeps/generic/w_hypotf.c
+++ b/math/w_hypotf.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_hypotf.c,v 1.3 1995/05/10 20:49:09 jtc Exp $";
  * wrapper hypotf(x,y)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_hypotl.c b/math/w_hypotl.c
index 2ec215fd13..916afbd417 100644
--- a/sysdeps/generic/w_hypotl.c
+++ b/math/w_hypotl.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper hypotl(x,y)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_j0.c b/math/w_j0.c
index 5a018760bb..5ab3544aa7 100644
--- a/sysdeps/generic/w_j0.c
+++ b/math/w_j0.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_j0.c,v 1.6 1995/05/10 20:49:11 jtc Exp $";
  * wrapper j0(double x), y0(double x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_j0f.c b/math/w_j0f.c
index 32e2eebb56..bb2b82f060 100644
--- a/sysdeps/generic/w_j0f.c
+++ b/math/w_j0f.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_j0f.c,v 1.3 1995/05/10 20:49:13 jtc Exp $";
  * wrapper j0f(float x), y0f(float x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_j0l.c b/math/w_j0l.c
index b74d9ddcff..fde0f64f89 100644
--- a/sysdeps/generic/w_j0l.c
+++ b/math/w_j0l.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper j0l(long double x), y0l(long double x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_j1.c b/math/w_j1.c
index 39fe8543b1..db8c4ce333 100644
--- a/sysdeps/generic/w_j1.c
+++ b/math/w_j1.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_j1.c,v 1.6 1995/05/10 20:49:15 jtc Exp $";
  * wrapper of j1,y1
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_j1f.c b/math/w_j1f.c
index 2a7c8db819..35b186206e 100644
--- a/sysdeps/generic/w_j1f.c
+++ b/math/w_j1f.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_j1f.c,v 1.3 1995/05/10 20:49:17 jtc Exp $";
  * wrapper of j1f,y1f
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_j1l.c b/math/w_j1l.c
index 49a486cf8e..5ecfd1ec6e 100644
--- a/sysdeps/generic/w_j1l.c
+++ b/math/w_j1l.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper of j1l,y1l
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_jn.c b/math/w_jn.c
index 85fc383fb7..3a28443dcf 100644
--- a/sysdeps/generic/w_jn.c
+++ b/math/w_jn.c
@@ -40,7 +40,7 @@ static char rcsid[] = "$NetBSD: w_jn.c,v 1.6 1995/05/10 20:49:19 jtc Exp $";
  *
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_jnf.c b/math/w_jnf.c
index 63ad335573..628701d7fa 100644
--- a/sysdeps/generic/w_jnf.c
+++ b/math/w_jnf.c
@@ -17,7 +17,7 @@
 static char rcsid[] = "$NetBSD: w_jnf.c,v 1.3 1995/05/10 20:49:21 jtc Exp $";
 #endif
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_jnl.c b/math/w_jnl.c
index 866e3cdb00..021c16a104 100644
--- a/sysdeps/generic/w_jnl.c
+++ b/math/w_jnl.c
@@ -44,7 +44,7 @@ static char rcsid[] = "$NetBSD: $";
  *
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_lgamma.c b/math/w_lgamma.c
index 7c7f34ff39..ab75f75997 100644
--- a/sysdeps/generic/w_lgamma.c
+++ b/math/w_lgamma.c
@@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: w_lgamma.c,v 1.6 1995/05/10 20:49:24 jtc Exp $";
  * Method: call __ieee754_lgamma_r
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_lgamma_r.c b/math/w_lgamma_r.c
index f3e7d821e2..17a7d013e9 100644
--- a/sysdeps/generic/w_lgamma_r.c
+++ b/math/w_lgamma_r.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_lgamma_r.c,v 1.6 1995/05/10 20:49:27 jtc Exp $
  * wrapper double lgamma_r(double x, int *signgamp)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_lgammaf.c b/math/w_lgammaf.c
index d0f6d0d17c..7c3c058d75 100644
--- a/sysdeps/generic/w_lgammaf.c
+++ b/math/w_lgammaf.c
@@ -17,7 +17,7 @@
 static char rcsid[] = "$NetBSD: w_lgammaf.c,v 1.3 1995/05/10 20:49:30 jtc Exp $";
 #endif
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_lgammaf_r.c b/math/w_lgammaf_r.c
index 66962acc7e..a32c325638 100644
--- a/sysdeps/generic/w_lgammaf_r.c
+++ b/math/w_lgammaf_r.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_lgammaf_r.c,v 1.3 1995/05/10 20:49:32 jtc Exp
  * wrapper float lgammaf_r(float x, int *signgamp)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_lgammal.c b/math/w_lgammal.c
index 1ee51a6f49..f250e50388 100644
--- a/sysdeps/generic/w_lgammal.c
+++ b/math/w_lgammal.c
@@ -24,7 +24,7 @@ static char rcsid[] = "$NetBSD: $";
  * Method: call __ieee754_lgammal_r
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_lgammal_r.c b/math/w_lgammal_r.c
index 71f5c005d0..2dfea8a465 100644
--- a/sysdeps/generic/w_lgammal_r.c
+++ b/math/w_lgammal_r.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper long double lgammal_r(long double x, int *signgamp)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_log.c b/math/w_log.c
index 5f0af79731..6f6f74fd14 100644
--- a/sysdeps/generic/w_log.c
+++ b/math/w_log.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_log.c,v 1.6 1995/05/10 20:49:33 jtc Exp $";
  * wrapper log(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_log10.c b/math/w_log10.c
index 8a0a70bdf7..9425db3ddf 100644
--- a/sysdeps/generic/w_log10.c
+++ b/math/w_log10.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_log10.c,v 1.6 1995/05/10 20:49:35 jtc Exp $";
  * wrapper log10(X)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_log10f.c b/math/w_log10f.c
index f90cb0cabc..c63fcd1ec2 100644
--- a/sysdeps/generic/w_log10f.c
+++ b/math/w_log10f.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_log10f.c,v 1.3 1995/05/10 20:49:37 jtc Exp $";
  * wrapper log10f(X)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_log10l.c b/math/w_log10l.c
index 0d0861689d..25c051d375 100644
--- a/sysdeps/generic/w_log10l.c
+++ b/math/w_log10l.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper log10l(X)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_log2.c b/math/w_log2.c
index 7966ff359f..d56a6ee663 100644
--- a/sysdeps/generic/w_log2.c
+++ b/math/w_log2.c
@@ -2,7 +2,7 @@
  * wrapper log2(X)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 double
diff --git a/sysdeps/generic/w_log2f.c b/math/w_log2f.c
index 1e2eb85d7b..ec8d297161 100644
--- a/sysdeps/generic/w_log2f.c
+++ b/math/w_log2f.c
@@ -2,7 +2,7 @@
  * wrapper log2(X)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 float
diff --git a/sysdeps/generic/w_log2l.c b/math/w_log2l.c
index f41757c5e4..b1d8706f2a 100644
--- a/sysdeps/generic/w_log2l.c
+++ b/math/w_log2l.c
@@ -2,7 +2,7 @@
  * wrapper log2l(X)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 long double
diff --git a/sysdeps/generic/w_logf.c b/math/w_logf.c
index 9eabe4b34c..46d9749114 100644
--- a/sysdeps/generic/w_logf.c
+++ b/math/w_logf.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_logf.c,v 1.3 1995/05/10 20:49:40 jtc Exp $";
  * wrapper logf(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_logl.c b/math/w_logl.c
index bb979c26c3..5a38f20038 100644
--- a/sysdeps/generic/w_logl.c
+++ b/math/w_logl.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper logl(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_pow.c b/math/w_pow.c
index 5850651a1a..707cffcc43 100644
--- a/sysdeps/generic/w_pow.c
+++ b/math/w_pow.c
@@ -16,7 +16,7 @@
  * wrapper pow(x,y) return x**y
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_powf.c b/math/w_powf.c
index 32196fd89f..2480fe559e 100644
--- a/sysdeps/generic/w_powf.c
+++ b/math/w_powf.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_powf.c,v 1.3 1995/05/10 20:49:41 jtc Exp $";
  * wrapper powf(x,y) return x**y
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_powl.c b/math/w_powl.c
index 17feb9fc61..d8be7b7b03 100644
--- a/sysdeps/generic/w_powl.c
+++ b/math/w_powl.c
@@ -18,7 +18,7 @@
  * wrapper powl(x,y) return x**y
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 
diff --git a/sysdeps/generic/w_remainder.c b/math/w_remainder.c
index d85a3febce..9d7a7c5383 100644
--- a/sysdeps/generic/w_remainder.c
+++ b/math/w_remainder.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_remainder.c,v 1.6 1995/05/10 20:49:44 jtc Exp
  * wrapper remainder(x,p)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_remainderf.c b/math/w_remainderf.c
index 58255f5be5..486e626c28 100644
--- a/sysdeps/generic/w_remainderf.c
+++ b/math/w_remainderf.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_remainderf.c,v 1.3 1995/05/10 20:49:46 jtc Exp
  * wrapper remainderf(x,p)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_remainderl.c b/math/w_remainderl.c
index 284140174d..7635fb9363 100644
--- a/sysdeps/generic/w_remainderl.c
+++ b/math/w_remainderl.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper remainderl(x,p)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_scalb.c b/math/w_scalb.c
index c981b858a9..0086c2adfd 100644
--- a/sysdeps/generic/w_scalb.c
+++ b/math/w_scalb.c
@@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: w_scalb.c,v 1.6 1995/05/10 20:49:48 jtc Exp $";
  * should use scalbn() instead.
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #include <errno.h>
diff --git a/sysdeps/generic/w_scalbf.c b/math/w_scalbf.c
index 51056083e8..60cb5670ed 100644
--- a/sysdeps/generic/w_scalbf.c
+++ b/math/w_scalbf.c
@@ -23,7 +23,7 @@ static char rcsid[] = "$NetBSD: w_scalbf.c,v 1.3 1995/05/10 20:49:50 jtc Exp $";
  * should use scalbn() instead.
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #include <errno.h>
diff --git a/sysdeps/generic/w_scalbl.c b/math/w_scalbl.c
index 6a7d307104..c8a45d460d 100644
--- a/sysdeps/generic/w_scalbl.c
+++ b/math/w_scalbl.c
@@ -24,7 +24,7 @@ static char rcsid[] = "$NetBSD: $";
  * should use scalbnl() instead.
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #include <errno.h>
diff --git a/sysdeps/generic/w_sinh.c b/math/w_sinh.c
index 9b34cd1873..5bde8a2ddd 100644
--- a/sysdeps/generic/w_sinh.c
+++ b/math/w_sinh.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_sinh.c,v 1.6 1995/05/10 20:49:51 jtc Exp $";
  * wrapper sinh(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_sinhf.c b/math/w_sinhf.c
index a69cf3072d..c29c46620f 100644
--- a/sysdeps/generic/w_sinhf.c
+++ b/math/w_sinhf.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_sinhf.c,v 1.3 1995/05/10 20:49:54 jtc Exp $";
  * wrapper sinhf(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_sinhl.c b/math/w_sinhl.c
index 3e93cc598d..19eb774d64 100644
--- a/sysdeps/generic/w_sinhl.c
+++ b/math/w_sinhl.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper sinhl(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_sqrt.c b/math/w_sqrt.c
index be15d959ea..41ab1d18b2 100644
--- a/sysdeps/generic/w_sqrt.c
+++ b/math/w_sqrt.c
@@ -18,7 +18,7 @@ static char rcsid[] = "$NetBSD: w_sqrt.c,v 1.6 1995/05/10 20:49:55 jtc Exp $";
  * wrapper sqrt(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_sqrtf.c b/math/w_sqrtf.c
index f5ccc73868..21beb550f4 100644
--- a/sysdeps/generic/w_sqrtf.c
+++ b/math/w_sqrtf.c
@@ -21,7 +21,7 @@ static char rcsid[] = "$NetBSD: w_sqrtf.c,v 1.3 1995/05/10 20:49:59 jtc Exp $";
  * wrapper sqrtf(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_sqrtl.c b/math/w_sqrtl.c
index 5873ce93ab..0b03eebe1d 100644
--- a/sysdeps/generic/w_sqrtl.c
+++ b/math/w_sqrtl.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * wrapper sqrtl(x)
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_tgamma.c b/math/w_tgamma.c
index 6e34b62be4..3ce6e77b49 100644
--- a/sysdeps/generic/w_tgamma.c
+++ b/math/w_tgamma.c
@@ -19,7 +19,7 @@ static char rcsid[] = "$NetBSD: w_gamma.c,v 1.7 1995/11/20 22:06:43 jtc Exp $";
  * depending on the library mode.
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_tgammaf.c b/math/w_tgammaf.c
index e7b0d87ab5..d3698059e7 100644
--- a/sysdeps/generic/w_tgammaf.c
+++ b/math/w_tgammaf.c
@@ -17,7 +17,7 @@
 static char rcsid[] = "$NetBSD: w_gammaf.c,v 1.4 1995/11/20 22:06:48 jtc Exp $";
 #endif
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/w_tgammal.c b/math/w_tgammal.c
index 793fa17ac1..75970a34d4 100644
--- a/sysdeps/generic/w_tgammal.c
+++ b/math/w_tgammal.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$NetBSD: $";
  * Return the Gamma function of x.
  */
 
-#include "math.h"
+#include <math.h>
 #include "math_private.h"
 
 #ifdef __STDC__
diff --git a/sysdeps/generic/fchflags.c b/misc/fchflags.c
index f191194c12..f191194c12 100644
--- a/sysdeps/generic/fchflags.c
+++ b/misc/fchflags.c
diff --git a/sysdeps/generic/fdatasync.c b/misc/fdatasync.c
index 3edeef0c9e..3edeef0c9e 100644
--- a/sysdeps/generic/fdatasync.c
+++ b/misc/fdatasync.c
diff --git a/sysdeps/generic/fgetxattr.c b/misc/fgetxattr.c
index 610ed32d1f..610ed32d1f 100644
--- a/sysdeps/generic/fgetxattr.c
+++ b/misc/fgetxattr.c
diff --git a/sysdeps/generic/flistxattr.c b/misc/flistxattr.c
index fc2863d31c..fc2863d31c 100644
--- a/sysdeps/generic/flistxattr.c
+++ b/misc/flistxattr.c
diff --git a/sysdeps/generic/fremovexattr.c b/misc/fremovexattr.c
index 9719d42d40..9719d42d40 100644
--- a/sysdeps/generic/fremovexattr.c
+++ b/misc/fremovexattr.c
diff --git a/sysdeps/generic/fsetxattr.c b/misc/fsetxattr.c
index 8a52e72529..8a52e72529 100644
--- a/sysdeps/generic/fsetxattr.c
+++ b/misc/fsetxattr.c
diff --git a/sysdeps/generic/fsync.c b/misc/fsync.c
index e2a4d700d5..e2a4d700d5 100644
--- a/sysdeps/generic/fsync.c
+++ b/misc/fsync.c
diff --git a/sysdeps/generic/ftruncate.c b/misc/ftruncate.c
index d4cca2e267..d4cca2e267 100644
--- a/sysdeps/generic/ftruncate.c
+++ b/misc/ftruncate.c
diff --git a/sysdeps/generic/ftruncate64.c b/misc/ftruncate64.c
index df84b7c3c1..df84b7c3c1 100644
--- a/sysdeps/generic/ftruncate64.c
+++ b/misc/ftruncate64.c
diff --git a/sysdeps/generic/futimes.c b/misc/futimes.c
index 3378dbf416..3378dbf416 100644
--- a/sysdeps/generic/futimes.c
+++ b/misc/futimes.c
diff --git a/sysdeps/generic/futimesat.c b/misc/futimesat.c
index 74ccd876e6..74ccd876e6 100644
--- a/sysdeps/generic/futimesat.c
+++ b/misc/futimesat.c
diff --git a/sysdeps/generic/getclktck.c b/misc/getclktck.c
index 897c6a25ba..897c6a25ba 100644
--- a/sysdeps/generic/getclktck.c
+++ b/misc/getclktck.c
diff --git a/sysdeps/generic/getdomain.c b/misc/getdomain.c
index 6074ccfb79..6074ccfb79 100644
--- a/sysdeps/generic/getdomain.c
+++ b/misc/getdomain.c
diff --git a/sysdeps/generic/getdtsz.c b/misc/getdtsz.c
index 38b7577914..38b7577914 100644
--- a/sysdeps/generic/getdtsz.c
+++ b/misc/getdtsz.c
diff --git a/sysdeps/generic/gethostid.c b/misc/gethostid.c
index 01baf12230..01baf12230 100644
--- a/sysdeps/generic/gethostid.c
+++ b/misc/gethostid.c
diff --git a/sysdeps/generic/gethostname.c b/misc/gethostname.c
index bc59ab57c6..bc59ab57c6 100644
--- a/sysdeps/generic/gethostname.c
+++ b/misc/gethostname.c
diff --git a/sysdeps/generic/getloadavg.c b/misc/getloadavg.c
index 070c879fd5..070c879fd5 100644
--- a/sysdeps/generic/getloadavg.c
+++ b/misc/getloadavg.c
diff --git a/sysdeps/generic/getpagesize.c b/misc/getpagesize.c
index 40ed1ee2b1..40ed1ee2b1 100644
--- a/sysdeps/generic/getpagesize.c
+++ b/misc/getpagesize.c
diff --git a/sysdeps/generic/getsysstats.c b/misc/getsysstats.c
index bc67e23e79..bc67e23e79 100644
--- a/sysdeps/generic/getsysstats.c
+++ b/misc/getsysstats.c
diff --git a/sysdeps/generic/getxattr.c b/misc/getxattr.c
index ebf7bf2b4d..ebf7bf2b4d 100644
--- a/sysdeps/generic/getxattr.c
+++ b/misc/getxattr.c
diff --git a/sysdeps/generic/gtty.c b/misc/gtty.c
index 84e7fed55e..84e7fed55e 100644
--- a/sysdeps/generic/gtty.c
+++ b/misc/gtty.c
diff --git a/sysdeps/generic/ioctl.c b/misc/ioctl.c
index 3f71452cc1..3f71452cc1 100644
--- a/sysdeps/generic/ioctl.c
+++ b/misc/ioctl.c
diff --git a/sysdeps/generic/lgetxattr.c b/misc/lgetxattr.c
index 6adf1fdf04..6adf1fdf04 100644
--- a/sysdeps/generic/lgetxattr.c
+++ b/misc/lgetxattr.c
diff --git a/sysdeps/generic/listxattr.c b/misc/listxattr.c
index 490a092b75..490a092b75 100644
--- a/sysdeps/generic/listxattr.c
+++ b/misc/listxattr.c
diff --git a/sysdeps/generic/llistxattr.c b/misc/llistxattr.c
index 1a7e1e4cfd..1a7e1e4cfd 100644
--- a/sysdeps/generic/llistxattr.c
+++ b/misc/llistxattr.c
diff --git a/sysdeps/generic/lremovexattr.c b/misc/lremovexattr.c
index fad64e5150..fad64e5150 100644
--- a/sysdeps/generic/lremovexattr.c
+++ b/misc/lremovexattr.c
diff --git a/sysdeps/generic/lseek.c b/misc/lseek.c
index 6daf6ef154..6daf6ef154 100644
--- a/sysdeps/generic/lseek.c
+++ b/misc/lseek.c
diff --git a/sysdeps/generic/lsetxattr.c b/misc/lsetxattr.c
index 6f8cdde1da..6f8cdde1da 100644
--- a/sysdeps/generic/lsetxattr.c
+++ b/misc/lsetxattr.c
diff --git a/sysdeps/generic/lutimes.c b/misc/lutimes.c
index 34fc1838f0..34fc1838f0 100644
--- a/sysdeps/generic/lutimes.c
+++ b/misc/lutimes.c
diff --git a/sysdeps/generic/madvise.c b/misc/madvise.c
index dbef959dd8..dbef959dd8 100644
--- a/sysdeps/generic/madvise.c
+++ b/misc/madvise.c
diff --git a/sysdeps/generic/mincore.c b/misc/mincore.c
index 804447e8f3..804447e8f3 100644
--- a/sysdeps/generic/mincore.c
+++ b/misc/mincore.c
diff --git a/sysdeps/generic/mlock.c b/misc/mlock.c
index fd8dc8bc9d..fd8dc8bc9d 100644
--- a/sysdeps/generic/mlock.c
+++ b/misc/mlock.c
diff --git a/sysdeps/generic/mlockall.c b/misc/mlockall.c
index 3d3ed6736d..3d3ed6736d 100644
--- a/sysdeps/generic/mlockall.c
+++ b/misc/mlockall.c
diff --git a/sysdeps/generic/mmap.c b/misc/mmap.c
index 43b25a06d2..43b25a06d2 100644
--- a/sysdeps/generic/mmap.c
+++ b/misc/mmap.c
diff --git a/sysdeps/generic/mmap64.c b/misc/mmap64.c
index 2c8aac808b..2c8aac808b 100644
--- a/sysdeps/generic/mmap64.c
+++ b/misc/mmap64.c
diff --git a/sysdeps/generic/mprotect.c b/misc/mprotect.c
index 9fefdfce71..9fefdfce71 100644
--- a/sysdeps/generic/mprotect.c
+++ b/misc/mprotect.c
diff --git a/sysdeps/generic/msync.c b/misc/msync.c
index 0ffd5c04f6..0ffd5c04f6 100644
--- a/sysdeps/generic/msync.c
+++ b/misc/msync.c
diff --git a/sysdeps/generic/munlock.c b/misc/munlock.c
index 3c728c01d5..3c728c01d5 100644
--- a/sysdeps/generic/munlock.c
+++ b/misc/munlock.c
diff --git a/sysdeps/generic/munlockall.c b/misc/munlockall.c
index ca7198265f..ca7198265f 100644
--- a/sysdeps/generic/munlockall.c
+++ b/misc/munlockall.c
diff --git a/sysdeps/generic/munmap.c b/misc/munmap.c
index 4a78c324ad..4a78c324ad 100644
--- a/sysdeps/generic/munmap.c
+++ b/misc/munmap.c
diff --git a/sysdeps/generic/pselect.c b/misc/pselect.c
index 43b371cce7..43b371cce7 100644
--- a/sysdeps/generic/pselect.c
+++ b/misc/pselect.c
diff --git a/sysdeps/generic/ptrace.c b/misc/ptrace.c
index 1825d57143..1825d57143 100644
--- a/sysdeps/generic/ptrace.c
+++ b/misc/ptrace.c
diff --git a/sysdeps/generic/readv.c b/misc/readv.c
index b33444c036..b33444c036 100644
--- a/sysdeps/generic/readv.c
+++ b/misc/readv.c
diff --git a/sysdeps/generic/reboot.c b/misc/reboot.c
index 6036726c1f..6036726c1f 100644
--- a/sysdeps/generic/reboot.c
+++ b/misc/reboot.c
diff --git a/sysdeps/generic/remap_file_pages.c b/misc/remap_file_pages.c
index 0f15ea44c2..0f15ea44c2 100644
--- a/sysdeps/generic/remap_file_pages.c
+++ b/misc/remap_file_pages.c
diff --git a/sysdeps/generic/removexattr.c b/misc/removexattr.c
index 8379ed10c8..8379ed10c8 100644
--- a/sysdeps/generic/removexattr.c
+++ b/misc/removexattr.c
diff --git a/sysdeps/generic/revoke.c b/misc/revoke.c
index fc757d80b4..fc757d80b4 100644
--- a/sysdeps/generic/revoke.c
+++ b/misc/revoke.c
diff --git a/sysdeps/generic/sbrk.c b/misc/sbrk.c
index 0df60076cc..0df60076cc 100644
--- a/sysdeps/generic/sbrk.c
+++ b/misc/sbrk.c
diff --git a/sysdeps/generic/select.c b/misc/select.c
index 124f26aff7..124f26aff7 100644
--- a/sysdeps/generic/select.c
+++ b/misc/select.c
diff --git a/sysdeps/generic/setdomain.c b/misc/setdomain.c
index 4d9cbb7cac..4d9cbb7cac 100644
--- a/sysdeps/generic/setdomain.c
+++ b/misc/setdomain.c
diff --git a/sysdeps/generic/setegid.c b/misc/setegid.c
index 5b5e2cf4bb..5b5e2cf4bb 100644
--- a/sysdeps/generic/setegid.c
+++ b/misc/setegid.c
diff --git a/sysdeps/generic/seteuid.c b/misc/seteuid.c
index 689000f993..689000f993 100644
--- a/sysdeps/generic/seteuid.c
+++ b/misc/seteuid.c
diff --git a/sysdeps/generic/sethostid.c b/misc/sethostid.c
index 6f393de06a..6f393de06a 100644
--- a/sysdeps/generic/sethostid.c
+++ b/misc/sethostid.c
diff --git a/sysdeps/generic/sethostname.c b/misc/sethostname.c
index 1f65b1e759..1f65b1e759 100644
--- a/sysdeps/generic/sethostname.c
+++ b/misc/sethostname.c
diff --git a/sysdeps/generic/setregid.c b/misc/setregid.c
index f8f33d1da7..f8f33d1da7 100644
--- a/sysdeps/generic/setregid.c
+++ b/misc/setregid.c
diff --git a/sysdeps/generic/setreuid.c b/misc/setreuid.c
index cce2d9d52b..cce2d9d52b 100644
--- a/sysdeps/generic/setreuid.c
+++ b/misc/setreuid.c
diff --git a/sysdeps/generic/setxattr.c b/misc/setxattr.c
index 5b8743a7ce..5b8743a7ce 100644
--- a/sysdeps/generic/setxattr.c
+++ b/misc/setxattr.c
diff --git a/sysdeps/generic/sstk.c b/misc/sstk.c
index 6cba9b7fba..6cba9b7fba 100644
--- a/sysdeps/generic/sstk.c
+++ b/misc/sstk.c
diff --git a/sysdeps/generic/stty.c b/misc/stty.c
index 49c569a77b..49c569a77b 100644
--- a/sysdeps/generic/stty.c
+++ b/misc/stty.c
diff --git a/sysdeps/generic/swapoff.c b/misc/swapoff.c
index 033d841d95..033d841d95 100644
--- a/sysdeps/generic/swapoff.c
+++ b/misc/swapoff.c
diff --git a/sysdeps/generic/swapon.c b/misc/swapon.c
index 910781fa93..910781fa93 100644
--- a/sysdeps/generic/swapon.c
+++ b/misc/swapon.c
diff --git a/sysdeps/generic/sync.c b/misc/sync.c
index 5ccdb5d5bf..5ccdb5d5bf 100644
--- a/sysdeps/generic/sync.c
+++ b/misc/sync.c
diff --git a/sysdeps/generic/syscall.c b/misc/syscall.c
index ad78a06b73..ad78a06b73 100644
--- a/sysdeps/generic/syscall.c
+++ b/misc/syscall.c
diff --git a/sysdeps/generic/syslog.c b/misc/syslog.c
index 9c5597f5aa..9c5597f5aa 100644
--- a/sysdeps/generic/syslog.c
+++ b/misc/syslog.c
diff --git a/sysdeps/generic/truncate.c b/misc/truncate.c
index 6d0f0c3bcb..6d0f0c3bcb 100644
--- a/sysdeps/generic/truncate.c
+++ b/misc/truncate.c
diff --git a/sysdeps/generic/truncate64.c b/misc/truncate64.c
index d7e80dc3ae..d7e80dc3ae 100644
--- a/sysdeps/generic/truncate64.c
+++ b/misc/truncate64.c
diff --git a/sysdeps/generic/ualarm.c b/misc/ualarm.c
index 4ca0847576..4ca0847576 100644
--- a/sysdeps/generic/ualarm.c
+++ b/misc/ualarm.c
diff --git a/sysdeps/generic/usleep.c b/misc/usleep.c
index 8f419f901a..8f419f901a 100644
--- a/sysdeps/generic/usleep.c
+++ b/misc/usleep.c
diff --git a/sysdeps/generic/ustat.c b/misc/ustat.c
index 0aeee620c5..0aeee620c5 100644
--- a/sysdeps/generic/ustat.c
+++ b/misc/ustat.c
diff --git a/sysdeps/generic/utimes.c b/misc/utimes.c
index e4a6f0427f..e4a6f0427f 100644
--- a/sysdeps/generic/utimes.c
+++ b/misc/utimes.c
diff --git a/sysdeps/generic/vhangup.c b/misc/vhangup.c
index 329fddbf24..329fddbf24 100644
--- a/sysdeps/generic/vhangup.c
+++ b/misc/vhangup.c
diff --git a/sysdeps/generic/writev.c b/misc/writev.c
index d424c72143..d424c72143 100644
--- a/sysdeps/generic/writev.c
+++ b/misc/writev.c
diff --git a/sysdeps/generic/nscd_setup_thread.c b/nscd/nscd_setup_thread.c
index 32bfe07000..32bfe07000 100644
--- a/sysdeps/generic/nscd_setup_thread.c
+++ b/nscd/nscd_setup_thread.c
diff --git a/sysdeps/generic/environ.c b/posix/environ.c
index a0ed0d80ea..a0ed0d80ea 100644
--- a/sysdeps/generic/environ.c
+++ b/posix/environ.c
diff --git a/sysdeps/generic/execve.c b/posix/execve.c
index 2d756293ed..2d756293ed 100644
--- a/sysdeps/generic/execve.c
+++ b/posix/execve.c
diff --git a/sysdeps/generic/fexecve.c b/posix/fexecve.c
index fceae9251a..fceae9251a 100644
--- a/sysdeps/generic/fexecve.c
+++ b/posix/fexecve.c
diff --git a/sysdeps/generic/fork.c b/posix/fork.c
index c19fa656b3..c19fa656b3 100644
--- a/sysdeps/generic/fork.c
+++ b/posix/fork.c
diff --git a/sysdeps/generic/fpathconf.c b/posix/fpathconf.c
index 840460b04b..840460b04b 100644
--- a/sysdeps/generic/fpathconf.c
+++ b/posix/fpathconf.c
diff --git a/sysdeps/generic/gai_strerror.c b/posix/gai_strerror.c
index 932c5910df..932c5910df 100644
--- a/sysdeps/generic/gai_strerror.c
+++ b/posix/gai_strerror.c
diff --git a/sysdeps/generic/getaddrinfo.c b/posix/getaddrinfo.c
index 548c0b863e..548c0b863e 100644
--- a/sysdeps/generic/getaddrinfo.c
+++ b/posix/getaddrinfo.c
diff --git a/sysdeps/generic/getegid.c b/posix/getegid.c
index d939d6ad64..d939d6ad64 100644
--- a/sysdeps/generic/getegid.c
+++ b/posix/getegid.c
diff --git a/sysdeps/generic/geteuid.c b/posix/geteuid.c
index c67dbfd708..c67dbfd708 100644
--- a/sysdeps/generic/geteuid.c
+++ b/posix/geteuid.c
diff --git a/sysdeps/generic/getgid.c b/posix/getgid.c
index 742c099fa2..742c099fa2 100644
--- a/sysdeps/generic/getgid.c
+++ b/posix/getgid.c
diff --git a/sysdeps/generic/getgroups.c b/posix/getgroups.c
index d5868cc1b8..d5868cc1b8 100644
--- a/sysdeps/generic/getgroups.c
+++ b/posix/getgroups.c
diff --git a/sysdeps/generic/getlogin.c b/posix/getlogin.c
index 12b4283396..12b4283396 100644
--- a/sysdeps/generic/getlogin.c
+++ b/posix/getlogin.c
diff --git a/sysdeps/generic/getlogin_r.c b/posix/getlogin_r.c
index f2470ee032..f2470ee032 100644
--- a/sysdeps/generic/getlogin_r.c
+++ b/posix/getlogin_r.c
diff --git a/sysdeps/generic/getpgid.c b/posix/getpgid.c
index ad46771d2f..ad46771d2f 100644
--- a/sysdeps/generic/getpgid.c
+++ b/posix/getpgid.c
diff --git a/sysdeps/generic/getpgrp.c b/posix/getpgrp.c
index 85efc2f215..85efc2f215 100644
--- a/sysdeps/generic/getpgrp.c
+++ b/posix/getpgrp.c
diff --git a/sysdeps/generic/getpid.c b/posix/getpid.c
index c1c91fede7..c1c91fede7 100644
--- a/sysdeps/generic/getpid.c
+++ b/posix/getpid.c
diff --git a/sysdeps/generic/getppid.c b/posix/getppid.c
index e00c237496..e00c237496 100644
--- a/sysdeps/generic/getppid.c
+++ b/posix/getppid.c
diff --git a/sysdeps/generic/getresgid.c b/posix/getresgid.c
index d6a9b52957..d6a9b52957 100644
--- a/sysdeps/generic/getresgid.c
+++ b/posix/getresgid.c
diff --git a/sysdeps/generic/getresuid.c b/posix/getresuid.c
index 227d6b7ded..227d6b7ded 100644
--- a/sysdeps/generic/getresuid.c
+++ b/posix/getresuid.c
diff --git a/sysdeps/generic/getsid.c b/posix/getsid.c
index eb7e60fa42..eb7e60fa42 100644
--- a/sysdeps/generic/getsid.c
+++ b/posix/getsid.c
diff --git a/sysdeps/generic/getuid.c b/posix/getuid.c
index c4ea7e8c98..c4ea7e8c98 100644
--- a/sysdeps/generic/getuid.c
+++ b/posix/getuid.c
diff --git a/sysdeps/generic/glob.c b/posix/glob.c
index 2e767304a7..2e767304a7 100644
--- a/sysdeps/generic/glob.c
+++ b/posix/glob.c
diff --git a/sysdeps/generic/glob64.c b/posix/glob64.c
index 2bfab74074..2bfab74074 100644
--- a/sysdeps/generic/glob64.c
+++ b/posix/glob64.c
diff --git a/sysdeps/generic/group_member.c b/posix/group_member.c
index 7bd9c46ba2..7bd9c46ba2 100644
--- a/sysdeps/generic/group_member.c
+++ b/posix/group_member.c
diff --git a/sysdeps/generic/init-posix.c b/posix/init-posix.c
index 0c2b717e6d..0c2b717e6d 100644
--- a/sysdeps/generic/init-posix.c
+++ b/posix/init-posix.c
diff --git a/sysdeps/generic/nanosleep.c b/posix/nanosleep.c
index 7a2138b6f1..7a2138b6f1 100644
--- a/sysdeps/generic/nanosleep.c
+++ b/posix/nanosleep.c
diff --git a/sysdeps/generic/pathconf.c b/posix/pathconf.c
index 6ac5d31902..6ac5d31902 100644
--- a/sysdeps/generic/pathconf.c
+++ b/posix/pathconf.c
diff --git a/sysdeps/generic/pause.c b/posix/pause.c
index 2e34b436f1..2e34b436f1 100644
--- a/sysdeps/generic/pause.c
+++ b/posix/pause.c
diff --git a/sysdeps/generic/posix_madvise.c b/posix/posix_madvise.c
index 6f8d60f55f..6f8d60f55f 100644
--- a/sysdeps/generic/posix_madvise.c
+++ b/posix/posix_madvise.c
diff --git a/sysdeps/generic/pread.c b/posix/pread.c
index 5c79dd526d..5c79dd526d 100644
--- a/sysdeps/generic/pread.c
+++ b/posix/pread.c
diff --git a/sysdeps/generic/pread64.c b/posix/pread64.c
index 68316579c6..68316579c6 100644
--- a/sysdeps/generic/pread64.c
+++ b/posix/pread64.c
diff --git a/sysdeps/generic/pwrite.c b/posix/pwrite.c
index ec35ecea9c..ec35ecea9c 100644
--- a/sysdeps/generic/pwrite.c
+++ b/posix/pwrite.c
diff --git a/sysdeps/generic/pwrite64.c b/posix/pwrite64.c
index dd14aa0bd7..dd14aa0bd7 100644
--- a/sysdeps/generic/pwrite64.c
+++ b/posix/pwrite64.c
diff --git a/sysdeps/generic/sched_getaffinity.c b/posix/sched_getaffinity.c
index b2e452f879..b2e452f879 100644
--- a/sysdeps/generic/sched_getaffinity.c
+++ b/posix/sched_getaffinity.c
diff --git a/sysdeps/generic/sched_getp.c b/posix/sched_getp.c
index 1ca77893f4..1ca77893f4 100644
--- a/sysdeps/generic/sched_getp.c
+++ b/posix/sched_getp.c
diff --git a/sysdeps/generic/sched_gets.c b/posix/sched_gets.c
index 479b913f32..479b913f32 100644
--- a/sysdeps/generic/sched_gets.c
+++ b/posix/sched_gets.c
diff --git a/sysdeps/generic/sched_primax.c b/posix/sched_primax.c
index 4b3c1cbe67..4b3c1cbe67 100644
--- a/sysdeps/generic/sched_primax.c
+++ b/posix/sched_primax.c
diff --git a/sysdeps/generic/sched_primin.c b/posix/sched_primin.c
index 813b8f63ca..813b8f63ca 100644
--- a/sysdeps/generic/sched_primin.c
+++ b/posix/sched_primin.c
diff --git a/sysdeps/generic/sched_rr_gi.c b/posix/sched_rr_gi.c
index f8fec63617..f8fec63617 100644
--- a/sysdeps/generic/sched_rr_gi.c
+++ b/posix/sched_rr_gi.c
diff --git a/sysdeps/generic/sched_setaffinity.c b/posix/sched_setaffinity.c
index 652163db85..652163db85 100644
--- a/sysdeps/generic/sched_setaffinity.c
+++ b/posix/sched_setaffinity.c
diff --git a/sysdeps/generic/sched_setp.c b/posix/sched_setp.c
index cc451fc131..cc451fc131 100644
--- a/sysdeps/generic/sched_setp.c
+++ b/posix/sched_setp.c
diff --git a/sysdeps/generic/sched_sets.c b/posix/sched_sets.c
index 631cac228b..631cac228b 100644
--- a/sysdeps/generic/sched_sets.c
+++ b/posix/sched_sets.c
diff --git a/sysdeps/generic/sched_yield.c b/posix/sched_yield.c
index ce41ce9b6f..ce41ce9b6f 100644
--- a/sysdeps/generic/sched_yield.c
+++ b/posix/sched_yield.c
diff --git a/sysdeps/generic/setgid.c b/posix/setgid.c
index 05c2cc6621..05c2cc6621 100644
--- a/sysdeps/generic/setgid.c
+++ b/posix/setgid.c
diff --git a/sysdeps/generic/setlogin.c b/posix/setlogin.c
index c16e29dd9e..c16e29dd9e 100644
--- a/sysdeps/generic/setlogin.c
+++ b/posix/setlogin.c
diff --git a/sysdeps/generic/setpgid.c b/posix/setpgid.c
index cb2abf1159..cb2abf1159 100644
--- a/sysdeps/generic/setpgid.c
+++ b/posix/setpgid.c
diff --git a/sysdeps/generic/setpgrp.c b/posix/setpgrp.c
index 8ceb159341..8ceb159341 100644
--- a/sysdeps/generic/setpgrp.c
+++ b/posix/setpgrp.c
diff --git a/sysdeps/generic/setresgid.c b/posix/setresgid.c
index 78e308c5d0..78e308c5d0 100644
--- a/sysdeps/generic/setresgid.c
+++ b/posix/setresgid.c
diff --git a/sysdeps/generic/setresuid.c b/posix/setresuid.c
index 430b63b2fd..430b63b2fd 100644
--- a/sysdeps/generic/setresuid.c
+++ b/posix/setresuid.c
diff --git a/sysdeps/generic/setsid.c b/posix/setsid.c
index 6a6712b9bd..6a6712b9bd 100644
--- a/sysdeps/generic/setsid.c
+++ b/posix/setsid.c
diff --git a/sysdeps/generic/setuid.c b/posix/setuid.c
index 96c3e01cb9..96c3e01cb9 100644
--- a/sysdeps/generic/setuid.c
+++ b/posix/setuid.c
diff --git a/sysdeps/generic/sleep.c b/posix/sleep.c
index f9d2a6593f..f9d2a6593f 100644
--- a/sysdeps/generic/sleep.c
+++ b/posix/sleep.c
diff --git a/sysdeps/generic/spawni.c b/posix/spawni.c
index c7d5f59ffc..c7d5f59ffc 100644
--- a/sysdeps/generic/spawni.c
+++ b/posix/spawni.c
diff --git a/sysdeps/generic/sysconf.c b/posix/sysconf.c
index f22685cb29..f22685cb29 100644
--- a/sysdeps/generic/sysconf.c
+++ b/posix/sysconf.c
diff --git a/sysdeps/generic/times.c b/posix/times.c
index b4e08156ae..b4e08156ae 100644
--- a/sysdeps/generic/times.c
+++ b/posix/times.c
diff --git a/sysdeps/generic/uname.c b/posix/uname.c
index e7c41648ed..e7c41648ed 100644
--- a/sysdeps/generic/uname.c
+++ b/posix/uname.c
diff --git a/sysdeps/generic/vfork.c b/posix/vfork.c
index d15841d712..d15841d712 100644
--- a/sysdeps/generic/vfork.c
+++ b/posix/vfork.c
diff --git a/sysdeps/generic/wait.c b/posix/wait.c
index b1c512ed39..b1c512ed39 100644
--- a/sysdeps/generic/wait.c
+++ b/posix/wait.c
diff --git a/sysdeps/generic/wait3.c b/posix/wait3.c
index 479d99e3da..479d99e3da 100644
--- a/sysdeps/generic/wait3.c
+++ b/posix/wait3.c
diff --git a/sysdeps/generic/wait4.c b/posix/wait4.c
index b59bf87ffc..b59bf87ffc 100644
--- a/sysdeps/generic/wait4.c
+++ b/posix/wait4.c
diff --git a/sysdeps/generic/waitid.c b/posix/waitid.c
index a9de1a19a5..a9de1a19a5 100644
--- a/sysdeps/generic/waitid.c
+++ b/posix/waitid.c
diff --git a/sysdeps/generic/waitpid.c b/posix/waitpid.c
index 9c7736e669..9c7736e669 100644
--- a/sysdeps/generic/waitpid.c
+++ b/posix/waitpid.c
diff --git a/sysdeps/generic/wordexp.c b/posix/wordexp.c
index 2eb58089c4..2eb58089c4 100644
--- a/sysdeps/generic/wordexp.c
+++ b/posix/wordexp.c
diff --git a/sysdeps/generic/gai_sigqueue.c b/resolv/gai_sigqueue.c
index 2c91df6ddc..2c91df6ddc 100644
--- a/sysdeps/generic/gai_sigqueue.c
+++ b/resolv/gai_sigqueue.c
diff --git a/sysdeps/generic/res-state.c b/resolv/res-state.c
index e327e34f59..e327e34f59 100644
--- a/sysdeps/generic/res-state.c
+++ b/resolv/res-state.c
diff --git a/sysdeps/generic/getpriority.c b/resource/getpriority.c
index 501c92a08a..501c92a08a 100644
--- a/sysdeps/generic/getpriority.c
+++ b/resource/getpriority.c
diff --git a/sysdeps/generic/getrlimit.c b/resource/getrlimit.c
index d4bcadd762..d4bcadd762 100644
--- a/sysdeps/generic/getrlimit.c
+++ b/resource/getrlimit.c
diff --git a/sysdeps/generic/getrlimit64.c b/resource/getrlimit64.c
index dcd67cf56f..dcd67cf56f 100644
--- a/sysdeps/generic/getrlimit64.c
+++ b/resource/getrlimit64.c
diff --git a/sysdeps/generic/getrusage.c b/resource/getrusage.c
index c679855ace..c679855ace 100644
--- a/sysdeps/generic/getrusage.c
+++ b/resource/getrusage.c
diff --git a/sysdeps/generic/nice.c b/resource/nice.c
index 8561931af7..8561931af7 100644
--- a/sysdeps/generic/nice.c
+++ b/resource/nice.c
diff --git a/sysdeps/generic/setpriority.c b/resource/setpriority.c
index b2e6f8a059..b2e6f8a059 100644
--- a/sysdeps/generic/setpriority.c
+++ b/resource/setpriority.c
diff --git a/sysdeps/generic/setrlimit.c b/resource/setrlimit.c
index c8f6e03ad3..c8f6e03ad3 100644
--- a/sysdeps/generic/setrlimit.c
+++ b/resource/setrlimit.c
diff --git a/sysdeps/generic/setrlimit64.c b/resource/setrlimit64.c
index d4b4bfce0a..d4b4bfce0a 100644
--- a/sysdeps/generic/setrlimit64.c
+++ b/resource/setrlimit64.c
diff --git a/sysdeps/generic/ulimit.c b/resource/ulimit.c
index cc74054456..cc74054456 100644
--- a/sysdeps/generic/ulimit.c
+++ b/resource/ulimit.c
diff --git a/sysdeps/generic/vlimit.c b/resource/vlimit.c
index 03d89f4ad5..03d89f4ad5 100644
--- a/sysdeps/generic/vlimit.c
+++ b/resource/vlimit.c
diff --git a/sysdeps/generic/vtimes.c b/resource/vtimes.c
index 37dc01b2fb..37dc01b2fb 100644
--- a/sysdeps/generic/vtimes.c
+++ b/resource/vtimes.c
diff --git a/sysdeps/generic/get_clockfreq.c b/rt/get_clockfreq.c
index 14375ec186..14375ec186 100644
--- a/sysdeps/generic/get_clockfreq.c
+++ b/rt/get_clockfreq.c
diff --git a/sysdeps/generic/lio_listio.c b/rt/lio_listio.c
index d535594492..d535594492 100644
--- a/sysdeps/generic/lio_listio.c
+++ b/rt/lio_listio.c
diff --git a/rt/lio_listio64.c b/rt/lio_listio64.c
new file mode 100644
index 0000000000..35a571c685
--- /dev/null
+++ b/rt/lio_listio64.c
@@ -0,0 +1,2 @@
+#define BE_AIO64
+#include <lio_listio.c>
diff --git a/sysdeps/generic/mq_close.c b/rt/mq_close.c
index 8237a6438e..8237a6438e 100644
--- a/sysdeps/generic/mq_close.c
+++ b/rt/mq_close.c
diff --git a/sysdeps/generic/mq_getattr.c b/rt/mq_getattr.c
index 2d24b85d47..2d24b85d47 100644
--- a/sysdeps/generic/mq_getattr.c
+++ b/rt/mq_getattr.c
diff --git a/sysdeps/generic/mq_notify.c b/rt/mq_notify.c
index 29de75a471..29de75a471 100644
--- a/sysdeps/generic/mq_notify.c
+++ b/rt/mq_notify.c
diff --git a/sysdeps/generic/mq_open.c b/rt/mq_open.c
index dea5741d5a..dea5741d5a 100644
--- a/sysdeps/generic/mq_open.c
+++ b/rt/mq_open.c
diff --git a/sysdeps/generic/mq_receive.c b/rt/mq_receive.c
index 527fd75963..527fd75963 100644
--- a/sysdeps/generic/mq_receive.c
+++ b/rt/mq_receive.c
diff --git a/sysdeps/generic/mq_send.c b/rt/mq_send.c
index 8b7cd87f7f..8b7cd87f7f 100644
--- a/sysdeps/generic/mq_send.c
+++ b/rt/mq_send.c
diff --git a/sysdeps/generic/mq_setattr.c b/rt/mq_setattr.c
index 57ee0759ab..57ee0759ab 100644
--- a/sysdeps/generic/mq_setattr.c
+++ b/rt/mq_setattr.c
diff --git a/sysdeps/generic/mq_timedreceive.c b/rt/mq_timedreceive.c
index e4723f812a..e4723f812a 100644
--- a/sysdeps/generic/mq_timedreceive.c
+++ b/rt/mq_timedreceive.c
diff --git a/sysdeps/generic/mq_timedsend.c b/rt/mq_timedsend.c
index 5ccfe23b0a..5ccfe23b0a 100644
--- a/sysdeps/generic/mq_timedsend.c
+++ b/rt/mq_timedsend.c
diff --git a/sysdeps/generic/mq_unlink.c b/rt/mq_unlink.c
index e947b84f3b..e947b84f3b 100644
--- a/sysdeps/generic/mq_unlink.c
+++ b/rt/mq_unlink.c
diff --git a/sysdeps/generic/shm_open.c b/rt/shm_open.c
index 6a53903a75..6a53903a75 100644
--- a/sysdeps/generic/shm_open.c
+++ b/rt/shm_open.c
diff --git a/sysdeps/generic/shm_unlink.c b/rt/shm_unlink.c
index 28478b895b..28478b895b 100644
--- a/sysdeps/generic/shm_unlink.c
+++ b/rt/shm_unlink.c
diff --git a/sysdeps/generic/timer_create.c b/rt/timer_create.c
index 0e3a6b0acc..0e3a6b0acc 100644
--- a/sysdeps/generic/timer_create.c
+++ b/rt/timer_create.c
diff --git a/sysdeps/generic/timer_delete.c b/rt/timer_delete.c
index 4be55aa322..4be55aa322 100644
--- a/sysdeps/generic/timer_delete.c
+++ b/rt/timer_delete.c
diff --git a/sysdeps/generic/timer_getoverr.c b/rt/timer_getoverr.c
index 6ca7ff8e9e..6ca7ff8e9e 100644
--- a/sysdeps/generic/timer_getoverr.c
+++ b/rt/timer_getoverr.c
diff --git a/sysdeps/generic/timer_gettime.c b/rt/timer_gettime.c
index 728028ed3e..728028ed3e 100644
--- a/sysdeps/generic/timer_gettime.c
+++ b/rt/timer_gettime.c
diff --git a/sysdeps/generic/timer_settime.c b/rt/timer_settime.c
index f494a0edd1..f494a0edd1 100644
--- a/sysdeps/generic/timer_settime.c
+++ b/rt/timer_settime.c
diff --git a/sysdeps/generic/tst-timer.c b/rt/tst-timer.c
index d9b69a2467..d9b69a2467 100644
--- a/sysdeps/generic/tst-timer.c
+++ b/rt/tst-timer.c
diff --git a/sysdeps/generic/jmp-unwind.c b/setjmp/jmp-unwind.c
index d2f76c62e7..d2f76c62e7 100644
--- a/sysdeps/generic/jmp-unwind.c
+++ b/setjmp/jmp-unwind.c
diff --git a/sysdeps/generic/longjmp.c b/setjmp/longjmp.c
index 9b1bda1caa..9b1bda1caa 100644
--- a/sysdeps/generic/longjmp.c
+++ b/setjmp/longjmp.c
diff --git a/sysdeps/generic/setjmp.c b/setjmp/setjmp.c
index 0676ff1396..0676ff1396 100644
--- a/sysdeps/generic/setjmp.c
+++ b/setjmp/setjmp.c
diff --git a/sysdeps/generic/sigjmp.c b/setjmp/sigjmp.c
index b23c547f5e..b23c547f5e 100644
--- a/sysdeps/generic/sigjmp.c
+++ b/setjmp/sigjmp.c
diff --git a/sysdeps/generic/kill.c b/signal/kill.c
index 1d81e45dde..1d81e45dde 100644
--- a/sysdeps/generic/kill.c
+++ b/signal/kill.c
diff --git a/sysdeps/generic/killpg.c b/signal/killpg.c
index ad9258dffc..ad9258dffc 100644
--- a/sysdeps/generic/killpg.c
+++ b/signal/killpg.c
diff --git a/sysdeps/generic/raise.c b/signal/raise.c
index c5a449f7bc..c5a449f7bc 100644
--- a/sysdeps/generic/raise.c
+++ b/signal/raise.c
diff --git a/sysdeps/generic/sigaction.c b/signal/sigaction.c
index bf0a15bacb..bf0a15bacb 100644
--- a/sysdeps/generic/sigaction.c
+++ b/signal/sigaction.c
diff --git a/sysdeps/generic/sigaltstack.c b/signal/sigaltstack.c
index 17c7e06b35..17c7e06b35 100644
--- a/sysdeps/generic/sigaltstack.c
+++ b/signal/sigaltstack.c
diff --git a/sysdeps/generic/sigblock.c b/signal/sigblock.c
index 81a4ff1447..81a4ff1447 100644
--- a/sysdeps/generic/sigblock.c
+++ b/signal/sigblock.c
diff --git a/sysdeps/generic/sigfillset.c b/signal/sigfillset.c
index 95d52cf0c0..95d52cf0c0 100644
--- a/sysdeps/generic/sigfillset.c
+++ b/signal/sigfillset.c
diff --git a/sysdeps/generic/sigignore.c b/signal/sigignore.c
index 734422dd81..734422dd81 100644
--- a/sysdeps/generic/sigignore.c
+++ b/signal/sigignore.c
diff --git a/sysdeps/generic/sigintr.c b/signal/sigintr.c
index 9d4c2c8f58..9d4c2c8f58 100644
--- a/sysdeps/generic/sigintr.c
+++ b/signal/sigintr.c
diff --git a/sysdeps/generic/signal.c b/signal/signal.c
index 6c1808bb15..6c1808bb15 100644
--- a/sysdeps/generic/signal.c
+++ b/signal/signal.c
diff --git a/sysdeps/generic/sigpause.c b/signal/sigpause.c
index bc598d070c..bc598d070c 100644
--- a/sysdeps/generic/sigpause.c
+++ b/signal/sigpause.c
diff --git a/sysdeps/generic/sigpending.c b/signal/sigpending.c
index 80e16e588c..80e16e588c 100644
--- a/sysdeps/generic/sigpending.c
+++ b/signal/sigpending.c
diff --git a/sysdeps/generic/sigprocmask.c b/signal/sigprocmask.c
index 472b3a4fa5..472b3a4fa5 100644
--- a/sysdeps/generic/sigprocmask.c
+++ b/signal/sigprocmask.c
diff --git a/sysdeps/generic/sigqueue.c b/signal/sigqueue.c
index c6e77c0a27..c6e77c0a27 100644
--- a/sysdeps/generic/sigqueue.c
+++ b/signal/sigqueue.c
diff --git a/sysdeps/generic/sigreturn.c b/signal/sigreturn.c
index 0239b0a98c..0239b0a98c 100644
--- a/sysdeps/generic/sigreturn.c
+++ b/signal/sigreturn.c
diff --git a/sysdeps/generic/sigset.c b/signal/sigset.c
index 191a909158..191a909158 100644
--- a/sysdeps/generic/sigset.c
+++ b/signal/sigset.c
diff --git a/sysdeps/generic/sigsetmask.c b/signal/sigsetmask.c
index 602c0add40..602c0add40 100644
--- a/sysdeps/generic/sigsetmask.c
+++ b/signal/sigsetmask.c
diff --git a/sysdeps/generic/sigstack.c b/signal/sigstack.c
index ca9c8018a4..ca9c8018a4 100644
--- a/sysdeps/generic/sigstack.c
+++ b/signal/sigstack.c
diff --git a/sysdeps/generic/sigsuspend.c b/signal/sigsuspend.c
index 58452e334c..58452e334c 100644
--- a/sysdeps/generic/sigsuspend.c
+++ b/signal/sigsuspend.c
diff --git a/sysdeps/generic/sigtimedwait.c b/signal/sigtimedwait.c
index 7b114a3133..7b114a3133 100644
--- a/sysdeps/generic/sigtimedwait.c
+++ b/signal/sigtimedwait.c
diff --git a/sysdeps/generic/sigvec.c b/signal/sigvec.c
index 148e9a0d85..148e9a0d85 100644
--- a/sysdeps/generic/sigvec.c
+++ b/signal/sigvec.c
diff --git a/sysdeps/generic/sigwait.c b/signal/sigwait.c
index 016768553d..016768553d 100644
--- a/sysdeps/generic/sigwait.c
+++ b/signal/sigwait.c
diff --git a/sysdeps/generic/sigwaitinfo.c b/signal/sigwaitinfo.c
index e0659b0243..e0659b0243 100644
--- a/sysdeps/generic/sigwaitinfo.c
+++ b/signal/sigwaitinfo.c
diff --git a/sysdeps/generic/sysv_signal.c b/signal/sysv_signal.c
index 86dbb1d093..86dbb1d093 100644
--- a/sysdeps/generic/sysv_signal.c
+++ b/signal/sysv_signal.c
diff --git a/sysdeps/generic/getpeername.c b/socket/getpeername.c
index 6507387bd1..6507387bd1 100644
--- a/sysdeps/generic/getpeername.c
+++ b/socket/getpeername.c
diff --git a/sysdeps/generic/getsockname.c b/socket/getsockname.c
index b698bdbb7a..b698bdbb7a 100644
--- a/sysdeps/generic/getsockname.c
+++ b/socket/getsockname.c
diff --git a/sysdeps/generic/getsockopt.c b/socket/getsockopt.c
index 8f4fa89578..8f4fa89578 100644
--- a/sysdeps/generic/getsockopt.c
+++ b/socket/getsockopt.c
diff --git a/sysdeps/generic/isfdtype.c b/socket/isfdtype.c
index ba10912c9f..ba10912c9f 100644
--- a/sysdeps/generic/isfdtype.c
+++ b/socket/isfdtype.c
diff --git a/sysdeps/generic/listen.c b/socket/listen.c
index cbdd8b9d18..cbdd8b9d18 100644
--- a/sysdeps/generic/listen.c
+++ b/socket/listen.c
diff --git a/sysdeps/generic/opensock.c b/socket/opensock.c
index 4a4d5dd385..4a4d5dd385 100644
--- a/sysdeps/generic/opensock.c
+++ b/socket/opensock.c
diff --git a/sysdeps/generic/recv.c b/socket/recv.c
index 62af8fedf2..62af8fedf2 100644
--- a/sysdeps/generic/recv.c
+++ b/socket/recv.c
diff --git a/sysdeps/generic/recvfrom.c b/socket/recvfrom.c
index 4f6a045077..4f6a045077 100644
--- a/sysdeps/generic/recvfrom.c
+++ b/socket/recvfrom.c
diff --git a/sysdeps/generic/recvmsg.c b/socket/recvmsg.c
index 419415cd75..419415cd75 100644
--- a/sysdeps/generic/recvmsg.c
+++ b/socket/recvmsg.c
diff --git a/sysdeps/generic/send.c b/socket/send.c
index 7f94fbb093..7f94fbb093 100644
--- a/sysdeps/generic/send.c
+++ b/socket/send.c
diff --git a/sysdeps/generic/sendmsg.c b/socket/sendmsg.c
index a4a3cea950..a4a3cea950 100644
--- a/sysdeps/generic/sendmsg.c
+++ b/socket/sendmsg.c
diff --git a/sysdeps/generic/sendto.c b/socket/sendto.c
index 823c9dd1c7..823c9dd1c7 100644
--- a/sysdeps/generic/sendto.c
+++ b/socket/sendto.c
diff --git a/sysdeps/generic/setsockopt.c b/socket/setsockopt.c
index aca73623fe..aca73623fe 100644
--- a/sysdeps/generic/setsockopt.c
+++ b/socket/setsockopt.c
diff --git a/sysdeps/generic/shutdown.c b/socket/shutdown.c
index 6fb25a4bc1..6fb25a4bc1 100644
--- a/sysdeps/generic/shutdown.c
+++ b/socket/shutdown.c
diff --git a/sysdeps/generic/sockatmark.c b/socket/sockatmark.c
index 402ef9b4d0..402ef9b4d0 100644
--- a/sysdeps/generic/sockatmark.c
+++ b/socket/sockatmark.c
diff --git a/sysdeps/generic/socket.c b/socket/socket.c
index 94e70bc4ea..94e70bc4ea 100644
--- a/sysdeps/generic/socket.c
+++ b/socket/socket.c
diff --git a/sysdeps/generic/socketpair.c b/socket/socketpair.c
index ad277c00e5..ad277c00e5 100644
--- a/sysdeps/generic/socketpair.c
+++ b/socket/socketpair.c
diff --git a/sysdeps/generic/errlist.c b/stdio-common/errlist.c
index 6a834fc329..6a834fc329 100644
--- a/sysdeps/generic/errlist.c
+++ b/stdio-common/errlist.c
diff --git a/sysdeps/generic/flockfile.c b/stdio-common/flockfile.c
index 571930ee54..571930ee54 100644
--- a/sysdeps/generic/flockfile.c
+++ b/stdio-common/flockfile.c
diff --git a/sysdeps/generic/ftrylockfile.c b/stdio-common/ftrylockfile.c
index 7bd3e9b53b..7bd3e9b53b 100644
--- a/sysdeps/generic/ftrylockfile.c
+++ b/stdio-common/ftrylockfile.c
diff --git a/sysdeps/generic/funlockfile.c b/stdio-common/funlockfile.c
index 902d29478d..902d29478d 100644
--- a/sysdeps/generic/funlockfile.c
+++ b/stdio-common/funlockfile.c
diff --git a/sysdeps/generic/printf_fphex.c b/stdio-common/printf_fphex.c
index fd790d5bf3..fd790d5bf3 100644
--- a/sysdeps/generic/printf_fphex.c
+++ b/stdio-common/printf_fphex.c
diff --git a/sysdeps/generic/remove.c b/stdio-common/remove.c
index 5dc0e9edf0..5dc0e9edf0 100644
--- a/sysdeps/generic/remove.c
+++ b/stdio-common/remove.c
diff --git a/sysdeps/generic/rename.c b/stdio-common/rename.c
index b7d8392179..b7d8392179 100644
--- a/sysdeps/generic/rename.c
+++ b/stdio-common/rename.c
diff --git a/sysdeps/generic/renameat.c b/stdio-common/renameat.c
index e8629098df..e8629098df 100644
--- a/sysdeps/generic/renameat.c
+++ b/stdio-common/renameat.c
diff --git a/sysdeps/generic/siglist.c b/stdio-common/siglist.c
index 80847cd491..80847cd491 100644
--- a/sysdeps/generic/siglist.c
+++ b/stdio-common/siglist.c
diff --git a/sysdeps/generic/tempname.c b/stdio-common/tempname.c
index 60c94d6409..60c94d6409 100644
--- a/sysdeps/generic/tempname.c
+++ b/stdio-common/tempname.c
diff --git a/sysdeps/generic/tmpfile.c b/stdio-common/tmpfile.c
index 41f12bc8ba..41f12bc8ba 100644
--- a/sysdeps/generic/tmpfile.c
+++ b/stdio-common/tmpfile.c
diff --git a/sysdeps/generic/tmpfile64.c b/stdio-common/tmpfile64.c
index adce634556..adce634556 100644
--- a/sysdeps/generic/tmpfile64.c
+++ b/stdio-common/tmpfile64.c
diff --git a/sysdeps/generic/getcontext.c b/stdlib/getcontext.c
index e417575a58..e417575a58 100644
--- a/sysdeps/generic/getcontext.c
+++ b/stdlib/getcontext.c
diff --git a/sysdeps/generic/getenv.c b/stdlib/getenv.c
index 6cdfe2b266..6cdfe2b266 100644
--- a/sysdeps/generic/getenv.c
+++ b/stdlib/getenv.c
diff --git a/sysdeps/generic/inlines.c b/stdlib/inlines.c
index dca305e6e4..5f1065ea13 100644
--- a/sysdeps/generic/inlines.c
+++ b/stdlib/inlines.c
@@ -1,3 +1,3 @@
 #define _FORCE_INLINES
 #define _EXTERN_INLINE /* empty */
-#include "gmp.h"
+#include <gmp.h>
diff --git a/sysdeps/generic/labs.c b/stdlib/labs.c
index c568e44454..c568e44454 100644
--- a/sysdeps/generic/labs.c
+++ b/stdlib/labs.c
diff --git a/sysdeps/generic/ldbl2mpn.c b/stdlib/ldbl2mpn.c
index 450f9381cc..450f9381cc 100644
--- a/sysdeps/generic/ldbl2mpn.c
+++ b/stdlib/ldbl2mpn.c
diff --git a/sysdeps/generic/ldiv.c b/stdlib/ldiv.c
index a7796d8e95..a7796d8e95 100644
--- a/sysdeps/generic/ldiv.c
+++ b/stdlib/ldiv.c
diff --git a/sysdeps/generic/llabs.c b/stdlib/llabs.c
index b15c347d32..b15c347d32 100644
--- a/sysdeps/generic/llabs.c
+++ b/stdlib/llabs.c
diff --git a/sysdeps/generic/lldiv.c b/stdlib/lldiv.c
index 28a016b744..28a016b744 100644
--- a/sysdeps/generic/lldiv.c
+++ b/stdlib/lldiv.c
diff --git a/sysdeps/generic/lshift.c b/stdlib/lshift.c
index 0b58389658..bedf44229f 100644
--- a/sysdeps/generic/lshift.c
+++ b/stdlib/lshift.c
@@ -19,7 +19,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
-#include "gmp.h"
+#include <gmp.h>
 #include "gmp-impl.h"
 
 /* Shift U (pointed to by UP and USIZE digits long) CNT bits to the left
diff --git a/sysdeps/generic/makecontext.c b/stdlib/makecontext.c
index a65868827f..a65868827f 100644
--- a/sysdeps/generic/makecontext.c
+++ b/stdlib/makecontext.c
diff --git a/sysdeps/generic/mod_1.c b/stdlib/mod_1.c
index 90385d1e6a..3273c9222d 100644
--- a/sysdeps/generic/mod_1.c
+++ b/stdlib/mod_1.c
@@ -22,7 +22,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
-#include "gmp.h"
+#include <gmp.h>
 #include "gmp-impl.h"
 #include "longlong.h"
 
diff --git a/sysdeps/generic/mp_clz_tab.c b/stdlib/mp_clz_tab.c
index 520ea31930..2220299e7c 100644
--- a/sysdeps/generic/mp_clz_tab.c
+++ b/stdlib/mp_clz_tab.c
@@ -19,7 +19,7 @@
    02111-1307 USA.  */
 
 #if 0
-#include "gmp.h"
+#include <gmp.h>
 #include "gmp-impl.h"
 #endif
 
diff --git a/sysdeps/generic/mpn2dbl.c b/stdlib/mpn2dbl.c
index ea1b7dc27f..178edbf816 100644
--- a/sysdeps/generic/mpn2dbl.c
+++ b/stdlib/mpn2dbl.c
@@ -16,7 +16,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include "gmp.h"
+#include <gmp.h>
 #include "gmp-impl.h"
 #include <float.h>
 
diff --git a/sysdeps/generic/mpn2flt.c b/stdlib/mpn2flt.c
index 16ec73c174..16ec73c174 100644
--- a/sysdeps/generic/mpn2flt.c
+++ b/stdlib/mpn2flt.c
diff --git a/sysdeps/generic/mpn2ldbl.c b/stdlib/mpn2ldbl.c
index 450f9381cc..450f9381cc 100644
--- a/sysdeps/generic/mpn2ldbl.c
+++ b/stdlib/mpn2ldbl.c
diff --git a/sysdeps/generic/mul.c b/stdlib/mul.c
index 7678e72a0a..fe0cbf3d7f 100644
--- a/sysdeps/generic/mul.c
+++ b/stdlib/mul.c
@@ -19,7 +19,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
-#include "gmp.h"
+#include <gmp.h>
 #include "gmp-impl.h"
 
 /* Multiply the natural numbers u (pointed to by UP, with USIZE limbs)
diff --git a/sysdeps/generic/mul_1.c b/stdlib/mul_1.c
index 1c36b5fb1f..686e6c5efe 100644
--- a/sysdeps/generic/mul_1.c
+++ b/stdlib/mul_1.c
@@ -20,7 +20,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
-#include "gmp.h"
+#include <gmp.h>
 #include "gmp-impl.h"
 #include "longlong.h"
 
diff --git a/sysdeps/generic/mul_n.c b/stdlib/mul_n.c
index 2120cd4f59..b478c76aba 100644
--- a/sysdeps/generic/mul_n.c
+++ b/stdlib/mul_n.c
@@ -19,7 +19,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
-#include "gmp.h"
+#include <gmp.h>
 #include "gmp-impl.h"
 
 /* Multiply the natural numbers u (pointed to by UP) and v (pointed to by VP),
diff --git a/sysdeps/generic/putenv.c b/stdlib/putenv.c
index 4e8693403a..4e8693403a 100644
--- a/sysdeps/generic/putenv.c
+++ b/stdlib/putenv.c
diff --git a/sysdeps/generic/rshift.c b/stdlib/rshift.c
index 59caf73529..9d0a9c4c0e 100644
--- a/sysdeps/generic/rshift.c
+++ b/stdlib/rshift.c
@@ -19,7 +19,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
-#include "gmp.h"
+#include <gmp.h>
 #include "gmp-impl.h"
 
 /* Shift U (pointed to by UP and USIZE limbs long) CNT bits to the right
diff --git a/sysdeps/generic/setcontext.c b/stdlib/setcontext.c
index 5841e20317..5841e20317 100644
--- a/sysdeps/generic/setcontext.c
+++ b/stdlib/setcontext.c
diff --git a/sysdeps/generic/setenv.c b/stdlib/setenv.c
index 48aaecffe0..48aaecffe0 100644
--- a/sysdeps/generic/setenv.c
+++ b/stdlib/setenv.c
diff --git a/sysdeps/generic/strtoimax.c b/stdlib/strtoimax.c
index f1de70f320..f1de70f320 100644
--- a/sysdeps/generic/strtoimax.c
+++ b/stdlib/strtoimax.c
diff --git a/sysdeps/generic/strtol.c b/stdlib/strtol.c
index 02ec19aabe..02ec19aabe 100644
--- a/sysdeps/generic/strtol.c
+++ b/stdlib/strtol.c
diff --git a/sysdeps/generic/strtol_l.c b/stdlib/strtol_l.c
index 156083c748..156083c748 100644
--- a/sysdeps/generic/strtol_l.c
+++ b/stdlib/strtol_l.c
diff --git a/sysdeps/generic/strtold_l.c b/stdlib/strtold_l.c
index 690a8a92eb..690a8a92eb 100644
--- a/sysdeps/generic/strtold_l.c
+++ b/stdlib/strtold_l.c
diff --git a/sysdeps/generic/strtoll.c b/stdlib/strtoll.c
index 60128df781..60128df781 100644
--- a/sysdeps/generic/strtoll.c
+++ b/stdlib/strtoll.c
diff --git a/sysdeps/generic/strtoll_l.c b/stdlib/strtoll_l.c
index 7725035bd1..7725035bd1 100644
--- a/sysdeps/generic/strtoll_l.c
+++ b/stdlib/strtoll_l.c
diff --git a/sysdeps/generic/strtoul.c b/stdlib/strtoul.c
index 0862950231..0862950231 100644
--- a/sysdeps/generic/strtoul.c
+++ b/stdlib/strtoul.c
diff --git a/sysdeps/generic/strtoul_l.c b/stdlib/strtoul_l.c
index a8b980f48d..a8b980f48d 100644
--- a/sysdeps/generic/strtoul_l.c
+++ b/stdlib/strtoul_l.c
diff --git a/sysdeps/generic/strtoull.c b/stdlib/strtoull.c
index accf5874a0..accf5874a0 100644
--- a/sysdeps/generic/strtoull.c
+++ b/stdlib/strtoull.c
diff --git a/sysdeps/generic/strtoull_l.c b/stdlib/strtoull_l.c
index 68ad0d826e..68ad0d826e 100644
--- a/sysdeps/generic/strtoull_l.c
+++ b/stdlib/strtoull_l.c
diff --git a/sysdeps/generic/strtoumax.c b/stdlib/strtoumax.c
index 508cb19f8c..508cb19f8c 100644
--- a/sysdeps/generic/strtoumax.c
+++ b/stdlib/strtoumax.c
diff --git a/sysdeps/generic/sub_n.c b/stdlib/sub_n.c
index 4f2f06099c..987ad91eb1 100644
--- a/sysdeps/generic/sub_n.c
+++ b/stdlib/sub_n.c
@@ -19,7 +19,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
-#include "gmp.h"
+#include <gmp.h>
 #include "gmp-impl.h"
 
 mp_limb_t
diff --git a/sysdeps/generic/submul_1.c b/stdlib/submul_1.c
index c7c08ee4af..3e7163a2a3 100644
--- a/sysdeps/generic/submul_1.c
+++ b/stdlib/submul_1.c
@@ -3,7 +3,7 @@
    from the limb vector pointed to by RES_PTR.  Return the most significant
    limb of the product, adjusted for carry-out from the subtraction.
 
-Copyright (C) 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1996, 2005 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library.
 
@@ -22,7 +22,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
-#include "gmp.h"
+#include <gmp.h>
 #include "gmp-impl.h"
 #include "longlong.h"
 
diff --git a/sysdeps/generic/swapcontext.c b/stdlib/swapcontext.c
index 56b73f0d6c..56b73f0d6c 100644
--- a/sysdeps/generic/swapcontext.c
+++ b/stdlib/swapcontext.c
diff --git a/sysdeps/generic/system.c b/stdlib/system.c
index cd12128cd8..cd12128cd8 100644
--- a/sysdeps/generic/system.c
+++ b/stdlib/system.c
diff --git a/sysdeps/generic/udiv_qrnnd.c b/stdlib/udiv_qrnnd.c
index d32796c04d..d32796c04d 100644
--- a/sysdeps/generic/udiv_qrnnd.c
+++ b/stdlib/udiv_qrnnd.c
diff --git a/sysdeps/generic/wcstoimax.c b/stdlib/wcstoimax.c
index f1de70f320..f1de70f320 100644
--- a/sysdeps/generic/wcstoimax.c
+++ b/stdlib/wcstoimax.c
diff --git a/sysdeps/generic/wcstoumax.c b/stdlib/wcstoumax.c
index 508cb19f8c..508cb19f8c 100644
--- a/sysdeps/generic/wcstoumax.c
+++ b/stdlib/wcstoumax.c
diff --git a/sysdeps/generic/fattach.c b/streams/fattach.c
index 555e0b65e6..555e0b65e6 100644
--- a/sysdeps/generic/fattach.c
+++ b/streams/fattach.c
diff --git a/sysdeps/generic/fdetach.c b/streams/fdetach.c
index 431c92bbea..431c92bbea 100644
--- a/sysdeps/generic/fdetach.c
+++ b/streams/fdetach.c
diff --git a/sysdeps/generic/getmsg.c b/streams/getmsg.c
index 861a40f677..861a40f677 100644
--- a/sysdeps/generic/getmsg.c
+++ b/streams/getmsg.c
diff --git a/sysdeps/generic/getpmsg.c b/streams/getpmsg.c
index e6e9898e46..e6e9898e46 100644
--- a/sysdeps/generic/getpmsg.c
+++ b/streams/getpmsg.c
diff --git a/sysdeps/generic/isastream.c b/streams/isastream.c
index 88dae299fc..88dae299fc 100644
--- a/sysdeps/generic/isastream.c
+++ b/streams/isastream.c
diff --git a/sysdeps/generic/putmsg.c b/streams/putmsg.c
index b84dd843ba..b84dd843ba 100644
--- a/sysdeps/generic/putmsg.c
+++ b/streams/putmsg.c
diff --git a/sysdeps/generic/putpmsg.c b/streams/putpmsg.c
index 6e37036aac..6e37036aac 100644
--- a/sysdeps/generic/putpmsg.c
+++ b/streams/putpmsg.c
diff --git a/sysdeps/generic/ffs.c b/string/ffs.c
index 06a1542bd9..06a1542bd9 100644
--- a/sysdeps/generic/ffs.c
+++ b/string/ffs.c
diff --git a/sysdeps/generic/ffsll.c b/string/ffsll.c
index 9dd269afb7..9dd269afb7 100644
--- a/sysdeps/generic/ffsll.c
+++ b/string/ffsll.c
diff --git a/sysdeps/generic/memccpy.c b/string/memccpy.c
index 9ffdc335d4..9ffdc335d4 100644
--- a/sysdeps/generic/memccpy.c
+++ b/string/memccpy.c
diff --git a/sysdeps/generic/memchr.c b/string/memchr.c
index f3098c775a..f3098c775a 100644
--- a/sysdeps/generic/memchr.c
+++ b/string/memchr.c
diff --git a/sysdeps/generic/memcmp.c b/string/memcmp.c
index 2f8cf344af..2f8cf344af 100644
--- a/sysdeps/generic/memcmp.c
+++ b/string/memcmp.c
diff --git a/sysdeps/generic/memcpy.c b/string/memcpy.c
index e167e85d7b..e167e85d7b 100644
--- a/sysdeps/generic/memcpy.c
+++ b/string/memcpy.c
diff --git a/sysdeps/generic/memmem.c b/string/memmem.c
index c40462104a..c40462104a 100644
--- a/sysdeps/generic/memmem.c
+++ b/string/memmem.c
diff --git a/sysdeps/generic/memmove.c b/string/memmove.c
index 16671f7bb5..16671f7bb5 100644
--- a/sysdeps/generic/memmove.c
+++ b/string/memmove.c
diff --git a/sysdeps/generic/mempcpy.c b/string/mempcpy.c
index a72617e86f..a72617e86f 100644
--- a/sysdeps/generic/mempcpy.c
+++ b/string/mempcpy.c
diff --git a/sysdeps/generic/memrchr.c b/string/memrchr.c
index 21662b1bd7..21662b1bd7 100644
--- a/sysdeps/generic/memrchr.c
+++ b/string/memrchr.c
diff --git a/sysdeps/generic/memset.c b/string/memset.c
index 592b11e435..592b11e435 100644
--- a/sysdeps/generic/memset.c
+++ b/string/memset.c
diff --git a/sysdeps/generic/rawmemchr.c b/string/rawmemchr.c
index cb00ad7e90..cb00ad7e90 100644
--- a/sysdeps/generic/rawmemchr.c
+++ b/string/rawmemchr.c
diff --git a/sysdeps/generic/stpcpy.c b/string/stpcpy.c
index 6e42911fde..6e42911fde 100644
--- a/sysdeps/generic/stpcpy.c
+++ b/string/stpcpy.c
diff --git a/sysdeps/generic/stpncpy.c b/string/stpncpy.c
index 164d0f1747..164d0f1747 100644
--- a/sysdeps/generic/stpncpy.c
+++ b/string/stpncpy.c
diff --git a/sysdeps/generic/strcasecmp.c b/string/strcasecmp.c
index 3ae3d67d04..3ae3d67d04 100644
--- a/sysdeps/generic/strcasecmp.c
+++ b/string/strcasecmp.c
diff --git a/sysdeps/generic/strcasecmp_l.c b/string/strcasecmp_l.c
index 1cd3fe14c5..498a27d975 100644
--- a/sysdeps/generic/strcasecmp_l.c
+++ b/string/strcasecmp_l.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2002, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,7 +17,7 @@
    02111-1307 USA.  */
 
 #define USE_IN_EXTENDED_LOCALE_MODEL	1
-#include <sysdeps/generic/strcasecmp.c>
+#include "strcasecmp.c"
 
 libc_hidden_def (__strcasecmp_l)
 weak_alias (__strcasecmp_l, strcasecmp_l)
diff --git a/sysdeps/generic/strcasestr.c b/string/strcasestr.c
index 1dde43c606..1dde43c606 100644
--- a/sysdeps/generic/strcasestr.c
+++ b/string/strcasestr.c
diff --git a/sysdeps/generic/strcat.c b/string/strcat.c
index eef22add36..eef22add36 100644
--- a/sysdeps/generic/strcat.c
+++ b/string/strcat.c
diff --git a/sysdeps/generic/strchr.c b/string/strchr.c
index c8b7969e85..c8b7969e85 100644
--- a/sysdeps/generic/strchr.c
+++ b/string/strchr.c
diff --git a/sysdeps/generic/strchrnul.c b/string/strchrnul.c
index 88b96dd126..88b96dd126 100644
--- a/sysdeps/generic/strchrnul.c
+++ b/string/strchrnul.c
diff --git a/sysdeps/generic/strcmp.c b/string/strcmp.c
index bd53c05c6e..bd53c05c6e 100644
--- a/sysdeps/generic/strcmp.c
+++ b/string/strcmp.c
diff --git a/sysdeps/generic/strcpy.c b/string/strcpy.c
index c736a60762..c736a60762 100644
--- a/sysdeps/generic/strcpy.c
+++ b/string/strcpy.c
diff --git a/sysdeps/generic/strcspn.c b/string/strcspn.c
index f359d578f7..f359d578f7 100644
--- a/sysdeps/generic/strcspn.c
+++ b/string/strcspn.c
diff --git a/sysdeps/generic/string-inlines.c b/string/string-inlines.c
index 89a5baab5d..89a5baab5d 100644
--- a/sysdeps/generic/string-inlines.c
+++ b/string/string-inlines.c
diff --git a/sysdeps/generic/strlen.c b/string/strlen.c
index 9bc9db68f7..9bc9db68f7 100644
--- a/sysdeps/generic/strlen.c
+++ b/string/strlen.c
diff --git a/sysdeps/generic/strncase.c b/string/strncase.c
index a55aaf6a3a..a55aaf6a3a 100644
--- a/sysdeps/generic/strncase.c
+++ b/string/strncase.c
diff --git a/sysdeps/generic/strncase_l.c b/string/strncase_l.c
index 0e61ebec7d..0f22b46de1 100644
--- a/sysdeps/generic/strncase_l.c
+++ b/string/strncase_l.c
@@ -1,6 +1,6 @@
 /* Compare at most N characters of two strings without taking care for
    the case using given locale.
-   Copyright (C) 1997, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2002, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
    02111-1307 USA.  */
 
 #define USE_IN_EXTENDED_LOCALE_MODEL	1
-#include <sysdeps/generic/strncase.c>
+#include "strncase.c"
 
 libc_hidden_def (__strncasecmp_l)
 weak_alias (__strncasecmp_l, strncasecmp_l)
diff --git a/sysdeps/generic/strncat.c b/string/strncat.c
index 2e2de11508..2e2de11508 100644
--- a/sysdeps/generic/strncat.c
+++ b/string/strncat.c
diff --git a/sysdeps/generic/strncmp.c b/string/strncmp.c
index 1adb2c0ebd..1adb2c0ebd 100644
--- a/sysdeps/generic/strncmp.c
+++ b/string/strncmp.c
diff --git a/sysdeps/generic/strncpy.c b/string/strncpy.c
index f32612e1cf..f32612e1cf 100644
--- a/sysdeps/generic/strncpy.c
+++ b/string/strncpy.c
diff --git a/sysdeps/generic/strnlen.c b/string/strnlen.c
index 454257b2bc..454257b2bc 100644
--- a/sysdeps/generic/strnlen.c
+++ b/string/strnlen.c
diff --git a/sysdeps/generic/strpbrk.c b/string/strpbrk.c
index 620cfab7f9..620cfab7f9 100644
--- a/sysdeps/generic/strpbrk.c
+++ b/string/strpbrk.c
diff --git a/sysdeps/generic/strrchr.c b/string/strrchr.c
index 64118b87ef..64118b87ef 100644
--- a/sysdeps/generic/strrchr.c
+++ b/string/strrchr.c
diff --git a/sysdeps/generic/strsep.c b/string/strsep.c
index e5342f7a22..e5342f7a22 100644
--- a/sysdeps/generic/strsep.c
+++ b/string/strsep.c
diff --git a/sysdeps/generic/strspn.c b/string/strspn.c
index dc17ea8cbc..dc17ea8cbc 100644
--- a/sysdeps/generic/strspn.c
+++ b/string/strspn.c
diff --git a/sysdeps/generic/strstr.c b/string/strstr.c
index fce1f2a756..fce1f2a756 100644
--- a/sysdeps/generic/strstr.c
+++ b/string/strstr.c
diff --git a/sysdeps/generic/strtok.c b/string/strtok.c
index f45b760f74..f45b760f74 100644
--- a/sysdeps/generic/strtok.c
+++ b/string/strtok.c
diff --git a/sysdeps/generic/strtok_r.c b/string/strtok_r.c
index b11cb520f6..b11cb520f6 100644
--- a/sysdeps/generic/strtok_r.c
+++ b/string/strtok_r.c
diff --git a/sysdeps/generic/wordcopy.c b/string/wordcopy.c
index 0c9a4be4f6..0c9a4be4f6 100644
--- a/sysdeps/generic/wordcopy.c
+++ b/string/wordcopy.c
diff --git a/sysdeps/generic/xpg-strerror.c b/string/xpg-strerror.c
index 5cb56cdfb8..5cb56cdfb8 100644
--- a/sysdeps/generic/xpg-strerror.c
+++ b/string/xpg-strerror.c
diff --git a/sysdeps/generic/_strerror.c b/sysdeps/generic/_strerror.c
deleted file mode 100644
index f6f16ff2af..0000000000
--- a/sysdeps/generic/_strerror.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright (C) 1991,93,95,96,97,98,2000,2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <libintl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/param.h>
-#include <stdio-common/_itoa.h>
-
-/* It is critical here that we always use the `dcgettext' function for
-   the message translation.  Since <libintl.h> only defines the macro
-   `dgettext' to use `dcgettext' for optimizing programs this is not
-   always guaranteed.  */
-#ifndef dgettext
-# include <locale.h>		/* We need LC_MESSAGES.  */
-# define dgettext(domainname, msgid) dcgettext (domainname, msgid, LC_MESSAGES)
-#endif
-
-/* Return a string describing the errno code in ERRNUM.  */
-char *
-__strerror_r (int errnum, char *buf, size_t buflen)
-{
-  if (errnum < 0 || errnum >= _sys_nerr_internal
-      || _sys_errlist_internal[errnum] == NULL)
-    {
-      /* Buffer we use to print the number in.  For a maximum size for
-	 `int' of 8 bytes we never need more than 20 digits.  */
-      char numbuf[21];
-      const char *unk = _("Unknown error ");
-      const size_t unklen = strlen (unk);
-      char *p, *q;
-
-      numbuf[20] = '\0';
-      p = _itoa_word (errnum, &numbuf[20], 10, 0);
-
-      /* Now construct the result while taking care for the destination
-	 buffer size.  */
-      q = __mempcpy (buf, unk, MIN (unklen, buflen));
-      if (unklen < buflen)
-	memcpy (q, p, MIN ((size_t) (&numbuf[21] - p), buflen - unklen));
-
-      /* Terminate the string in any case.  */
-      if (buflen > 0)
-	buf[buflen - 1] = '\0';
-
-      return buf;
-    }
-
-  return (char *) _(_sys_errlist_internal[errnum]);
-}
-weak_alias (__strerror_r, strerror_r)
-libc_hidden_def (__strerror_r)
diff --git a/sysdeps/generic/abort.c b/sysdeps/generic/abort.c
deleted file mode 100644
index 00788f22c7..0000000000
--- a/sysdeps/generic/abort.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Copyright (C) 1991,93,95,96,97,98,2001,02 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <bits/libc-lock.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-/* Try to get a machine dependent instruction which will make the
-   program crash.  This is used in case everything else fails.  */
-#include <abort-instr.h>
-#ifndef ABORT_INSTRUCTION
-/* No such instruction is available.  */
-# define ABORT_INSTRUCTION
-#endif
-
-#ifdef USE_IN_LIBIO
-# include <libio/libioP.h>
-# define fflush(s) _IO_flush_all_lockp (0)
-#endif
-
-/* We must avoid to run in circles.  Therefore we remember how far we
-   already got.  */
-static int stage;
-
-/* We should be prepared for multiple threads trying to run abort.  */
-__libc_lock_define_initialized_recursive (static, lock);
-
-
-/* Cause an abnormal program termination with core-dump.  */
-void
-abort (void)
-{
-  struct sigaction act;
-  sigset_t sigs;
-
-  /* First acquire the lock.  */
-  __libc_lock_lock_recursive (lock);
-
-  /* Now it's for sure we are alone.  But recursive calls are possible.  */
-
-  /* Unlock SIGABRT.  */
-  if (stage == 0)
-    {
-      ++stage;
-      if (__sigemptyset (&sigs) == 0 &&
-	  __sigaddset (&sigs, SIGABRT) == 0)
-	__sigprocmask (SIG_UNBLOCK, &sigs, (sigset_t *) NULL);
-    }
-
-  /* Flush all streams.  We cannot close them now because the user
-     might have registered a handler for SIGABRT.  */
-  if (stage == 1)
-    {
-      ++stage;
-      fflush (NULL);
-    }
-
-  /* Send signal which possibly calls a user handler.  */
-  if (stage == 2)
-    {
-      /* This stage is special: we must allow repeated calls of
-	 `abort' when a user defined handler for SIGABRT is installed.
-	 This is risky since the `raise' implementation might also
-	 fail but I don't see another possibility.  */
-      int save_stage = stage;
-
-      stage = 0;
-      __libc_lock_unlock_recursive (lock);
-
-      raise (SIGABRT);
-
-      __libc_lock_lock_recursive (lock);
-      stage = save_stage + 1;
-    }
-
-  /* There was a handler installed.  Now remove it.  */
-  if (stage == 3)
-    {
-      ++stage;
-      memset (&act, '\0', sizeof (struct sigaction));
-      act.sa_handler = SIG_DFL;
-      __sigfillset (&act.sa_mask);
-      act.sa_flags = 0;
-      __sigaction (SIGABRT, &act, NULL);
-    }
-
-  /* Now close the streams which also flushes the output the user
-     defined handler might has produced.  */
-  if (stage == 4)
-    {
-      ++stage;
-      __fcloseall ();
-    }
-
-  /* Try again.  */
-  if (stage == 5)
-    {
-      ++stage;
-      raise (SIGABRT);
-    }
-
-  /* Now try to abort using the system specific command.  */
-  if (stage == 6)
-    {
-      ++stage;
-      ABORT_INSTRUCTION;
-    }
-
-  /* If we can't signal ourselves and the abort instruction failed, exit.  */
-  if (stage == 7)
-    {
-      ++stage;
-      _exit (127);
-    }
-
-  /* If even this fails try to use the provided instruction to crash
-     or otherwise make sure we never return.  */
-  while (1)
-    /* Try for ever and ever.  */
-    ABORT_INSTRUCTION;
-}
-libc_hidden_def (abort)
diff --git a/sysdeps/generic/accept.c b/sysdeps/generic/accept.c
deleted file mode 100644
index dad34ceddd..0000000000
--- a/sysdeps/generic/accept.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/socket.h>
-
-/* Await a connection on socket FD.
-   When a connection arrives, open a new socket to communicate with it,
-   set *ADDR (which is *ADDR_LEN bytes long) to the address of the connecting
-   peer and *ADDR_LEN to the address's actual length, and return the
-   new socket's descriptor, or -1 for errors.  */
-int
-accept (fd, addr, addr_len)
-     int fd;
-     __SOCKADDR_ARG addr;
-     socklen_t *addr_len;
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-libc_hidden_def (accept)
-
-
-stub_warning (accept)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/access.c b/sysdeps/generic/access.c
deleted file mode 100644
index c266e945a9..0000000000
--- a/sysdeps/generic/access.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stddef.h>
-#include <unistd.h>
-
-/* Test for access to FILE.  */
-int
-__access (file, type)
-     const char *file;
-     int type;
-{
-  if (file == NULL || (type & ~(R_OK|W_OK|X_OK|F_OK)) != 0)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  __set_errno (ENOSYS);
-  return -1;
-}
-stub_warning (access)
-
-weak_alias (__access, access)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/acct.c b/sysdeps/generic/acct.c
deleted file mode 100644
index b626b5d938..0000000000
--- a/sysdeps/generic/acct.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <unistd.h>
-
-/* Turn accounting on if NAME is an existing file.  The system will then write
-   a record for each process as it terminates, to this file.  If NAME is NULL,
-   turn accounting off.  This call is restricted to the super-user.  */
-int
-acct (name)
-     const char *name;
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-stub_warning (acct)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/add_n.c b/sysdeps/generic/add_n.c
deleted file mode 100644
index 5fcb7e4835..0000000000
--- a/sysdeps/generic/add_n.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* mpn_add_n -- Add two limb vectors of equal, non-zero length.
-
-Copyright (C) 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
-
-#include "gmp.h"
-#include "gmp-impl.h"
-
-mp_limb_t
-#if __STDC__
-mpn_add_n (mp_ptr res_ptr, mp_srcptr s1_ptr, mp_srcptr s2_ptr, mp_size_t size)
-#else
-mpn_add_n (res_ptr, s1_ptr, s2_ptr, size)
-     register mp_ptr res_ptr;
-     register mp_srcptr s1_ptr;
-     register mp_srcptr s2_ptr;
-     mp_size_t size;
-#endif
-{
-  register mp_limb_t x, y, cy;
-  register mp_size_t j;
-
-  /* The loop counter and index J goes from -SIZE to -1.  This way
-     the loop becomes faster.  */
-  j = -size;
-
-  /* Offset the base pointers to compensate for the negative indices.  */
-  s1_ptr -= j;
-  s2_ptr -= j;
-  res_ptr -= j;
-
-  cy = 0;
-  do
-    {
-      y = s2_ptr[j];
-      x = s1_ptr[j];
-      y += cy;			/* add previous carry to one addend */
-      cy = (y < cy);		/* get out carry from that addition */
-      y = x + y;		/* add other addend */
-      cy = (y < x) + cy;	/* get out carry from that add, combine */
-      res_ptr[j] = y;
-    }
-  while (++j != 0);
-
-  return cy;
-}
diff --git a/sysdeps/generic/addmul_1.c b/sysdeps/generic/addmul_1.c
deleted file mode 100644
index 746ae31307..0000000000
--- a/sysdeps/generic/addmul_1.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* mpn_addmul_1 -- multiply the S1_SIZE long limb vector pointed to by S1_PTR
-   by S2_LIMB, add the S1_SIZE least significant limbs of the product to the
-   limb vector pointed to by RES_PTR.  Return the most significant limb of
-   the product, adjusted for carry-out from the addition.
-
-Copyright (C) 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
-
-#include "gmp.h"
-#include "gmp-impl.h"
-#include "longlong.h"
-
-mp_limb_t
-mpn_addmul_1 (res_ptr, s1_ptr, s1_size, s2_limb)
-     register mp_ptr res_ptr;
-     register mp_srcptr s1_ptr;
-     mp_size_t s1_size;
-     register mp_limb_t s2_limb;
-{
-  register mp_limb_t cy_limb;
-  register mp_size_t j;
-  register mp_limb_t prod_high, prod_low;
-  register mp_limb_t x;
-
-  /* The loop counter and index J goes from -SIZE to -1.  This way
-     the loop becomes faster.  */
-  j = -s1_size;
-
-  /* Offset the base pointers to compensate for the negative indices.  */
-  res_ptr -= j;
-  s1_ptr -= j;
-
-  cy_limb = 0;
-  do
-    {
-      umul_ppmm (prod_high, prod_low, s1_ptr[j], s2_limb);
-
-      prod_low += cy_limb;
-      cy_limb = (prod_low < cy_limb) + prod_high;
-
-      x = res_ptr[j];
-      prod_low = x + prod_low;
-      cy_limb += (prod_low < x);
-      res_ptr[j] = prod_low;
-    }
-  while (++j != 0);
-
-  return cy_limb;
-}
diff --git a/sysdeps/generic/adjtime.c b/sysdeps/generic/adjtime.c
deleted file mode 100644
index 8645652188..0000000000
--- a/sysdeps/generic/adjtime.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/time.h>
-
-/* Adjust the current time of day by the amount in DELTA.
-   If OLDDELTA is not NULL, it is filled in with the amount
-   of time adjustment remaining to be done from the last `__adjtime' call.
-   This call is restricted to the super-user.  */
-int
-__adjtime (delta, olddelta)
-     const struct timeval *delta;
-     struct timeval *olddelta;
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-stub_warning (adjtime)
-
-weak_alias (__adjtime, adjtime)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/aio_cancel.c b/sysdeps/generic/aio_cancel.c
deleted file mode 100644
index c24a2f7529..0000000000
--- a/sysdeps/generic/aio_cancel.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Cancel requests associated with given file descriptor.  Stub version.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-
-/* We use an UGLY hack to prevent gcc from finding us cheating.  The
-   implementation of aio_cancel and aio_cancel64 are identical and so
-   we want to avoid code duplication by using aliases.  But gcc sees
-   the different parameter lists and prints a warning.  We define here
-   a function so that aio_cancel64 has no prototype.  */
-#define aio_cancel64 XXX
-#include <aio.h>
-/* And undo the hack.  */
-#undef aio_cancel64
-
-#include <errno.h>
-
-int
-aio_cancel (int fildes, struct aiocb *aiocbp)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-weak_alias (aio_cancel, aio_cancel64)
-
-stub_warning (aio_cancel)
-stub_warning (aio_cancel64)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/aio_fsync.c b/sysdeps/generic/aio_fsync.c
deleted file mode 100644
index bc23d75f69..0000000000
--- a/sysdeps/generic/aio_fsync.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Synchronize I/O in given file descriptor.  Stub version.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-
-/* We use an UGLY hack to prevent gcc from finding us cheating.  The
-   implementation of aio_fsync and aio_fsync64 are identical and so
-   we want to avoid code duplication by using aliases.  But gcc sees
-   the different parameter lists and prints a warning.  We define here
-   a function so that aio_fsync64 has no prototype.  */
-#define aio_fsync64 XXX
-#include <aio.h>
-/* And undo the hack.  */
-#undef aio_fsync64
-
-#include <errno.h>
-#include <fcntl.h>
-
-int
-aio_fsync (int op, struct aiocb *aiocbp)
-{
-  if (op != O_SYNC && op != O_DSYNC)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-weak_alias (aio_fsync, aio_fsync64)
-
-stub_warning (aio_fsync)
-stub_warning (aio_fsync64)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/aio_misc.c b/sysdeps/generic/aio_misc.c
deleted file mode 100644
index c29b8d0eae..0000000000
--- a/sysdeps/generic/aio_misc.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Handle general operations.  Stub version.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <aio.h>
-#include <aio_misc.h>
-
-/* This file is for internal code needed by the aio_* implementation.  */
-
-void
-__aio_init (const struct aioinit *init)
-{
-}
-weak_alias (__aio_init, aio_init)
diff --git a/sysdeps/generic/aio_notify.c b/sysdeps/generic/aio_notify.c
deleted file mode 100644
index 2c79ee6c2f..0000000000
--- a/sysdeps/generic/aio_notify.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Notify initiator of AIO request.  Stub version.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <aio.h>
-#include <aio_misc.h>
-
-/* This file contains only internal functions used by
-   the particular aio_* implementation code.  */
diff --git a/sysdeps/generic/aio_read.c b/sysdeps/generic/aio_read.c
deleted file mode 100644
index db1d19f3d7..0000000000
--- a/sysdeps/generic/aio_read.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Asynchronous read.  Stub version.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <aio.h>
-#include <errno.h>
-
-#ifdef BE_AIO64
-#define aiocb		aiocb64
-#define aio_read	aio_read64
-#endif
-
-int
-aio_read (struct aiocb *aiocbp)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-stub_warning (aio_read)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/aio_read64.c b/sysdeps/generic/aio_read64.c
deleted file mode 100644
index c1292352af..0000000000
--- a/sysdeps/generic/aio_read64.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define BE_AIO64
-#include "aio_read.c"
diff --git a/sysdeps/generic/aio_sigqueue.c b/sysdeps/generic/aio_sigqueue.c
deleted file mode 100644
index e824c6b3de..0000000000
--- a/sysdeps/generic/aio_sigqueue.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 1997, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <aio.h>
-#include <errno.h>
-#include <signal.h>
-
-#include "aio_misc.h"
-
-int
-__aio_sigqueue (sig, val, caller_pid)
-     int sig;
-     const union sigval val;
-     pid_t caller_pid;
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-stub_warning (__aio_sigqueue)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/aio_suspend.c b/sysdeps/generic/aio_suspend.c
deleted file mode 100644
index 0530f0019c..0000000000
--- a/sysdeps/generic/aio_suspend.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Suspend until termination of a requests.  Stub version.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-
-/* We use an UGLY hack to prevent gcc from finding us cheating.  The
-   implementations of aio_suspend and aio_suspend64 are identical and so
-   we want to avoid code duplication by using aliases.  But gcc sees
-   the different parameter lists and prints a warning.  We define here
-   a function so that aio_suspend64 has no prototype.  */
-#define aio_suspend64 XXX
-#include <aio.h>
-/* And undo the hack.  */
-#undef aio_suspend64
-
-#include <errno.h>
-#include <sys/time.h>
-
-
-int
-aio_suspend (const struct aiocb *const list[], int nent,
-	     const struct timespec *timeout)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-weak_alias (aio_suspend, aio_suspend64)
-
-stub_warning (aio_suspend)
-stub_warning (aio_suspend64)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/aio_write.c b/sysdeps/generic/aio_write.c
deleted file mode 100644
index bc62fcb469..0000000000
--- a/sysdeps/generic/aio_write.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Asynchronous write.  Stub version.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <aio.h>
-#include <errno.h>
-
-#ifdef BE_AIO64
-#define aiocb		aiocb64
-#define aio_write	aio_write64
-#endif
-
-int
-aio_write (struct aiocb *aiocbp)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-stub_warning (aio_write)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/aio_write64.c b/sysdeps/generic/aio_write64.c
deleted file mode 100644
index bb1693eeee..0000000000
--- a/sysdeps/generic/aio_write64.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define BE_AIO64
-#include "aio_write.c"
diff --git a/sysdeps/generic/alarm.c b/sysdeps/generic/alarm.c
deleted file mode 100644
index 1f0cceb58e..0000000000
--- a/sysdeps/generic/alarm.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 1991,95,96,97,2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <unistd.h>
-
-/* Schedule an alarm.  In SECONDS seconds, the process will get a SIGALRM.
-   If SECONDS is zero, any currently scheduled alarm will be cancelled.
-   The function returns the number of seconds remaining until the last
-   alarm scheduled would have signaled, or zero if there wasn't one.
-   There is no return value to indicate an error, but you can set `errno'
-   to 0 and check its value after calling `alarm', and this might tell you.
-   The signal may come late due to processor scheduling.  */
-unsigned int
-alarm (seconds)
-     unsigned int seconds;
-{
-  __set_errno (ENOSYS);
-  return 0;
-}
-libc_hidden_def (alarm)
-
-stub_warning (alarm)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/allocrtsig.c b/sysdeps/generic/allocrtsig.c
deleted file mode 100644
index ac8d2b6bfe..0000000000
--- a/sysdeps/generic/allocrtsig.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Handle real-time signal allocation.
-   Copyright (C) 1997,98,99,2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <signal.h>
-
-/* In these variables we keep track of the used variables.  If the
-   platform does not support any real-time signals we will define the
-   values to some unreasonable value which will signal failing of all
-   the functions below.  */
-#ifndef __SIGRTMIN
-static int current_rtmin = -1;
-static int current_rtmax = -1;
-#else
-static int current_rtmin;
-static int current_rtmax;
-
-static int initialized;
-
-#include <testrtsig.h>
-
-static void
-init (void)
-{
-  if (!kernel_has_rtsig ())
-    {
-      current_rtmin = -1;
-      current_rtmax = -1;
-    }
-  else
-    {
-      current_rtmin = __SIGRTMIN;
-      current_rtmax = __SIGRTMAX;
-    }
-  initialized = 1;
-}
-#endif
-
-/* Return number of available real-time signal with highest priority.  */
-int
-__libc_current_sigrtmin (void)
-{
-#ifdef __SIGRTMIN
-  if (!initialized)
-    init ();
-#endif
-  return current_rtmin;
-}
-libc_hidden_def (__libc_current_sigrtmin)
-
-/* Return number of available real-time signal with lowest priority.  */
-int
-__libc_current_sigrtmax (void)
-{
-#ifdef __SIGRTMIN
-  if (!initialized)
-    init ();
-#endif
-  return current_rtmax;
-}
-libc_hidden_def (__libc_current_sigrtmax)
-
-/* Allocate real-time signal with highest/lowest available
-   priority.  Please note that we don't use a lock since we assume
-   this function to be called at program start.  */
-int
-__libc_allocate_rtsig (int high)
-{
-#ifndef __SIGRTMIN
-  return -1;
-#else
-  if (!initialized)
-    init ();
-  if (current_rtmin == -1 || current_rtmin > current_rtmax)
-    /* We don't have anymore signal available.  */
-    return -1;
-
-  return high ? current_rtmin++ : current_rtmax--;
-#endif
-}
diff --git a/sysdeps/generic/alphasort64.c b/sysdeps/generic/alphasort64.c
deleted file mode 100644
index fe84aec2f1..0000000000
--- a/sysdeps/generic/alphasort64.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 1992, 1997, 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <dirent.h>
-#include <string.h>
-
-int
-alphasort64 (const void *a, const void *b)
-{
-  return strcoll ((*(const struct dirent64 **) a)->d_name,
-		  (*(const struct dirent64 **) b)->d_name);
-}
diff --git a/sysdeps/generic/backtrace.c b/sysdeps/generic/backtrace.c
deleted file mode 100644
index f2d52372d5..0000000000
--- a/sysdeps/generic/backtrace.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Return backtrace of current program state.  Generic version.
-   Copyright (C) 1998, 2000, 2002, 2004, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <execinfo.h>
-#include <signal.h>
-#include <frame.h>
-#include <sigcontextinfo.h>
-#include <bp-checks.h>
-#include <ldsodefs.h>
-
-/* This implementation assumes a stack layout that matches the defaults
-   used by gcc's `__builtin_frame_address' and `__builtin_return_address'
-   (FP is the frame pointer register):
-
-	  +-----------------+     +-----------------+
-    FP -> | previous FP --------> | previous FP ------>...
-	  |                 |     |                 |
-	  | return address  |     | return address  |
-	  +-----------------+     +-----------------+
-
-  */
-
-/* Get some notion of the current stack.  Need not be exactly the top
-   of the stack, just something somewhere in the current frame.  */
-#ifndef CURRENT_STACK_FRAME
-# define CURRENT_STACK_FRAME  ({ char __csf; &__csf; })
-#endif
-
-/* By default we assume that the stack grows downward.  */
-#ifndef INNER_THAN
-# define INNER_THAN <
-#endif
-
-/* By default assume the `next' pointer in struct layout points to the
-   next struct layout.  */
-#ifndef ADVANCE_STACK_FRAME
-# define ADVANCE_STACK_FRAME(next) BOUNDED_1 ((struct layout *) (next))
-#endif
-
-/* By default, the frame pointer is just what we get from gcc.  */
-#ifndef FIRST_FRAME_POINTER
-# define FIRST_FRAME_POINTER  __builtin_frame_address (0)
-#endif
-
-int
-__backtrace (array, size)
-     void **array;
-     int size;
-{
-  struct layout *current;
-  void *__unbounded top_frame;
-  void *__unbounded top_stack;
-  int cnt = 0;
-
-  top_frame = FIRST_FRAME_POINTER;
-  top_stack = CURRENT_STACK_FRAME;
-
-  /* We skip the call to this function, it makes no sense to record it.  */
-  current = BOUNDED_1 ((struct layout *) top_frame);
-  while (cnt < size)
-    {
-      if ((void *) current INNER_THAN top_stack
-	  || !((void *) current INNER_THAN __libc_stack_end))
-       /* This means the address is out of range.  Note that for the
-	  toplevel we see a frame pointer with value NULL which clearly is
-	  out of range.  */
-	break;
-
-      array[cnt++] = current->return_address;
-
-      current = ADVANCE_STACK_FRAME (current->next);
-    }
-
-  return cnt;
-}
-weak_alias (__backtrace, backtrace)
-libc_hidden_def (__backtrace)
diff --git a/sysdeps/generic/backtracesyms.c b/sysdeps/generic/backtracesyms.c
deleted file mode 100644
index db7ba36d0f..0000000000
--- a/sysdeps/generic/backtracesyms.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Return list with names for address in backtrace.
-   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <execinfo.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/* Assume the worst for the width of an address.  */
-#define WORD_WIDTH 16
-
-
-char **
-__backtrace_symbols (array, size)
-     void *const *array;
-     int size;
-{
-  int cnt;
-  size_t total = 0;
-  char **result;
-
-  /* We can compute the text size needed for the symbols since we print
-     them all as "[+0x<addr>]".  */
-  total = size * (WORD_WIDTH + 6);
-
-  /* Allocate memory for the result.  */
-  result = malloc (size * sizeof (char *) + total);
-  if (result != NULL)
-    {
-      char *last = (char *) (result + size);
-
-      for (cnt = 0; cnt < size; ++cnt)
-	{
-	  result[cnt] = last;
-	  last += 1 + sprintf (last, "[+%p]", array[cnt]);
-	}
-    }
-
-  return result;
-}
-weak_alias (__backtrace_symbols, backtrace_symbols)
diff --git a/sysdeps/generic/backtracesymsfd.c b/sysdeps/generic/backtracesymsfd.c
deleted file mode 100644
index b01f8b0094..0000000000
--- a/sysdeps/generic/backtracesymsfd.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Write formatted list with names for addresses in backtrace to a file.
-   Copyright (C) 1998, 2003, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <execinfo.h>
-#include <string.h>
-#include <sys/uio.h>
-
-#include <stdio-common/_itoa.h>
-#include <not-cancel.h>
-
-#if __ELF_NATIVE_CLASS == 32
-# define WORD_WIDTH 8
-#else
-/* We assume 64bits.  */
-# define WORD_WIDTH 16
-#endif
-
-
-void
-__backtrace_symbols_fd (array, size, fd)
-     void *const *array;
-     int size;
-     int fd;
-{
-  struct iovec iov[3];
-  int cnt;
-
-  for (cnt = 0; cnt < size; ++cnt)
-    {
-      char buf[WORD_WIDTH];
-
-      iov[0].iov_base = (void *) "[0x";
-      iov[0].iov_len = 3;
-
-      iov[1].iov_base = _itoa_word ((unsigned long int) array[cnt],
-				    &buf[WORD_WIDTH], 16, 0);
-      iov[1].iov_len = &buf[WORD_WIDTH] - (char *) iov[1].iov_base;
-
-      iov[2].iov_base = (void *) "]\n";
-      iov[2].iov_len = 2;
-
-      /* We prefer to use the non-cancelable interface if it is available.  */
-      writev_not_cancel_no_status (fd, iov, 3);
-    }
-}
-weak_alias (__backtrace_symbols_fd, backtrace_symbols_fd)
-libc_hidden_def (__backtrace_symbols_fd)
diff --git a/sysdeps/generic/bb_init_func.c b/sysdeps/generic/bb_init_func.c
deleted file mode 100644
index 19901d8d09..0000000000
--- a/sysdeps/generic/bb_init_func.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by David Mosberger (davidm@cs.arizona.edu).
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* __bb_init_func is invoked at the beginning of each function, before
-   any registers have been saved.  This generic routine should work
-   provided that calling this function doesn't mangle the arguments
-   passed to the function being called.  If that's not the case, a
-   system specific routine must be provided.  */
-
-#include <sys/types.h>
-#include <sys/gmon.h>
-
-#include <stdlib.h>
-
-void
-__bb_init_func (struct __bb *bb)
-{
-  struct gmonparam *p = &_gmonparam;
-
-  if (bb->zero_word != 0)
-    {
-      return;	/* handle common case quickly */
-    }
-
-  /* insert this basic-block into basic-block list: */
-  bb->zero_word = 1;
-  bb->next = __bb_head;
-  __bb_head = bb;
-
-  if (bb->next == 0 && p->state != GMON_PROF_ON)
-    {
-      /* we didn't register _mcleanup yet and pc profiling doesn't seem
-	 to be active, so let's register it now: */
-      extern void *__dso_handle __attribute__ ((__weak__));
-      __cxa_atexit ((void (*) (void *)) _mcleanup, NULL,
-		    &__dso_handle ? __dso_handle : NULL);
-    }
-}
diff --git a/sysdeps/generic/bcopy.c b/sysdeps/generic/bcopy.c
deleted file mode 100644
index 3f16b884ac..0000000000
--- a/sysdeps/generic/bcopy.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <string.h>
-
-#define	memmove		bcopy
-#define	rettype		void
-#define	RETURN(s)	return
-#define	a1		src
-#define	a1const		const
-#define	a2		dest
-#define	a2const
-
-#include <memmove.c>
diff --git a/sysdeps/generic/bind.c b/sysdeps/generic/bind.c
deleted file mode 100644
index 382e29db16..0000000000
--- a/sysdeps/generic/bind.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/socket.h>
-
-/* Give the socket FD the local address ADDR (which is LEN bytes long).  */
-int
-__bind (fd, addr, len)
-     int fd;
-     __CONST_SOCKADDR_ARG addr;
-     socklen_t len;
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-weak_alias (__bind, bind)
-
-stub_warning (bind)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/brdinit.c b/sysdeps/generic/brdinit.c
deleted file mode 100644
index af96bcd12a..0000000000
--- a/sysdeps/generic/brdinit.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 1994, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
-     On-Line Applications Research Corporation.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <standalone.h>
-
-/* This file is only required when a "bare" board is configured. */
-
-/*  _Board_Initialize
-
-This routine normally performs board specific initialization.  */
-
-void
-_Board_Initialize ()
-{
-}
diff --git a/sysdeps/generic/brk.c b/sysdeps/generic/brk.c
deleted file mode 100644
index b951819f21..0000000000
--- a/sysdeps/generic/brk.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <unistd.h>
-
-/* sbrk.c expects this.  */
-void *__curbrk;
-
-/* Set the end of the process's data space to ADDR.
-   Return 0 if successful, -1 if not.  */
-int
-__brk (addr)
-     void *addr;
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-stub_warning (brk)
-
-weak_alias (__brk, brk)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/bsd-_setjmp.c b/sysdeps/generic/bsd-_setjmp.c
deleted file mode 100644
index 884a4da9b6..0000000000
--- a/sysdeps/generic/bsd-_setjmp.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'.  Stub version.
-   Copyright (C) 1994, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sysdep.h>
-#include <setjmp.h>
-
-#undef _setjmp
-
-/* This implementation in C will not usually work, because the call
-   really needs to be a tail-call so __sigsetjmp saves the state of
-   the caller, not the state of this `setjmp' frame which then
-   immediate unwinds.  */
-
-int
-_setjmp (jmp_buf env)
-{
-  return __sigsetjmp (env, 0);
-}
-libc_hidden_def (_setjmp)
diff --git a/sysdeps/generic/bsd-setjmp.c b/sysdeps/generic/bsd-setjmp.c
deleted file mode 100644
index 15f3f153cc..0000000000
--- a/sysdeps/generic/bsd-setjmp.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* BSD `setjmp' entry point to `sigsetjmp (..., 1)'.  Stub version.
-   Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sysdep.h>
-#include <setjmp.h>
-
-#undef setjmp
-
-/* This implementation in C will not usually work, because the call
-   really needs to be a tail-call so __sigsetjmp saves the state of
-   the caller, not the state of this `setjmp' frame which then
-   immediate unwinds.  */
-
-int
-setjmp (jmp_buf env)
-{
-  return __sigsetjmp (env, 1);
-}
diff --git a/sysdeps/generic/bzero.c b/sysdeps/generic/bzero.c
deleted file mode 100644
index c6ede14139..0000000000
--- a/sysdeps/generic/bzero.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright (C) 1991, 1997, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Torbjorn Granlund (tege@sics.se).
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <string.h>
-#include <memcopy.h>
-
-#undef __bzero
-
-/* Set N bytes of S to 0.  */
-void
-__bzero (s, len)
-     void *s;
-     size_t len;
-{
-  long int dstp = (long int) s;
-  const op_t zero = 0;
-
-  if (len >= 8)
-    {
-      size_t xlen;
-
-      /* There are at least some bytes to zero.  No need to test
-	 for LEN == 0 in this alignment loop.  */
-      while (dstp % OPSIZ != 0)
-	{
-	  ((byte *) dstp)[0] = 0;
-	  dstp += 1;
-	  len -= 1;
-	}
-
-      /* Write 8 op_t per iteration until less than 8 op_t remain.  */
-      xlen = len / (OPSIZ * 8);
-      while (xlen != 0)
-	{
-	  ((op_t *) dstp)[0] = zero;
-	  ((op_t *) dstp)[1] = zero;
-	  ((op_t *) dstp)[2] = zero;
-	  ((op_t *) dstp)[3] = zero;
-	  ((op_t *) dstp)[4] = zero;
-	  ((op_t *) dstp)[5] = zero;
-	  ((op_t *) dstp)[6] = zero;
-	  ((op_t *) dstp)[7] = zero;
-	  dstp += 8 * OPSIZ;
-	  xlen -= 1;
-	}
-      len %= OPSIZ * 8;
-
-      /* Write 1 op_t per iteration until less than op_t remain.  */
-      xlen = len / OPSIZ;
-      while (xlen != 0)
-	{
-	  ((op_t *) dstp)[0] = zero;
-	  dstp += OPSIZ;
-	  xlen -= 1;
-	}
-      len %= OPSIZ;
-    }
-
-  /* Write the last few bytes.  */
-  while (len != 0)
-    {
-      ((byte *) dstp)[0] = 0;
-      dstp += 1;
-      len -= 1;
-    }
-}
-weak_alias (__bzero, bzero)
diff --git a/sysdeps/generic/cabsf.c b/sysdeps/generic/cabsf.c
deleted file mode 100644
index 956db76ba1..0000000000
--- a/sysdeps/generic/cabsf.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Return the complex absolute value of float complex value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-float
-__cabsf (float _Complex z)
-{
-  return __hypotf (__real__ z, __imag__ z);
-}
-weak_alias (__cabsf, cabsf)
diff --git a/sysdeps/generic/cargf.c b/sysdeps/generic/cargf.c
deleted file mode 100644
index df1f20bc48..0000000000
--- a/sysdeps/generic/cargf.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Compute argument of complex float value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-float
-__cargf (__complex__ float x)
-{
-  return __atan2f (__imag__ x, __real__ x);
-}
-weak_alias (__cargf, cargf)
diff --git a/sysdeps/generic/chdir.c b/sysdeps/generic/chdir.c
deleted file mode 100644
index afaeef8787..0000000000
--- a/sysdeps/generic/chdir.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stddef.h>
-#include <unistd.h>
-
-/* Change the current directory to PATH.  */
-int
-__chdir (path)
-     const char *path;
-{
-  if (path == NULL)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  __set_errno (ENOSYS);
-  return -1;
-}
-stub_warning (chdir)
-
-weak_alias (__chdir, chdir)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/check_fds.c b/sysdeps/generic/check_fds.c
deleted file mode 100644
index 10ba3da395..0000000000
--- a/sysdeps/generic/check_fds.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright (C) 2000, 2002, 2003, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/sysmacros.h>
-
-/* Try to get a machine dependent instruction which will make the
-   program crash.  This is used in case everything else fails.  */
-#include <abort-instr.h>
-#ifndef ABORT_INSTRUCTION
-/* No such instruction is available.  */
-# define ABORT_INSTRUCTION
-#endif
-
-#include <device-nrs.h>
-#include <not-cancel.h>
-
-
-/* Should other OSes (e.g., Hurd) have different versions which can
-   be written in a better way?  */
-static void
-check_one_fd (int fd, int mode)
-{
-  /* Note that fcntl() with this parameter is not a cancellation point.  */
-  if (__builtin_expect (__libc_fcntl (fd, F_GETFD), 0) == -1
-      && errno == EBADF)
-    {
-      const char *name;
-      dev_t dev;
-
-      /* For writable descriptors we use /dev/full.  */
-      if ((mode & O_ACCMODE) == O_WRONLY)
-	{
-	  name = _PATH_DEV "full";
-	  dev = makedev (DEV_FULL_MAJOR, DEV_FULL_MINOR);
-	}
-      else
-	{
-	  name = _PATH_DEVNULL;
-	  dev = makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR);
-	}
-
-      /* Something is wrong with this descriptor, it's probably not
-	 opened.  Open /dev/null so that the SUID program we are
-	 about to start does not accidently use this descriptor.  */
-      int nullfd = open_not_cancel (name, mode, 0);
-
-      /* We are very paranoid here.  With all means we try to ensure
-	 that we are actually opening the /dev/null device and nothing
-	 else.
-
-	 Note that the following code assumes that STDIN_FILENO,
-	 STDOUT_FILENO, STDERR_FILENO are the three lowest file
-	 decsriptor numbers, in this order.  */
-      struct stat64 st;
-      if (__builtin_expect (nullfd != fd, 0)
-	  || __builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0) != 0
-	  || __builtin_expect (S_ISCHR (st.st_mode), 1) == 0
-	  || st.st_rdev != dev)
-	/* We cannot even give an error message here since it would
-	   run into the same problems.  */
-	while (1)
-	  /* Try for ever and ever.  */
-	  ABORT_INSTRUCTION;
-    }
-}
-
-
-void
-__libc_check_standard_fds (void)
-{
-  /* This is really paranoid but some people actually are.  If /dev/null
-     should happen to be a symlink to somewhere else and not the device
-     commonly known as "/dev/null" we bail out.  We can detect this with
-     the O_NOFOLLOW flag for open() but only on some system.  */
-#ifndef O_NOFOLLOW
-# define O_NOFOLLOW	0
-#endif
-  /* Check all three standard file descriptors.  */
-  check_one_fd (STDIN_FILENO, O_WRONLY | O_NOFOLLOW);
-  check_one_fd (STDOUT_FILENO, O_RDONLY | O_NOFOLLOW);
-  check_one_fd (STDERR_FILENO, O_RDONLY | O_NOFOLLOW);
-}
diff --git a/sysdeps/generic/check_pf.c b/sysdeps/generic/check_pf.c
deleted file mode 100644
index 5d98c98aff..0000000000
--- a/sysdeps/generic/check_pf.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Determine protocol families for which interfaces exist.  Generic version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <ifaddrs.h>
-#include <netdb.h>
-
-
-void
-attribute_hidden
-__check_pf (bool *seen_ipv4, bool *seen_ipv6)
-{
-  /* Get the interface list via getifaddrs.  */
-  struct ifaddrs *ifa = NULL;
-  if (getifaddrs (&ifa) != 0)
-    {
-      /* We cannot determine what interfaces are available.  Be
-	 pessimistic.  */
-      *seen_ipv4 = true;
-      *seen_ipv6 = true;
-      return;
-    }
-
-  *seen_ipv4 = false;
-  *seen_ipv6 = false;
-
-  struct ifaddrs *runp;
-  for (runp = ifa; runp != NULL; runp = runp->ifa_next)
-    if (runp->ifa_addr->sa_family == PF_INET)
-      *seen_ipv4 = true;
-    else if (runp->ifa_addr->sa_family == PF_INET6)
-      *seen_ipv6 = true;
-
-  (void) freeifaddrs (ifa);
-}
diff --git a/sysdeps/generic/chflags.c b/sysdeps/generic/chflags.c
deleted file mode 100644
index b678121265..0000000000
--- a/sysdeps/generic/chflags.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stddef.h>
-#include <sys/stat.h>
-
-/* Change the flags of FILE to FLAGS.  */
-
-int chflags (const char *file, int flags) __THROW;
-
-int
-chflags (file, flags)
-     const char *file;
-     int flags;
-{
-  if (file == NULL)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-stub_warning (chflags)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/chmod.c b/sysdeps/generic/chmod.c
deleted file mode 100644
index 38b05127c9..0000000000
--- a/sysdeps/generic/chmod.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stddef.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-/* Change the protections of FILE to MODE.  */
-int
-__chmod (file, mode)
-     const char *file;
-     mode_t mode;
-{
-  if (file == NULL)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  __set_errno (ENOSYS);
-  return -1;
-}
-stub_warning (chmod)
-
-weak_alias (__chmod, chmod)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/chown.c b/sysdeps/generic/chown.c
deleted file mode 100644
index 0e368f2ac4..0000000000
--- a/sysdeps/generic/chown.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997, 2002
-   Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-/* Change the owner and group of FILE.  */
-int
-__chown (file, owner, group)
-     const char *file;
-     uid_t owner;
-     gid_t group;
-{
-  if (file == NULL)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  __set_errno (ENOSYS);
-  return -1;
-}
-libc_hidden_def (__chown)
-stub_warning (chown)
-
-weak_alias (__chown, chown)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/chroot.c b/sysdeps/generic/chroot.c
deleted file mode 100644
index f20ccf4c2b..0000000000
--- a/sysdeps/generic/chroot.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <unistd.h>
-
-/* Make PATH be the root directory (the starting point for absolute paths).
-   This call is restricted to the super-user.  */
-int
-chroot (path)
-     const char *path;
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-
-stub_warning (chroot)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/cimagf.c b/sysdeps/generic/cimagf.c
deleted file mode 100644
index d4e441e69f..0000000000
--- a/sysdeps/generic/cimagf.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Return imaginary part of complex float value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-
-float
-__cimagf (float _Complex z)
-{
-  return __imag__ z;
-}
-weak_alias (__cimagf, cimagf)
diff --git a/sysdeps/generic/clock.c b/sysdeps/generic/clock.c
deleted file mode 100644
index 99dc5f47e0..0000000000
--- a/sysdeps/generic/clock.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sys/times.h>
-#include <time.h>
-#include <errno.h>
-
-/* Return the time used by the program so far (user time + system time).  */
-clock_t
-clock ()
-{
-  __set_errno (ENOSYS);
-  return (clock_t) -1;
-}
-
-stub_warning (clock)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/clock_getcpuclockid.c b/sysdeps/generic/clock_getcpuclockid.c
deleted file mode 100644
index 39c7e55f66..0000000000
--- a/sysdeps/generic/clock_getcpuclockid.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <time.h>
-#include <unistd.h>
-
-int
-clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
-{
-  /* We don't allow any process ID but our own.  */
-  if (pid != 0 && pid != getpid ())
-    return EPERM;
-
-#ifdef CLOCK_PROCESS_CPUTIME_ID
-  /* Store the number.  */
-  *clock_id = CLOCK_PROCESS_CPUTIME_ID;
-
-  return 0;
-#else
-  /* We don't have a timer for that.  */
-  return ENOENT;
-#endif
-}
diff --git a/sysdeps/generic/clock_getres.c b/sysdeps/generic/clock_getres.c
deleted file mode 100644
index f5978da380..0000000000
--- a/sysdeps/generic/clock_getres.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <time.h>
-
-/* Get resolution of clock.  */
-int
-clock_getres (clockid_t clock_id, struct timespec *res)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-stub_warning (clock_getres)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/clock_gettime.c b/sysdeps/generic/clock_gettime.c
deleted file mode 100644
index ff306120ba..0000000000
--- a/sysdeps/generic/clock_gettime.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 1999, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <time.h>
-
-/* Get current value of CLOCK and store it in TP.  */
-int
-clock_gettime (clockid_t clock_id, struct timespec *tp)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-librt_hidden_def (clock_gettime)
-stub_warning (clock_gettime)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/clock_nanosleep.c b/sysdeps/generic/clock_nanosleep.c
deleted file mode 100644
index cff1c2570a..0000000000
--- a/sysdeps/generic/clock_nanosleep.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* High-resolution sleep with the specified clock.  Stub version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/time.h>
-
-
-int
-clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
-		 struct timespec *rem)
-{
-  if (__builtin_expect (req->tv_nsec, 0) < 0
-      || __builtin_expect (req->tv_nsec, 0) >= 1000000000)
-    return EINVAL;
-
-  if (flags != TIMER_ABSTIME && flags != 0)
-    return EINVAL;
-
-  /* Not implemented.  */
-  return ENOSYS;
-}
-stub_warning (clock_nanosleep)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/clock_settime.c b/sysdeps/generic/clock_settime.c
deleted file mode 100644
index 9d6a92e058..0000000000
--- a/sysdeps/generic/clock_settime.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <time.h>
-
-/* Set CLOCK to value TP.  */
-int
-clock_settime (clockid_t clock_id, const struct timespec *tp)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-stub_warning (clock_settime)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/close.c b/sysdeps/generic/close.c
deleted file mode 100644
index 0856ba851b..0000000000
--- a/sysdeps/generic/close.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <unistd.h>
-
-/* Close the file descriptor FD.  */
-int
-__close (fd)
-     int fd;
-{
-  if (fd < 0)
-    {
-      __set_errno (EBADF);
-      return -1;
-    }
-
-  __set_errno (ENOSYS);
-  return -1;
-}
-libc_hidden_def (__close)
-stub_warning (close)
-
-weak_alias (__close, close)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/closedir.c b/sysdeps/generic/closedir.c
deleted file mode 100644
index 4410f02fb3..0000000000
--- a/sysdeps/generic/closedir.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stddef.h>
-#include <dirent.h>
-
-
-/* Close the directory stream DIRP.
-   Return 0 if successful, -1 if not.  */
-int
-__closedir (DIR *dirp)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-weak_alias (__closedir, closedir)
-
-stub_warning (closedir)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/cmp.c b/sysdeps/generic/cmp.c
deleted file mode 100644
index 8e9792f54e..0000000000
--- a/sysdeps/generic/cmp.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* mpn_cmp -- Compare two low-level natural-number integers.
-
-Copyright (C) 1991, 1993, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
-
-#include "gmp.h"
-#include "gmp-impl.h"
-
-/* Compare OP1_PTR/OP1_SIZE with OP2_PTR/OP2_SIZE.
-   There are no restrictions on the relative sizes of
-   the two arguments.
-   Return 1 if OP1 > OP2, 0 if they are equal, and -1 if OP1 < OP2.  */
-
-int
-#if __STDC__
-mpn_cmp (mp_srcptr op1_ptr, mp_srcptr op2_ptr, mp_size_t size)
-#else
-mpn_cmp (op1_ptr, op2_ptr, size)
-     mp_srcptr op1_ptr;
-     mp_srcptr op2_ptr;
-     mp_size_t size;
-#endif
-{
-  mp_size_t i;
-  mp_limb_t op1_word, op2_word;
-
-  for (i = size - 1; i >= 0; i--)
-    {
-      op1_word = op1_ptr[i];
-      op2_word = op2_ptr[i];
-      if (op1_word != op2_word)
-	goto diff;
-    }
-  return 0;
- diff:
-  /* This can *not* be simplified to
-	op2_word - op2_word
-     since that expression might give signed overflow.  */
-  return (op1_word > op2_word) ? 1 : -1;
-}
diff --git a/sysdeps/generic/conjf.c b/sysdeps/generic/conjf.c
deleted file mode 100644
index 7893891933..0000000000
--- a/sysdeps/generic/conjf.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Return complex conjugate of complex float value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-
-float _Complex
-__conjf (float _Complex z)
-{
-  return ~z;
-}
-weak_alias (__conjf, conjf)
diff --git a/sysdeps/generic/connect.c b/sysdeps/generic/connect.c
deleted file mode 100644
index 55093313c9..0000000000
--- a/sysdeps/generic/connect.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/socket.h>
-
-/* Open a connection on socket FD to peer at ADDR (which LEN bytes long).
-   For connectionless socket types, just set the default address to send to
-   and the only address from which to accept transmissions.
-   Return 0 on success, -1 for errors.  */
-int
-__connect (fd, addr, len)
-     int fd;
-     __CONST_SOCKADDR_ARG addr;
-     socklen_t len;
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-weak_alias (__connect, connect)
-
-stub_warning (connect)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/console.c b/sysdeps/generic/console.c
deleted file mode 100644
index 326ebed4a1..0000000000
--- a/sysdeps/generic/console.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 1994, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
-     On-Line Applications Research Corporation.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <standalone.h>
-
-/* This file is only required when a "bare" board is configured. */
-
-/* These routines provide console IO routines for your embedded target.  */
-
-int
-_Console_Putc (ch)
-     char ch;
-{
-  /* eat the character */
-
-  return 0;
-}
-
-int
-_Console_Getc (poll)
-     int poll;
-{
-  /* boring user, never types anything */
-  return -1;
-}
diff --git a/sysdeps/generic/crealf.c b/sysdeps/generic/crealf.c
deleted file mode 100644
index e3235a874f..0000000000
--- a/sysdeps/generic/crealf.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Return real part of complex float value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-
-float
-__crealf (float _Complex z)
-{
-  return __real__ z;
-}
-weak_alias (__crealf, crealf)
diff --git a/sysdeps/generic/creat.c b/sysdeps/generic/creat.c
deleted file mode 100644
index 462882415c..0000000000
--- a/sysdeps/generic/creat.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 1991, 1996, 1997, 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sysdep-cancel.h>
-
-#undef	creat
-
-/* Create FILE with protections MODE.  */
-int
-__libc_creat (file, mode)
-     const char *file;
-     mode_t mode;
-{
-  return __open (file, O_WRONLY|O_CREAT|O_TRUNC, mode);
-}
-weak_alias (__libc_creat, creat)
-
-/* __open handles cancellation.  */
-LIBC_CANCEL_HANDLED ();
diff --git a/sysdeps/generic/creat64.c b/sysdeps/generic/creat64.c
deleted file mode 100644
index 39f4580571..0000000000
--- a/sysdeps/generic/creat64.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <fcntl.h>
-#include <sys/types.h>
-
-#undef	creat
-
-/* Create FILE with protections MODE.  */
-int
-creat64 (file, mode)
-     const char *file;
-     mode_t mode;
-{
-  return __open64 (file, O_WRONLY|O_CREAT|O_TRUNC, mode);
-}
diff --git a/sysdeps/generic/ctermid.c b/sysdeps/generic/ctermid.c
deleted file mode 100644
index e4d94eada2..0000000000
--- a/sysdeps/generic/ctermid.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stdio.h>
-
-
-/* Return the name of the controlling terminal.
-   If S is not NULL, the name is copied into it (it should be at
-   least L_ctermid bytes long), otherwise a static buffer is used.  */
-char *
-ctermid (s)
-     char *s;
-{
-  __set_errno (ENOSYS);
-  return NULL;
-}
-
-
-stub_warning (ctermid)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/cuserid.c b/sysdeps/generic/cuserid.c
deleted file mode 100644
index 826972f4de..0000000000
--- a/sysdeps/generic/cuserid.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stdio.h>
-#include <errno.h>
-
-/* Return the username of the caller.
-   If S is not NULL, it points to a buffer of at least L_cuserid bytes
-   into which the name is copied; otherwise, a static buffer is used.  */
-char *
-cuserid (s)
-     char *s;
-{
-  __set_errno (ENOSYS);
-  return NULL;
-}
-
-
-stub_warning (cuserid)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/dbl2mpn.c b/sysdeps/generic/dbl2mpn.c
deleted file mode 100644
index 773ca4fd6a..0000000000
--- a/sysdeps/generic/dbl2mpn.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 1993, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "gmp.h"
-#include "gmp-impl.h"
-
-/* Convert a `double' to a multi-precision integer representing the
-   significand scaled up by the highest possible number of significant bits
-   of fraction (DBL_MANT_DIG), and an integral power of two (MPN frexp). */
-
-mp_size_t
-__mpn_extract_double (mp_ptr res_ptr, mp_size_t size,
-		      int *expt, int *is_neg,
-		      double value)
-{
-#error "__mpn_extract_double is not implemented for this floating point format"
-}
diff --git a/sysdeps/generic/dirfd.c b/sysdeps/generic/dirfd.c
deleted file mode 100644
index 06c0cde435..0000000000
--- a/sysdeps/generic/dirfd.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Return the file descriptor used by a DIR stream.  Stub version.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <dirent.h>
-#include <dirstream.h>
-#include <errno.h>
-
-int
-dirfd (dirp)
-     DIR *dirp;
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-stub_warning (dirfd)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/div.c b/sysdeps/generic/div.c
deleted file mode 100644
index 5268f4c494..0000000000
--- a/sysdeps/generic/div.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (C) 1992, 1997, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/*
- * Copyright (c) 1990 Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <stdlib.h>
-
-/* Return the `div_t' representation of NUMER over DENOM.  */
-div_t
-div (numer, denom)
-     int numer, denom;
-{
-  div_t result;
-
-  result.quot = numer / denom;
-  result.rem = numer % denom;
-
-  /* The ANSI standard says that |QUOT| <= |NUMER / DENOM|, where
-     NUMER / DENOM is to be computed in infinite precision.  In
-     other words, we should always truncate the quotient towards
-     zero, never -infinity.  Machine division and remainer may
-     work either way when one or both of NUMER or DENOM is
-     negative.  If only one is negative and QUOT has been
-     truncated towards -infinity, REM will have the same sign as
-     DENOM and the opposite sign of NUMER; if both are negative
-     and QUOT has been truncated towards -infinity, REM will be
-     positive (will have the opposite sign of NUMER).  These are
-     considered `wrong'.  If both are NUM and DENOM are positive,
-     RESULT will always be positive.  This all boils down to: if
-     NUMER >= 0, but REM < 0, we got the wrong answer.  In that
-     case, to get the right answer, add 1 to QUOT and subtract
-     DENOM from REM.  */
-
-  if (numer >= 0 && result.rem < 0)
-    {
-      ++result.quot;
-      result.rem -= denom;
-    }
-
-  return result;
-}
diff --git a/sysdeps/generic/divmod_1.c b/sysdeps/generic/divmod_1.c
deleted file mode 100644
index 50b97db72f..0000000000
--- a/sysdeps/generic/divmod_1.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/* mpn_divmod_1(quot_ptr, dividend_ptr, dividend_size, divisor_limb) --
-   Divide (DIVIDEND_PTR,,DIVIDEND_SIZE) by DIVISOR_LIMB.
-   Write DIVIDEND_SIZE limbs of quotient at QUOT_PTR.
-   Return the single-limb remainder.
-   There are no constraints on the value of the divisor.
-
-   QUOT_PTR and DIVIDEND_PTR might point to the same limb.
-
-Copyright (C) 1991, 1993, 1994, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
-
-#include "gmp.h"
-#include "gmp-impl.h"
-#include "longlong.h"
-
-#ifndef UMUL_TIME
-#define UMUL_TIME 1
-#endif
-
-#ifndef UDIV_TIME
-#define UDIV_TIME UMUL_TIME
-#endif
-
-/* FIXME: We should be using invert_limb (or invert_normalized_limb)
-   here (not udiv_qrnnd).  */
-
-mp_limb_t
-#if __STDC__
-mpn_divmod_1 (mp_ptr quot_ptr,
-	      mp_srcptr dividend_ptr, mp_size_t dividend_size,
-	      mp_limb_t divisor_limb)
-#else
-mpn_divmod_1 (quot_ptr, dividend_ptr, dividend_size, divisor_limb)
-     mp_ptr quot_ptr;
-     mp_srcptr dividend_ptr;
-     mp_size_t dividend_size;
-     mp_limb_t divisor_limb;
-#endif
-{
-  mp_size_t i;
-  mp_limb_t n1, n0, r;
-  int dummy;
-
-  /* ??? Should this be handled at all?  Rely on callers?  */
-  if (dividend_size == 0)
-    return 0;
-
-  /* If multiplication is much faster than division, and the
-     dividend is large, pre-invert the divisor, and use
-     only multiplications in the inner loop.  */
-
-  /* This test should be read:
-       Does it ever help to use udiv_qrnnd_preinv?
-	 && Does what we save compensate for the inversion overhead?  */
-  if (UDIV_TIME > (2 * UMUL_TIME + 6)
-      && (UDIV_TIME - (2 * UMUL_TIME + 6)) * dividend_size > UDIV_TIME)
-    {
-      int normalization_steps;
-
-      count_leading_zeros (normalization_steps, divisor_limb);
-      if (normalization_steps != 0)
-	{
-	  mp_limb_t divisor_limb_inverted;
-
-	  divisor_limb <<= normalization_steps;
-
-	  /* Compute (2**2N - 2**N * DIVISOR_LIMB) / DIVISOR_LIMB.  The
-	     result is a (N+1)-bit approximation to 1/DIVISOR_LIMB, with the
-	     most significant bit (with weight 2**N) implicit.  */
-
-	  /* Special case for DIVISOR_LIMB == 100...000.  */
-	  if (divisor_limb << 1 == 0)
-	    divisor_limb_inverted = ~(mp_limb_t) 0;
-	  else
-	    udiv_qrnnd (divisor_limb_inverted, dummy,
-			-divisor_limb, 0, divisor_limb);
-
-	  n1 = dividend_ptr[dividend_size - 1];
-	  r = n1 >> (BITS_PER_MP_LIMB - normalization_steps);
-
-	  /* Possible optimization:
-	     if (r == 0
-	     && divisor_limb > ((n1 << normalization_steps)
-			     | (dividend_ptr[dividend_size - 2] >> ...)))
-	     ...one division less... */
-
-	  for (i = dividend_size - 2; i >= 0; i--)
-	    {
-	      n0 = dividend_ptr[i];
-	      udiv_qrnnd_preinv (quot_ptr[i + 1], r, r,
-				 ((n1 << normalization_steps)
-				  | (n0 >> (BITS_PER_MP_LIMB - normalization_steps))),
-				 divisor_limb, divisor_limb_inverted);
-	      n1 = n0;
-	    }
-	  udiv_qrnnd_preinv (quot_ptr[0], r, r,
-			     n1 << normalization_steps,
-			     divisor_limb, divisor_limb_inverted);
-	  return r >> normalization_steps;
-	}
-      else
-	{
-	  mp_limb_t divisor_limb_inverted;
-
-	  /* Compute (2**2N - 2**N * DIVISOR_LIMB) / DIVISOR_LIMB.  The
-	     result is a (N+1)-bit approximation to 1/DIVISOR_LIMB, with the
-	     most significant bit (with weight 2**N) implicit.  */
-
-	  /* Special case for DIVISOR_LIMB == 100...000.  */
-	  if (divisor_limb << 1 == 0)
-	    divisor_limb_inverted = ~(mp_limb_t) 0;
-	  else
-	    udiv_qrnnd (divisor_limb_inverted, dummy,
-			-divisor_limb, 0, divisor_limb);
-
-	  i = dividend_size - 1;
-	  r = dividend_ptr[i];
-
-	  if (r >= divisor_limb)
-	    r = 0;
-	  else
-	    {
-	      quot_ptr[i] = 0;
-	      i--;
-	    }
-
-	  for (; i >= 0; i--)
-	    {
-	      n0 = dividend_ptr[i];
-	      udiv_qrnnd_preinv (quot_ptr[i], r, r,
-				 n0, divisor_limb, divisor_limb_inverted);
-	    }
-	  return r;
-	}
-    }
-  else
-    {
-      if (UDIV_NEEDS_NORMALIZATION)
-	{
-	  int normalization_steps;
-
-	  count_leading_zeros (normalization_steps, divisor_limb);
-	  if (normalization_steps != 0)
-	    {
-	      divisor_limb <<= normalization_steps;
-
-	      n1 = dividend_ptr[dividend_size - 1];
-	      r = n1 >> (BITS_PER_MP_LIMB - normalization_steps);
-
-	      /* Possible optimization:
-		 if (r == 0
-		 && divisor_limb > ((n1 << normalization_steps)
-				 | (dividend_ptr[dividend_size - 2] >> ...)))
-		 ...one division less... */
-
-	      for (i = dividend_size - 2; i >= 0; i--)
-		{
-		  n0 = dividend_ptr[i];
-		  udiv_qrnnd (quot_ptr[i + 1], r, r,
-			      ((n1 << normalization_steps)
-			       | (n0 >> (BITS_PER_MP_LIMB - normalization_steps))),
-			      divisor_limb);
-		  n1 = n0;
-		}
-	      udiv_qrnnd (quot_ptr[0], r, r,
-			  n1 << normalization_steps,
-			  divisor_limb);
-	      return r >> normalization_steps;
-	    }
-	}
-      /* No normalization needed, either because udiv_qrnnd doesn't require
-	 it, or because DIVISOR_LIMB is already normalized.  */
-
-      i = dividend_size - 1;
-      r = dividend_ptr[i];
-
-      if (r >= divisor_limb)
-	r = 0;
-      else
-	{
-	  quot_ptr[i] = 0;
-	  i--;
-	}
-
-      for (; i >= 0; i--)
-	{
-	  n0 = dividend_ptr[i];
-	  udiv_qrnnd (quot_ptr[i], r, r, n0, divisor_limb);
-	}
-      return r;
-    }
-}
diff --git a/sysdeps/generic/divrem.c b/sysdeps/generic/divrem.c
deleted file mode 100644
index 609f3d789c..0000000000
--- a/sysdeps/generic/divrem.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/* mpn_divrem -- Divide natural numbers, producing both remainder and
-   quotient.
-
-Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-MA 02111-1307, USA. */
-
-#include "gmp.h"
-#include "gmp-impl.h"
-#include "longlong.h"
-
-/* Divide num (NP/NSIZE) by den (DP/DSIZE) and write
-   the NSIZE-DSIZE least significant quotient limbs at QP
-   and the DSIZE long remainder at NP.  If QEXTRA_LIMBS is
-   non-zero, generate that many fraction bits and append them after the
-   other quotient limbs.
-   Return the most significant limb of the quotient, this is always 0 or 1.
-
-   Preconditions:
-   0. NSIZE >= DSIZE.
-   1. The most significant bit of the divisor must be set.
-   2. QP must either not overlap with the input operands at all, or
-      QP + DSIZE >= NP must hold true.  (This means that it's
-      possible to put the quotient in the high part of NUM, right after the
-      remainder in NUM.
-   3. NSIZE >= DSIZE, even if QEXTRA_LIMBS is non-zero.  */
-
-mp_limb_t
-#if __STDC__
-mpn_divrem (mp_ptr qp, mp_size_t qextra_limbs,
-	    mp_ptr np, mp_size_t nsize,
-	    mp_srcptr dp, mp_size_t dsize)
-#else
-mpn_divrem (qp, qextra_limbs, np, nsize, dp, dsize)
-     mp_ptr qp;
-     mp_size_t qextra_limbs;
-     mp_ptr np;
-     mp_size_t nsize;
-     mp_srcptr dp;
-     mp_size_t dsize;
-#endif
-{
-  mp_limb_t most_significant_q_limb = 0;
-
-  switch (dsize)
-    {
-    case 0:
-      /* We are asked to divide by zero, so go ahead and do it!  (To make
-	 the compiler not remove this statement, return the value.)  */
-      return 1 / dsize;
-
-    case 1:
-      {
-	mp_size_t i;
-	mp_limb_t n1;
-	mp_limb_t d;
-
-	d = dp[0];
-	n1 = np[nsize - 1];
-
-	if (n1 >= d)
-	  {
-	    n1 -= d;
-	    most_significant_q_limb = 1;
-	  }
-
-	qp += qextra_limbs;
-	for (i = nsize - 2; i >= 0; i--)
-	  udiv_qrnnd (qp[i], n1, n1, np[i], d);
-	qp -= qextra_limbs;
-
-	for (i = qextra_limbs - 1; i >= 0; i--)
-	  udiv_qrnnd (qp[i], n1, n1, 0, d);
-
-	np[0] = n1;
-      }
-      break;
-
-    case 2:
-      {
-	mp_size_t i;
-	mp_limb_t n1, n0, n2;
-	mp_limb_t d1, d0;
-
-	np += nsize - 2;
-	d1 = dp[1];
-	d0 = dp[0];
-	n1 = np[1];
-	n0 = np[0];
-
-	if (n1 >= d1 && (n1 > d1 || n0 >= d0))
-	  {
-	    sub_ddmmss (n1, n0, n1, n0, d1, d0);
-	    most_significant_q_limb = 1;
-	  }
-
-	for (i = qextra_limbs + nsize - 2 - 1; i >= 0; i--)
-	  {
-	    mp_limb_t q;
-	    mp_limb_t r;
-
-	    if (i >= qextra_limbs)
-	      np--;
-	    else
-	      np[0] = 0;
-
-	    if (n1 == d1)
-	      {
-		/* Q should be either 111..111 or 111..110.  Need special
-		   treatment of this rare case as normal division would
-		   give overflow.  */
-		q = ~(mp_limb_t) 0;
-
-		r = n0 + d1;
-		if (r < d1)	/* Carry in the addition? */
-		  {
-		    add_ssaaaa (n1, n0, r - d0, np[0], 0, d0);
-		    qp[i] = q;
-		    continue;
-		  }
-		n1 = d0 - (d0 != 0);
-		n0 = -d0;
-	      }
-	    else
-	      {
-		udiv_qrnnd (q, r, n1, n0, d1);
-		umul_ppmm (n1, n0, d0, q);
-	      }
-
-	    n2 = np[0];
-	  q_test:
-	    if (n1 > r || (n1 == r && n0 > n2))
-	      {
-		/* The estimated Q was too large.  */
-		q--;
-
-		sub_ddmmss (n1, n0, n1, n0, 0, d0);
-		r += d1;
-		if (r >= d1)	/* If not carry, test Q again.  */
-		  goto q_test;
-	      }
-
-	    qp[i] = q;
-	    sub_ddmmss (n1, n0, r, n2, n1, n0);
-	  }
-	np[1] = n1;
-	np[0] = n0;
-      }
-      break;
-
-    default:
-      {
-	mp_size_t i;
-	mp_limb_t dX, d1, n0;
-
-	np += nsize - dsize;
-	dX = dp[dsize - 1];
-	d1 = dp[dsize - 2];
-	n0 = np[dsize - 1];
-
-	if (n0 >= dX)
-	  {
-	    if (n0 > dX || mpn_cmp (np, dp, dsize - 1) >= 0)
-	      {
-		mpn_sub_n (np, np, dp, dsize);
-		n0 = np[dsize - 1];
-		most_significant_q_limb = 1;
-	      }
-	  }
-
-	for (i = qextra_limbs + nsize - dsize - 1; i >= 0; i--)
-	  {
-	    mp_limb_t q;
-	    mp_limb_t n1, n2;
-	    mp_limb_t cy_limb;
-
-	    if (i >= qextra_limbs)
-	      {
-		np--;
-		n2 = np[dsize];
-	      }
-	    else
-	      {
-		n2 = np[dsize - 1];
-		MPN_COPY_DECR (np + 1, np, dsize);
-		np[0] = 0;
-	      }
-
-	    if (n0 == dX)
-	      /* This might over-estimate q, but it's probably not worth
-		 the extra code here to find out.  */
-	      q = ~(mp_limb_t) 0;
-	    else
-	      {
-		mp_limb_t r;
-
-		udiv_qrnnd (q, r, n0, np[dsize - 1], dX);
-		umul_ppmm (n1, n0, d1, q);
-
-		while (n1 > r || (n1 == r && n0 > np[dsize - 2]))
-		  {
-		    q--;
-		    r += dX;
-		    if (r < dX)	/* I.e. "carry in previous addition?"  */
-		      break;
-		    n1 -= n0 < d1;
-		    n0 -= d1;
-		  }
-	      }
-
-	    /* Possible optimization: We already have (q * n0) and (1 * n1)
-	       after the calculation of q.  Taking advantage of that, we
-	       could make this loop make two iterations less.  */
-
-	    cy_limb = mpn_submul_1 (np, dp, dsize, q);
-
-	    if (n2 != cy_limb)
-	      {
-		mpn_add_n (np, np, dp, dsize);
-		q--;
-	      }
-
-	    qp[i] = q;
-	    n0 = np[dsize - 1];
-	  }
-      }
-    }
-
-  return most_significant_q_limb;
-}
diff --git a/sysdeps/generic/dl-brk.c b/sysdeps/generic/dl-brk.c
deleted file mode 100644
index c37cdfec33..0000000000
--- a/sysdeps/generic/dl-brk.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/* We can use the normal code but we also know the __curbrk is not exported
-   from ld.so.  */
-extern void *__curbrk attribute_hidden;
-
-#include <brk.c>
diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c
deleted file mode 100644
index 29886e194a..0000000000
--- a/sysdeps/generic/dl-cache.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
-   Copyright (C) 1996-2002, 2003, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <unistd.h>
-#include <ldsodefs.h>
-#include <sys/mman.h>
-#include <dl-cache.h>
-#include <dl-procinfo.h>
-
-#include <stdio-common/_itoa.h>
-
-#ifndef _DL_PLATFORMS_COUNT
-# define _DL_PLATFORMS_COUNT 0
-#endif
-
-/* This is the starting address and the size of the mmap()ed file.  */
-static struct cache_file *cache;
-static struct cache_file_new *cache_new;
-static size_t cachesize;
-
-/* 1 if cache_data + PTR points into the cache.  */
-#define _dl_cache_verify_ptr(ptr) (ptr < cache_data_size)
-
-#define SEARCH_CACHE(cache) \
-/* We use binary search since the table is sorted in the cache file.	      \
-   The first matching entry in the table is returned.			      \
-   It is important to use the same algorithm as used while generating	      \
-   the cache file.  */							      \
-do									      \
-  {									      \
-    left = 0;								      \
-    right = cache->nlibs - 1;						      \
-									      \
-    while (left <= right)						      \
-      {									      \
-	__typeof__ (cache->libs[0].key) key;				      \
-									      \
-	middle = (left + right) / 2;					      \
-									      \
-	key = cache->libs[middle].key;					      \
-									      \
-	/* Make sure string table indices are not bogus before using	      \
-	   them.  */							      \
-	if (! _dl_cache_verify_ptr (key))				      \
-	  {								      \
-	    cmpres = 1;							      \
-	    break;							      \
-	  }								      \
-									      \
-	/* Actually compare the entry with the key.  */			      \
-	cmpres = _dl_cache_libcmp (name, cache_data + key);		      \
-	if (__builtin_expect (cmpres == 0, 0))				      \
-	  {								      \
-	    /* Found it.  LEFT now marks the last entry for which we	      \
-	       know the name is correct.  */				      \
-	    left = middle;						      \
-									      \
-	    /* There might be entries with this name before the one we	      \
-	       found.  So we have to find the beginning.  */		      \
-	    while (middle > 0)						      \
-	      {								      \
-		__typeof__ (cache->libs[0].key) key;			      \
-									      \
-		key = cache->libs[middle - 1].key;			      \
-		/* Make sure string table indices are not bogus before	      \
-		   using them.  */					      \
-		if (! _dl_cache_verify_ptr (key)			      \
-		    /* Actually compare the entry.  */			      \
-		    || _dl_cache_libcmp (name, cache_data + key) != 0)	      \
-		  break;						      \
-		--middle;						      \
-	      }								      \
-									      \
-	    do								      \
-	      {								      \
-		int flags;						      \
-		__typeof__ (cache->libs[0]) *lib = &cache->libs[middle];      \
-									      \
-		/* Only perform the name test if necessary.  */		      \
-		if (middle > left					      \
-		    /* We haven't seen this string so far.  Test whether the  \
-		       index is ok and whether the name matches.  Otherwise   \
-		       we are done.  */					      \
-		    && (! _dl_cache_verify_ptr (lib->key)		      \
-			|| (_dl_cache_libcmp (name, cache_data + lib->key)    \
-			    != 0)))					      \
-		  break;						      \
-									      \
-		flags = lib->flags;					      \
-		if (_dl_cache_check_flags (flags)			      \
-		    && _dl_cache_verify_ptr (lib->value))		      \
-		  {							      \
-		    if (best == NULL || flags == GLRO(dl_correct_cache_id))   \
-		      {							      \
-			HWCAP_CHECK;					      \
-			best = cache_data + lib->value;			      \
-									      \
-			if (flags == GLRO(dl_correct_cache_id))		      \
-			  /* We've found an exact match for the shared	      \
-			     object and no general `ELF' release.  Stop	      \
-			     searching.  */				      \
-			  break;					      \
-		      }							      \
-		  }							      \
-	      }								      \
-	    while (++middle <= right);					      \
-	    break;							      \
-	}								      \
-									      \
-	if (cmpres < 0)							      \
-	  left = middle + 1;						      \
-	else								      \
-	  right = middle - 1;						      \
-      }									      \
-  }									      \
-while (0)
-
-
-int
-internal_function
-_dl_cache_libcmp (const char *p1, const char *p2)
-{
-  while (*p1 != '\0')
-    {
-      if (*p1 >= '0' && *p1 <= '9')
-        {
-          if (*p2 >= '0' && *p2 <= '9')
-            {
-	      /* Must compare this numerically.  */
-	      int val1;
-	      int val2;
-
-	      val1 = *p1++ - '0';
-	      val2 = *p2++ - '0';
-	      while (*p1 >= '0' && *p1 <= '9')
-	        val1 = val1 * 10 + *p1++ - '0';
-	      while (*p2 >= '0' && *p2 <= '9')
-	        val2 = val2 * 10 + *p2++ - '0';
-	      if (val1 != val2)
-		return val1 - val2;
-	    }
-	  else
-            return 1;
-        }
-      else if (*p2 >= '0' && *p2 <= '9')
-        return -1;
-      else if (*p1 != *p2)
-        return *p1 - *p2;
-      else
-	{
-	  ++p1;
-	  ++p2;
-	}
-    }
-  return *p1 - *p2;
-}
-
-
-/* Look up NAME in ld.so.cache and return the file name stored there,
-   or null if none is found.  */
-
-const char *
-internal_function
-_dl_load_cache_lookup (const char *name)
-{
-  int left, right, middle;
-  int cmpres;
-  const char *cache_data;
-  uint32_t cache_data_size;
-  const char *best;
-
-  /* Print a message if the loading of libs is traced.  */
-  if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0))
-    _dl_debug_printf (" search cache=%s\n", LD_SO_CACHE);
-
-  if (cache == NULL)
-    {
-      /* Read the contents of the file.  */
-      void *file = _dl_sysdep_read_whole_file (LD_SO_CACHE, &cachesize,
-					       PROT_READ);
-
-      /* We can handle three different cache file formats here:
-	 - the old libc5/glibc2.0/2.1 format
-	 - the old format with the new format in it
-	 - only the new format
-	 The following checks if the cache contains any of these formats.  */
-      if (file != MAP_FAILED && cachesize > sizeof *cache
-	  && memcmp (file, CACHEMAGIC, sizeof CACHEMAGIC - 1) == 0)
-	{
-	  size_t offset;
-	  /* Looks ok.  */
-	  cache = file;
-
-	  /* Check for new version.  */
-	  offset = ALIGN_CACHE (sizeof (struct cache_file)
-				+ cache->nlibs * sizeof (struct file_entry));
-
-	  cache_new = (struct cache_file_new *) ((void *) cache + offset);
-	  if (cachesize < (offset + sizeof (struct cache_file_new))
-	      || memcmp (cache_new->magic, CACHEMAGIC_VERSION_NEW,
-			 sizeof CACHEMAGIC_VERSION_NEW - 1) != 0)
-	    cache_new = (void *) -1;
-	}
-      else if (file != MAP_FAILED && cachesize > sizeof *cache_new
-	       && memcmp (file, CACHEMAGIC_VERSION_NEW,
-			  sizeof CACHEMAGIC_VERSION_NEW - 1) == 0)
-	{
-	  cache_new = file;
-	  cache = file;
-	}
-      else
-	{
-	  if (file != MAP_FAILED)
-	    __munmap (file, cachesize);
-	  cache = (void *) -1;
-	}
-
-      assert (cache != NULL);
-    }
-
-  if (cache == (void *) -1)
-    /* Previously looked for the cache file and didn't find it.  */
-    return NULL;
-
-  best = NULL;
-
-  if (cache_new != (void *) -1)
-    {
-      uint64_t platform;
-
-      /* This is where the strings start.  */
-      cache_data = (const char *) cache_new;
-
-      /* Now we can compute how large the string table is.  */
-      cache_data_size = (const char *) cache + cachesize - cache_data;
-
-      platform = _dl_string_platform (GLRO(dl_platform));
-      if (platform != (uint64_t) -1)
-	platform = 1ULL << platform;
-
-      /* Only accept hwcap if it's for the right platform.  */
-#ifdef USE_TLS
-# define _DL_HWCAP_TLS_MASK (1LL << 63)
-#else
-# define _DL_HWCAP_TLS_MASK 0
-#endif
-#define HWCAP_CHECK \
-      if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion))	      \
-	continue;							      \
-      if (_DL_PLATFORMS_COUNT && platform != -1				      \
-	  && (lib->hwcap & _DL_HWCAP_PLATFORM) != 0			      \
-	  && (lib->hwcap & _DL_HWCAP_PLATFORM) != platform)		      \
-	continue;							      \
-      if (lib->hwcap							      \
-	  & ~(GLRO(dl_hwcap) | _DL_HWCAP_PLATFORM | _DL_HWCAP_TLS_MASK))      \
-	continue
-      SEARCH_CACHE (cache_new);
-    }
-  else
-    {
-      /* This is where the strings start.  */
-      cache_data = (const char *) &cache->libs[cache->nlibs];
-
-      /* Now we can compute how large the string table is.  */
-      cache_data_size = (const char *) cache + cachesize - cache_data;
-
-#undef HWCAP_CHECK
-#define HWCAP_CHECK do {} while (0)
-      SEARCH_CACHE (cache);
-    }
-
-  /* Print our result if wanted.  */
-  if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0)
-      && best != NULL)
-    _dl_debug_printf ("  trying file=%s\n", best);
-
-  return best;
-}
-
-#ifndef MAP_COPY
-/* If the system does not support MAP_COPY we cannot leave the file open
-   all the time since this would create problems when the file is replaced.
-   Therefore we provide this function to close the file and open it again
-   once needed.  */
-void
-_dl_unload_cache (void)
-{
-  if (cache != NULL && cache != (struct cache_file *) -1)
-    {
-      __munmap (cache, cachesize);
-      cache = NULL;
-    }
-}
-#endif
diff --git a/sysdeps/generic/dl-environ.c b/sysdeps/generic/dl-environ.c
deleted file mode 100644
index 089e89e6e7..0000000000
--- a/sysdeps/generic/dl-environ.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Environment handling for dynamic loader.
-   Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <ldsodefs.h>
-
-/* Walk through the environment of the process and return all entries
-   starting with `LD_'.  */
-char *
-internal_function
-_dl_next_ld_env_entry (char ***position)
-{
-  char **current = *position;
-  char *result = NULL;
-
-  while (*current != NULL)
-    {
-      if (__builtin_expect ((*current)[0] == 'L', 0)
-	  && (*current)[1] == 'D' && (*current)[2] == '_')
-	{
-	  result = &(*current)[3];
-
-	  /* Save current position for next visit.  */
-	  *position = ++current;
-
-	  break;
-	}
-
-      ++current;
-    }
-
-  return result;
-}
-
-
-/* In ld.so __environ is not exported.  */
-extern char **__environ attribute_hidden;
-
-int
-unsetenv (const char *name)
-{
-  char **ep;
-
-  ep = __environ;
-  while (*ep != NULL)
-    {
-      size_t cnt = 0;
-
-      while ((*ep)[cnt] == name[cnt] && name[cnt] != '\0')
-	++cnt;
-
-      if (name[cnt] == '\0' && (*ep)[cnt] == '=')
-	{
-	  /* Found it.  Remove this pointer by moving later ones to
-	     the front.  */
-	  char **dp = ep;
-
-	  do
-	    dp[0] = dp[1];
-	  while (*dp++);
-	  /* Continue the loop in case NAME appears again.  */
-	}
-      else
-	++ep;
-    }
-
-  return 0;
-}
diff --git a/sysdeps/generic/dl-execstack.c b/sysdeps/generic/dl-execstack.c
deleted file mode 100644
index 6dce21e7a1..0000000000
--- a/sysdeps/generic/dl-execstack.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Stack executability handling for GNU dynamic linker.  Stub version.
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <ldsodefs.h>
-#include <errno.h>
-
-/* There is no portable way to know the bounds of the initial thread's stack
-   so as to mprotect it.  */
-
-int
-internal_function
-_dl_make_stack_executable (void **stack_endp)
-{
-  return ENOSYS;
-}
-rtld_hidden_def (_dl_make_stack_executable)
diff --git a/sysdeps/generic/dl-fptr.c b/sysdeps/generic/dl-fptr.c
deleted file mode 100644
index 78beecfdcb..0000000000
--- a/sysdeps/generic/dl-fptr.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/* Manage function descriptors.  Generic version.
-   Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <libintl.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <link.h>
-#include <ldsodefs.h>
-#include <elf/dynamic-link.h>
-#include <dl-fptr.h>
-#include <atomic.h>
-
-#ifndef ELF_MACHINE_BOOT_FPTR_TABLE_LEN
-/* ELF_MACHINE_BOOT_FPTR_TABLE_LEN should be greater than the number of
-   dynamic symbols in ld.so.  */
-# define ELF_MACHINE_BOOT_FPTR_TABLE_LEN 256
-#endif
-
-#ifndef ELF_MACHINE_LOAD_ADDRESS
-# error "ELF_MACHINE_LOAD_ADDRESS is not defined."
-#endif
-
-#ifndef COMPARE_AND_SWAP
-# define COMPARE_AND_SWAP(ptr, old, new) \
-  (atomic_compare_and_exchange_bool_acq (ptr, new, old) == 0)
-#endif
-
-ElfW(Addr) _dl_boot_fptr_table [ELF_MACHINE_BOOT_FPTR_TABLE_LEN];
-
-static struct local
-  {
-    struct fdesc_table *root;
-    struct fdesc *free_list;
-    unsigned int npages;		/* # of pages to allocate */
-    /* the next to members MUST be consecutive! */
-    struct fdesc_table boot_table;
-    struct fdesc boot_fdescs[1024];
-  }
-local =
-  {
-    .root = &local.boot_table,
-    .npages = 2,
-    .boot_table =
-      {
-	.len = sizeof (local.boot_fdescs) / sizeof (local.boot_fdescs[0]),
-	.first_unused = 0
-      }
-  };
-
-/* Create a new fdesc table and return a pointer to the first fdesc
-   entry.  The fdesc lock must have been acquired already.  */
-
-static struct fdesc_table *
-new_fdesc_table (struct local *l, size_t *size)
-{
-  size_t old_npages = l->npages;
-  size_t new_npages = old_npages + old_npages;
-  struct fdesc_table *new_table;
-
-  /* If someone has just created a new table, we return NULL to tell
-     the caller to use the new table.  */
-  if (! COMPARE_AND_SWAP (&l->npages, old_npages, new_npages))
-    return (struct fdesc_table *) NULL;
-
-  *size = old_npages * GLRO(dl_pagesize);
-  new_table = __mmap (NULL, *size,
-		      PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
-  if (new_table == MAP_FAILED)
-    _dl_signal_error (errno, NULL, NULL,
-		      N_("cannot map pages for fdesc table"));
-
-  new_table->len
-    = (*size - sizeof (*new_table)) / sizeof (struct fdesc);
-  new_table->first_unused = 1;
-  return new_table;
-}
-
-
-static ElfW(Addr)
-make_fdesc (ElfW(Addr) ip, ElfW(Addr) gp)
-{
-  struct fdesc *fdesc = NULL;
-  struct fdesc_table *root;
-  unsigned int old;
-  struct local *l;
-
-  ELF_MACHINE_LOAD_ADDRESS (l, local);
-
- retry:
-  root = l->root;
-  while (1)
-    {
-      old = root->first_unused;
-      if (old >= root->len)
-	break;
-      else if (COMPARE_AND_SWAP (&root->first_unused, old, old + 1))
-	{
-	  fdesc = &root->fdesc[old];
-	  goto install;
-	}
-    }
-
-  if (l->free_list)
-    {
-      /* Get it from free-list.  */
-      do
-	{
-	  fdesc = l->free_list;
-	  if (fdesc == NULL)
-	    goto retry;
-	}
-      while (! COMPARE_AND_SWAP ((ElfW(Addr) *) &l->free_list,
-				 (ElfW(Addr)) fdesc, fdesc->ip));
-    }
-  else
-    {
-      /* Create a new fdesc table.  */
-      size_t size;
-      struct fdesc_table *new_table = new_fdesc_table (l, &size);
-
-      if (new_table == NULL)
-	goto retry;
-
-      new_table->next = root;
-      if (! COMPARE_AND_SWAP ((ElfW(Addr) *) &l->root,
-			      (ElfW(Addr)) root,
-			      (ElfW(Addr)) new_table))
-	{
-	  /* Someone has just installed a new table. Return NULL to
-	     tell the caller to use the new table.  */
-	  __munmap (new_table, size);
-	  goto retry;
-	}
-
-      /* Note that the first entry was reserved while allocating the
-	 memory for the new page.  */
-      fdesc = &new_table->fdesc[0];
-    }
-
- install:
-  fdesc->ip = ip;
-  fdesc->gp = gp;
-
-  return (ElfW(Addr)) fdesc;
-}
-
-
-static inline ElfW(Addr) * __attribute__ ((always_inline))
-make_fptr_table (struct link_map *map)
-{
-  const ElfW(Sym) *symtab
-    = (const void *) D_PTR (map, l_info[DT_SYMTAB]);
-  const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
-  ElfW(Addr) *fptr_table;
-  size_t size;
-  size_t len;
-
-  /* XXX Apparently the only way to find out the size of the dynamic
-     symbol section is to assume that the string table follows right
-     afterwards...  */
-  len = ((strtab - (char *) symtab)
-	 / map->l_info[DT_SYMENT]->d_un.d_val);
-  size = ((len * sizeof (fptr_table[0]) + GLRO(dl_pagesize) - 1)
-	  & -GLRO(dl_pagesize));
-  /* XXX We don't support here in the moment systems without MAP_ANON.
-     There probably are none for IA-64.  In case this is proven wrong
-     we will have to open /dev/null here and use the file descriptor
-     instead of the hard-coded -1.  */
-  fptr_table = __mmap (NULL, size,
-		       PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE,
-		       -1, 0);
-  if (fptr_table == MAP_FAILED)
-    _dl_signal_error (errno, NULL, NULL,
-		      N_("cannot map pages for fptr table"));
-
-  if (COMPARE_AND_SWAP ((ElfW(Addr) *) &map->l_mach.fptr_table,
-			(ElfW(Addr)) NULL, (ElfW(Addr)) fptr_table))
-    map->l_mach.fptr_table_len = len;
-  else
-    __munmap (fptr_table, len * sizeof (fptr_table[0]));
-
-  return map->l_mach.fptr_table;
-}
-
-
-ElfW(Addr)
-_dl_make_fptr (struct link_map *map, const ElfW(Sym) *sym,
-	       ElfW(Addr) ip)
-{
-  ElfW(Addr) *ftab = map->l_mach.fptr_table;
-  const ElfW(Sym) *symtab;
-  Elf_Symndx symidx;
-  struct local *l;
-
-  if (__builtin_expect (ftab == NULL, 0))
-    ftab = make_fptr_table (map);
-
-  symtab = (const void *) D_PTR (map, l_info[DT_SYMTAB]);
-  symidx = sym - symtab;
-
-  if (symidx >= map->l_mach.fptr_table_len)
-    _dl_signal_error (0, NULL, NULL,
-		      N_("internal error: symidx out of range of fptr table"));
-
-  while (ftab[symidx] == 0)
-    {
-      /* GOT has already been relocated in elf_get_dynamic_info -
-	 don't try to relocate it again.  */
-      ElfW(Addr) fdesc
-	= make_fdesc (ip, map->l_info[DT_PLTGOT]->d_un.d_ptr);
-
-      if (__builtin_expect (COMPARE_AND_SWAP (&ftab[symidx], (ElfW(Addr)) NULL,
-					      fdesc), 1))
-	{
-	  /* Noone has updated the entry and the new function
-	     descriptor has been installed.  */
-#if 0
-	  const char *strtab
-	    = (const void *) D_PTR (map, l_info[DT_STRTAB]);
-
-	  ELF_MACHINE_LOAD_ADDRESS (l, local);
-	  if (l->root != &l->boot_table
-	      || l->boot_table.first_unused > 20)
-	    _dl_debug_printf ("created fdesc symbol `%s' at %lx\n",
-			      strtab + sym->st_name, ftab[symidx]);
-#endif
-	  break;
-	}
-      else
-	{
-	  /* We created a duplicated function descriptor. We put it on
-	     free-list.  */
-	  struct fdesc *f = (struct fdesc *) fdesc;
-
-	  ELF_MACHINE_LOAD_ADDRESS (l, local);
-
-	  do
-	    f->ip = (ElfW(Addr)) l->free_list;
-	  while (! COMPARE_AND_SWAP ((ElfW(Addr) *) &l->free_list,
-				     f->ip, fdesc));
-	}
-    }
-
-  return ftab[symidx];
-}
-
-
-void
-_dl_unmap (struct link_map *map)
-{
-  ElfW(Addr) *ftab = map->l_mach.fptr_table;
-  struct fdesc *head = NULL, *tail = NULL;
-  size_t i;
-
-  __munmap ((void *) map->l_map_start,
-	    map->l_map_end - map->l_map_start);
-
-  if (ftab == NULL)
-    return;
-
-  /* String together the fdesc structures that are being freed.  */
-  for (i = 0; i < map->l_mach.fptr_table_len; ++i)
-    {
-      if (ftab[i])
-	{
-	  *(struct fdesc **) ftab[i] = head;
-	  head = (struct fdesc *) ftab[i];
-	  if (tail == NULL)
-	    tail = head;
-	}
-    }
-
-  /* Prepend the new list to the free_list: */
-  if (tail)
-    do
-      tail->ip = (ElfW(Addr)) local.free_list;
-    while (! COMPARE_AND_SWAP ((ElfW(Addr) *) &local.free_list,
-			       tail->ip, (ElfW(Addr)) head));
-
-  __munmap (ftab, (map->l_mach.fptr_table_len
-		   * sizeof (map->l_mach.fptr_table[0])));
-
-  map->l_mach.fptr_table = NULL;
-}
-
-
-ElfW(Addr)
-_dl_lookup_address (const void *address)
-{
-  ElfW(Addr) addr = (ElfW(Addr)) address;
-  struct fdesc_table *t;
-  unsigned long int i;
-
-  for (t = local.root; t != NULL; t = t->next)
-    {
-      i = (struct fdesc *) addr - &t->fdesc[0];
-      if (i < t->first_unused && addr == (ElfW(Addr)) &t->fdesc[i])
-	{
-	  addr = t->fdesc[i].ip;
-	  break;
-	}
-    }
-
-  return addr;
-}
diff --git a/sysdeps/generic/dl-origin.c b/sysdeps/generic/dl-origin.c
deleted file mode 100644
index 87619379bc..0000000000
--- a/sysdeps/generic/dl-origin.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Find path of executable.
-   Copyright (C) 1998, 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-#include <ldsodefs.h>
-
-#include <dl-dst.h>
-
-
-const char *
-_dl_get_origin (void)
-{
-  char *result = (char *) -1;
-  /* We use the environment variable LD_ORIGIN_PATH.  If it is set make
-     a copy and strip out trailing slashes.  */
-  if (GLRO(dl_origin_path) != NULL)
-    {
-      size_t len = strlen (GLRO(dl_origin_path));
-      result = (char *) malloc (len + 1);
-      if (result == NULL)
-	result = (char *) -1;
-      else
-	{
-	  char *cp = __mempcpy (result, GLRO(dl_origin_path), len);
-	  while (cp > result + 1 && cp[-1] == '/')
-	    --cp;
-	  *cp = '\0';
-	}
-    }
-
-  return result;
-}
diff --git a/sysdeps/generic/dl-sbrk.c b/sysdeps/generic/dl-sbrk.c
deleted file mode 100644
index 4713a92694..0000000000
--- a/sysdeps/generic/dl-sbrk.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/* We can use the normal code but we also know the __curbrk is not exported
-   from ld.so.  */
-extern void *__curbrk attribute_hidden;
-
-#include <sbrk.c>
diff --git a/sysdeps/generic/dl-symaddr.c b/sysdeps/generic/dl-symaddr.c
deleted file mode 100644
index 3c850ca835..0000000000
--- a/sysdeps/generic/dl-symaddr.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Get the symbol address.  Generic version.
-   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <ldsodefs.h>
-#include <dl-fptr.h>
-
-void *
-_dl_symbol_address (struct link_map *map, const ElfW(Sym) *ref)
-{
-  ElfW(Addr) value = (map ? map->l_addr : 0) + ref->st_value;
-
-  /* Return the pointer to function descriptor. */
-  if (ELFW(ST_TYPE) (ref->st_info) == STT_FUNC)
-    return (void *) _dl_make_fptr (map, ref, value);
-  else
-    return (void *) value;
-}
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
deleted file mode 100644
index 985e2b8f77..0000000000
--- a/sysdeps/generic/dl-sysdep.c
+++ /dev/null
@@ -1,590 +0,0 @@
-/* Operating system support for run-time dynamic linker.  Generic Unix version.
-   Copyright (C) 1995-1998, 2000-2003, 2004, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <elf.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <libintl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <ldsodefs.h>
-#include <stdio-common/_itoa.h>
-#include <fpu_control.h>
-
-#include <entry.h>
-#include <dl-machine.h>
-#include <dl-procinfo.h>
-#include <dl-osinfo.h>
-#include <hp-timing.h>
-#include <tls.h>
-
-#ifdef _DL_FIRST_PLATFORM
-# define _DL_FIRST_EXTRA (_DL_FIRST_PLATFORM + _DL_PLATFORMS_COUNT)
-#else
-# define _DL_FIRST_EXTRA _DL_HWCAP_COUNT
-#endif
-
-extern char **_environ attribute_hidden;
-extern void _end attribute_hidden;
-
-/* Protect SUID program against misuse of file descriptors.  */
-extern void __libc_check_standard_fds (void);
-
-#ifdef NEED_DL_BASE_ADDR
-ElfW(Addr) _dl_base_addr;
-#endif
-int __libc_enable_secure attribute_relro = 0;
-INTVARDEF(__libc_enable_secure)
-int __libc_multiple_libcs = 0;	/* Defining this here avoids the inclusion
-				   of init-first.  */
-/* This variable contains the lowest stack address ever used.  */
-void *__libc_stack_end attribute_relro = NULL;
-rtld_hidden_data_def(__libc_stack_end)
-static ElfW(auxv_t) *_dl_auxv attribute_relro;
-
-#ifndef DL_FIND_ARG_COMPONENTS
-# define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp)	\
-  do {									      \
-    void **_tmp;							      \
-    (argc) = *(long int *) cookie;					      \
-    (argv) = (char **) ((long int *) cookie + 1);			      \
-    (envp) = (argv) + (argc) + 1;					      \
-    for (_tmp = (void **) (envp); *_tmp; ++_tmp)			      \
-      continue;								      \
-    (auxp) = (void *) ++_tmp;						      \
-  } while (0)
-#endif
-
-#ifndef DL_STACK_END
-# define DL_STACK_END(cookie) ((void *) (cookie))
-#endif
-
-ElfW(Addr)
-_dl_sysdep_start (void **start_argptr,
-		  void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phnum,
-				   ElfW(Addr) *user_entry))
-{
-  const ElfW(Phdr) *phdr = NULL;
-  ElfW(Word) phnum = 0;
-  ElfW(Addr) user_entry;
-  ElfW(auxv_t) *av;
-#ifdef HAVE_AUX_SECURE
-# define set_seen(tag) (tag)	/* Evaluate for the side effects.  */
-# define set_seen_secure() ((void) 0)
-#else
-  uid_t uid = 0;
-  gid_t gid = 0;
-  unsigned int seen = 0;
-# define set_seen_secure() (seen = -1)
-# ifdef HAVE_AUX_XID
-#  define set_seen(tag) (tag)	/* Evaluate for the side effects.  */
-# else
-#  define M(type) (1 << (type))
-#  define set_seen(tag) seen |= M ((tag)->a_type)
-# endif
-#endif
-#ifdef NEED_DL_SYSINFO
-  uintptr_t new_sysinfo = 0;
-#endif
-
-  __libc_stack_end = DL_STACK_END (start_argptr);
-  DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, INTUSE(_dl_argv), _environ,
-			  _dl_auxv);
-
-  user_entry = (ElfW(Addr)) ENTRY_POINT;
-  GLRO(dl_platform) = NULL; /* Default to nothing known about the platform.  */
-
-  for (av = _dl_auxv; av->a_type != AT_NULL; set_seen (av++))
-    switch (av->a_type)
-      {
-      case AT_PHDR:
-	phdr = (void *) av->a_un.a_val;
-	break;
-      case AT_PHNUM:
-	phnum = av->a_un.a_val;
-	break;
-      case AT_PAGESZ:
-	GLRO(dl_pagesize) = av->a_un.a_val;
-	break;
-      case AT_ENTRY:
-	user_entry = av->a_un.a_val;
-	break;
-#ifdef NEED_DL_BASE_ADDR
-      case AT_BASE:
-	_dl_base_addr = av->a_un.a_val;
-	break;
-#endif
-#ifndef HAVE_AUX_SECURE
-      case AT_UID:
-      case AT_EUID:
-	uid ^= av->a_un.a_val;
-	break;
-      case AT_GID:
-      case AT_EGID:
-	gid ^= av->a_un.a_val;
-	break;
-#endif
-      case AT_SECURE:
-#ifndef HAVE_AUX_SECURE
-	seen = -1;
-#endif
-	INTUSE(__libc_enable_secure) = av->a_un.a_val;
-	break;
-      case AT_PLATFORM:
-	GLRO(dl_platform) = (void *) av->a_un.a_val;
-	break;
-      case AT_HWCAP:
-	GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val;
-	break;
-      case AT_CLKTCK:
-	GLRO(dl_clktck) = av->a_un.a_val;
-	break;
-      case AT_FPUCW:
-	GLRO(dl_fpu_control) = av->a_un.a_val;
-	break;
-#ifdef NEED_DL_SYSINFO
-      case AT_SYSINFO:
-	new_sysinfo = av->a_un.a_val;
-	break;
-#endif
-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
-      case AT_SYSINFO_EHDR:
-	GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val;
-	break;
-#endif
-#ifdef DL_PLATFORM_AUXV
-      DL_PLATFORM_AUXV
-#endif
-      }
-
-#ifndef HAVE_AUX_SECURE
-  if (seen != -1)
-    {
-      /* Fill in the values we have not gotten from the kernel through the
-	 auxiliary vector.  */
-# ifndef HAVE_AUX_XID
-#  define SEE(UID, var, uid) \
-   if ((seen & M (AT_##UID)) == 0) var ^= __get##uid ()
-      SEE (UID, uid, uid);
-      SEE (EUID, uid, euid);
-      SEE (GID, gid, gid);
-      SEE (EGID, gid, egid);
-# endif
-
-      /* If one of the two pairs of IDs does not match this is a setuid
-	 or setgid run.  */
-      INTUSE(__libc_enable_secure) = uid | gid;
-    }
-#endif
-
-#ifndef HAVE_AUX_PAGESIZE
-  if (GLRO(dl_pagesize) == 0)
-    GLRO(dl_pagesize) = __getpagesize ();
-#endif
-
-#if defined NEED_DL_SYSINFO
-  /* Only set the sysinfo value if we also have the vsyscall DSO.  */
-  if (GLRO(dl_sysinfo_dso) != 0 && new_sysinfo)
-    GLRO(dl_sysinfo) = new_sysinfo;
-#endif
-
-#ifdef DL_SYSDEP_INIT
-  DL_SYSDEP_INIT;
-#endif
-
-#ifdef DL_PLATFORM_INIT
-  DL_PLATFORM_INIT;
-#endif
-
-  /* Determine the length of the platform name.  */
-  if (GLRO(dl_platform) != NULL)
-    GLRO(dl_platformlen) = strlen (GLRO(dl_platform));
-
-  if (__sbrk (0) == &_end)
-    /* The dynamic linker was run as a program, and so the initial break
-       starts just after our bss, at &_end.  The malloc in dl-minimal.c
-       will consume the rest of this page, so tell the kernel to move the
-       break up that far.  When the user program examines its break, it
-       will see this new value and not clobber our data.  */
-    __sbrk (GLRO(dl_pagesize)
-	    - ((&_end - (void *) 0) & (GLRO(dl_pagesize) - 1)));
-
-  /* If this is a SUID program we make sure that FDs 0, 1, and 2 are
-     allocated.  If necessary we are doing it ourself.  If it is not
-     possible we stop the program.  */
-  if (__builtin_expect (INTUSE(__libc_enable_secure), 0))
-    __libc_check_standard_fds ();
-
-  (*dl_main) (phdr, phnum, &user_entry);
-  return user_entry;
-}
-
-void
-internal_function
-_dl_sysdep_start_cleanup (void)
-{
-}
-
-void
-internal_function
-_dl_show_auxv (void)
-{
-  char buf[64];
-  ElfW(auxv_t) *av;
-
-  /* Terminate string.  */
-  buf[63] = '\0';
-
-  /* The following code assumes that the AT_* values are encoded
-     starting from 0 with AT_NULL, 1 for AT_IGNORE, and all other values
-     close by (otherwise the array will be too large).  In case we have
-     to support a platform where these requirements are not fulfilled
-     some alternative implementation has to be used.  */
-  for (av = _dl_auxv; av->a_type != AT_NULL; ++av)
-    {
-      static const struct
-      {
-	const char label[20];
-	enum { unknown = 0, dec, hex, str, ignore } form;
-      } auxvars[] =
-	{
-	  [AT_EXECFD - 2] =		{ "AT_EXECFD:       ", dec },
-	  [AT_PHDR - 2] =		{ "AT_PHDR:         0x", hex },
-	  [AT_PHENT - 2] =		{ "AT_PHENT:        ", dec },
-	  [AT_PHNUM - 2] =		{ "AT_PHNUM:        ", dec },
-	  [AT_PAGESZ - 2] =		{ "AT_PAGESZ:       ", dec },
-	  [AT_BASE - 2] =		{ "AT_BASE:         0x", hex },
-	  [AT_FLAGS - 2] =		{ "AT_FLAGS:        0x", hex },
-	  [AT_ENTRY - 2] =		{ "AT_ENTRY:        0x", hex },
-	  [AT_NOTELF - 2] =		{ "AT_NOTELF:       ", hex },
-	  [AT_UID - 2] =		{ "AT_UID:          ", dec },
-	  [AT_EUID - 2] =		{ "AT_EUID:         ", dec },
-	  [AT_GID - 2] =		{ "AT_GID:          ", dec },
-	  [AT_EGID - 2] =		{ "AT_EGID:         ", dec },
-	  [AT_PLATFORM - 2] =		{ "AT_PLATFORM:     ", str },
-	  [AT_HWCAP - 2] =		{ "AT_HWCAP:        ", hex },
-	  [AT_CLKTCK - 2] =		{ "AT_CLKTCK:       ", dec },
-	  [AT_FPUCW - 2] =		{ "AT_FPUCW:        ", hex },
-	  [AT_DCACHEBSIZE - 2] =	{ "AT_DCACHEBSIZE:  0x", hex },
-	  [AT_ICACHEBSIZE - 2] =	{ "AT_ICACHEBSIZE:  0x", hex },
-	  [AT_UCACHEBSIZE - 2] =	{ "AT_UCACHEBSIZE:  0x", hex },
-	  [AT_IGNOREPPC - 2] =		{ "AT_IGNOREPPC", ignore },
-	  [AT_SECURE - 2] =		{ "AT_SECURE:       ", dec },
-	  [AT_SYSINFO - 2] =		{ "AT_SYSINFO:      0x", hex },
-	  [AT_SYSINFO_EHDR - 2] =	{ "AT_SYSINFO_EHDR: 0x", hex },
-	};
-      unsigned int idx = (unsigned int) (av->a_type - 2);
-
-      if ((unsigned int) av->a_type < 2u || auxvars[idx].form == ignore)
-	continue;
-
-      assert (AT_NULL == 0);
-      assert (AT_IGNORE == 1);
-
-      if (av->a_type == AT_HWCAP)
-	{
-	  /* This is handled special.  */
-	  if (_dl_procinfo (av->a_un.a_val) == 0)
-	    continue;
-	}
-
-      if (idx < sizeof (auxvars) / sizeof (auxvars[0])
-	  && auxvars[idx].form != unknown)
-	{
-	  const char *val = (char *) av->a_un.a_val;
-
-	  if (__builtin_expect (auxvars[idx].form, dec) == dec)
-	    val = _itoa ((unsigned long int) av->a_un.a_val,
-			 buf + sizeof buf - 1, 10, 0);
-	  else if (__builtin_expect (auxvars[idx].form, hex) == hex)
-	    val = _itoa ((unsigned long int) av->a_un.a_val,
-			 buf + sizeof buf - 1, 16, 0);
-
-	  _dl_printf ("%s%s\n", auxvars[idx].label, val);
-
-	  continue;
-	}
-
-      /* Unknown value: print a generic line.  */
-      char buf2[17];
-      buf[sizeof (buf2) - 1] = '\0';
-      const char *val2 = _itoa ((unsigned long int) av->a_un.a_val,
-				buf2 + sizeof buf2 - 1, 16, 0);
-      const char *val =  _itoa ((unsigned long int) av->a_type,
-				buf + sizeof buf - 1, 16, 0);
-      _dl_printf ("AT_??? (0x%s): 0x%s\n", val, val2);
-    }
-}
-
-
-/* Return an array of useful/necessary hardware capability names.  */
-const struct r_strlenpair *
-internal_function
-_dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
-		      size_t *max_capstrlen)
-{
-  /* Determine how many important bits are set.  */
-  uint64_t masked = GLRO(dl_hwcap) & GLRO(dl_hwcap_mask);
-  size_t cnt = platform != NULL;
-  size_t n, m;
-  size_t total;
-  struct r_strlenpair *temp;
-  struct r_strlenpair *result;
-  struct r_strlenpair *rp;
-  char *cp;
-
-  /* Count the number of bits set in the masked value.  */
-  for (n = 0; (~((1ULL << n) - 1) & masked) != 0; ++n)
-    if ((masked & (1ULL << n)) != 0)
-      ++cnt;
-
-#if (defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO) && defined SHARED
-  /* The system-supplied DSO can contain a note of type 2, vendor "GNU".
-     This gives us a list of names to treat as fake hwcap bits.  */
-
-  const char *dsocaps = NULL;
-  size_t dsocapslen = 0;
-  if (GLRO(dl_sysinfo_map) != NULL)
-    {
-      const ElfW(Phdr) *const phdr = GLRO(dl_sysinfo_map)->l_phdr;
-      const ElfW(Word) phnum = GLRO(dl_sysinfo_map)->l_phnum;
-      for (uint_fast16_t i = 0; i < phnum; ++i)
-	if (phdr[i].p_type == PT_NOTE)
-	  {
-	    const ElfW(Addr) start = (phdr[i].p_vaddr
-				      + GLRO(dl_sysinfo_map)->l_addr);
-	    const struct
-	    {
-	      ElfW(Word) vendorlen;
-	      ElfW(Word) datalen;
-	      ElfW(Word) type;
-	    } *note = (const void *) start;
-	    while ((ElfW(Addr)) (note + 1) - start < phdr[i].p_memsz)
-	      {
-#define ROUND(len) (((len) + sizeof (ElfW(Word)) - 1) & -sizeof (ElfW(Word)))
-		if (note->type == 2
-		    && note->vendorlen == sizeof "GNU"
-		    && !memcmp ((note + 1), "GNU", sizeof "GNU")
-		    && note->datalen > 2 * sizeof (ElfW(Word)) + 2)
-		  {
-		    const ElfW(Word) *p = ((const void *) (note + 1)
-					   + ROUND (sizeof "GNU"));
-		    cnt += *p++;
-		    ++p;	/* Skip mask word.  */
-		    dsocaps = (const char *) p;
-		    dsocapslen = note->datalen - sizeof *p * 2;
-		    break;
-		  }
-		note = ((const void *) (note + 1)
-			+ ROUND (note->vendorlen) + ROUND (note->datalen));
-	      }
-	    if (dsocaps != NULL)
-	      break;
-	  }
-    }
-#endif
-
-#ifdef USE_TLS
-  /* For TLS enabled builds always add 'tls'.  */
-  ++cnt;
-#else
-  if (cnt == 0)
-    {
-      /* If we no have platform name and no important capability we only
-	 have the base directory to search.  */
-      result = (struct r_strlenpair *) malloc (sizeof (*result));
-      if (result == NULL)
-	goto no_memory;
-
-      result[0].str = (char *) result;	/* Does not really matter.  */
-      result[0].len = 0;
-
-      *sz = 1;
-      return result;
-    }
-#endif
-
-  /* Create temporary data structure to generate result table.  */
-  temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp));
-  m = 0;
-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
-  if (dsocaps != NULL)
-    {
-      const ElfW(Word) mask = ((const ElfW(Word) *) dsocaps)[-1];
-      GLRO(dl_hwcap) |= (uint64_t) mask << _DL_FIRST_EXTRA;
-      size_t len;
-      for (const char *p = dsocaps; p < dsocaps + dsocapslen; p += len + 1)
-	{
-	  uint_fast8_t bit = *p++;
-	  len = strlen (p);
-
-	  /* Skip entries that are not enabled in the mask word.  */
-	  if (__builtin_expect (mask & ((ElfW(Word)) 1 << bit), 1))
-	    {
-	      temp[m].str = p;
-	      temp[m].len = len;
-	      ++m;
-	    }
-	  else
-	    --cnt;
-	}
-    }
-#endif
-  for (n = 0; masked != 0; ++n)
-    if ((masked & (1ULL << n)) != 0)
-      {
-	temp[m].str = _dl_hwcap_string (n);
-	temp[m].len = strlen (temp[m].str);
-	masked ^= 1ULL << n;
-	++m;
-      }
-  if (platform != NULL)
-    {
-      temp[m].str = platform;
-      temp[m].len = platform_len;
-      ++m;
-    }
-#ifdef USE_TLS
-  temp[m].str = "tls";
-  temp[m].len = 3;
-  ++m;
-#endif
-  assert (m == cnt);
-
-  /* Determine the total size of all strings together.  */
-  if (cnt == 1)
-    total = temp[0].len + 1;
-  else
-    {
-      total = (1UL << (cnt - 2)) * (temp[0].len + temp[cnt - 1].len + 2);
-      for (n = 1; n + 1 < cnt; ++n)
-	total += (1UL << (cnt - 3)) * (temp[n].len + 1);
-    }
-
-  /* The result structure: we use a very compressed way to store the
-     various combinations of capability names.  */
-  *sz = 1 << cnt;
-  result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total);
-  if (result == NULL)
-    {
-#ifndef USE_TLS
-    no_memory:
-#endif
-      _dl_signal_error (ENOMEM, NULL, NULL,
-			N_("cannot create capability list"));
-    }
-
-  if (cnt == 1)
-    {
-      result[0].str = (char *) (result + *sz);
-      result[0].len = temp[0].len + 1;
-      result[1].str = (char *) (result + *sz);
-      result[1].len = 0;
-      cp = __mempcpy ((char *) (result + *sz), temp[0].str, temp[0].len);
-      *cp = '/';
-      *sz = 2;
-      *max_capstrlen = result[0].len;
-
-      return result;
-    }
-
-  /* Fill in the information.  This follows the following scheme
-     (indeces from TEMP for four strings):
-	entry #0: 0, 1, 2, 3	binary: 1111
-	      #1: 0, 1, 3	        1101
-	      #2: 0, 2, 3	        1011
-	      #3: 0, 3		        1001
-     This allows the representation of all possible combinations of
-     capability names in the string.  First generate the strings.  */
-  result[1].str = result[0].str = cp = (char *) (result + *sz);
-#define add(idx) \
-      cp = __mempcpy (__mempcpy (cp, temp[idx].str, temp[idx].len), "/", 1);
-  if (cnt == 2)
-    {
-      add (1);
-      add (0);
-    }
-  else
-    {
-      n = 1 << (cnt - 1);
-      do
-	{
-	  n -= 2;
-
-	  /* We always add the last string.  */
-	  add (cnt - 1);
-
-	  /* Add the strings which have the bit set in N.  */
-	  for (m = cnt - 2; m > 0; --m)
-	    if ((n & (1 << m)) != 0)
-	      add (m);
-
-	  /* Always add the first string.  */
-	  add (0);
-	}
-      while (n != 0);
-    }
-#undef add
-
-  /* Now we are ready to install the string pointers and length.  */
-  for (n = 0; n < (1UL << cnt); ++n)
-    result[n].len = 0;
-  n = cnt;
-  do
-    {
-      size_t mask = 1 << --n;
-
-      rp = result;
-      for (m = 1 << cnt; m > 0; ++rp)
-	if ((--m & mask) != 0)
-	  rp->len += temp[n].len + 1;
-    }
-  while (n != 0);
-
-  /* The first half of the strings all include the first string.  */
-  n = (1 << cnt) - 2;
-  rp = &result[2];
-  while (n != (1UL << (cnt - 1)))
-    {
-      if ((--n & 1) != 0)
-	rp[0].str = rp[-2].str + rp[-2].len;
-      else
-	rp[0].str = rp[-1].str;
-      ++rp;
-    }
-
-  /* The second half starts right after the first part of the string of
-     the corresponding entry in the first half.  */
-  do
-    {
-      rp[0].str = rp[-(1 << (cnt - 1))].str + temp[cnt - 1].len + 1;
-      ++rp;
-    }
-  while (--n != 0);
-
-  /* The maximum string length.  */
-  *max_capstrlen = result[0].len;
-
-  return result;
-}
diff --git a/sysdeps/generic/dl-tls.c b/sysdeps/generic/dl-tls.c
deleted file mode 100644
index 4fed570d5c..0000000000
--- a/sysdeps/generic/dl-tls.c
+++ /dev/null
@@ -1,799 +0,0 @@
-/* Thread-local storage handling in the ELF dynamic linker.  Generic version.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <errno.h>
-#include <libintl.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/param.h>
-
-#include <tls.h>
-
-/* We don't need any of this if TLS is not supported.  */
-#ifdef USE_TLS
-
-# include <dl-tls.h>
-# include <ldsodefs.h>
-
-/* Amount of excess space to allocate in the static TLS area
-   to allow dynamic loading of modules defining IE-model TLS data.  */
-# define TLS_STATIC_SURPLUS	64 + DL_NNS * 100
-
-/* Value used for dtv entries for which the allocation is delayed.  */
-# define TLS_DTV_UNALLOCATED	((void *) -1l)
-
-
-/* Out-of-memory handler.  */
-# ifdef SHARED
-static void
-__attribute__ ((__noreturn__))
-oom (void)
-{
-  _dl_fatal_printf ("cannot allocate memory for thread-local data: ABORT\n");
-}
-# endif
-
-
-size_t
-internal_function
-_dl_next_tls_modid (void)
-{
-  size_t result;
-
-  if (__builtin_expect (GL(dl_tls_dtv_gaps), false))
-    {
-      size_t disp = 0;
-      struct dtv_slotinfo_list *runp = GL(dl_tls_dtv_slotinfo_list);
-
-      /* Note that this branch will never be executed during program
-	 start since there are no gaps at that time.  Therefore it
-	 does not matter that the dl_tls_dtv_slotinfo is not allocated
-	 yet when the function is called for the first times.
-
-	 NB: the offset +1 is due to the fact that DTV[0] is used
-	 for something else.  */
-      result = GL(dl_tls_static_nelem) + 1;
-      if (result <= GL(dl_tls_max_dtv_idx))
-	do
-	  {
-	    while (result - disp < runp->len)
-	      {
-		if (runp->slotinfo[result - disp].map == NULL)
-		  break;
-
-		++result;
-		assert (result <= GL(dl_tls_max_dtv_idx) + 1);
-	      }
-
-	    if (result - disp < runp->len)
-	      break;
-
-	    disp += runp->len;
-	  }
-	while ((runp = runp->next) != NULL);
-
-      if (result > GL(dl_tls_max_dtv_idx))
-	{
-	  /* The new index must indeed be exactly one higher than the
-	     previous high.  */
-	  assert (result == GL(dl_tls_max_dtv_idx) + 1);
-	  /* There is no gap anymore.  */
-	  GL(dl_tls_dtv_gaps) = false;
-
-	  goto nogaps;
-	}
-    }
-  else
-    {
-      /* No gaps, allocate a new entry.  */
-    nogaps:
-
-      result = ++GL(dl_tls_max_dtv_idx);
-    }
-
-  return result;
-}
-
-
-# ifdef SHARED
-void
-internal_function
-_dl_determine_tlsoffset (void)
-{
-  size_t max_align = TLS_TCB_ALIGN;
-  size_t freetop = 0;
-  size_t freebottom = 0;
-
-  /* The first element of the dtv slot info list is allocated.  */
-  assert (GL(dl_tls_dtv_slotinfo_list) != NULL);
-  /* There is at this point only one element in the
-     dl_tls_dtv_slotinfo_list list.  */
-  assert (GL(dl_tls_dtv_slotinfo_list)->next == NULL);
-
-  struct dtv_slotinfo *slotinfo = GL(dl_tls_dtv_slotinfo_list)->slotinfo;
-
-  /* Determining the offset of the various parts of the static TLS
-     block has several dependencies.  In addition we have to work
-     around bugs in some toolchains.
-
-     Each TLS block from the objects available at link time has a size
-     and an alignment requirement.  The GNU ld computes the alignment
-     requirements for the data at the positions *in the file*, though.
-     I.e, it is not simply possible to allocate a block with the size
-     of the TLS program header entry.  The data is layed out assuming
-     that the first byte of the TLS block fulfills
-
-       p_vaddr mod p_align == &TLS_BLOCK mod p_align
-
-     This means we have to add artificial padding at the beginning of
-     the TLS block.  These bytes are never used for the TLS data in
-     this module but the first byte allocated must be aligned
-     according to mod p_align == 0 so that the first byte of the TLS
-     block is aligned according to p_vaddr mod p_align.  This is ugly
-     and the linker can help by computing the offsets in the TLS block
-     assuming the first byte of the TLS block is aligned according to
-     p_align.
-
-     The extra space which might be allocated before the first byte of
-     the TLS block need not go unused.  The code below tries to use
-     that memory for the next TLS block.  This can work if the total
-     memory requirement for the next TLS block is smaller than the
-     gap.  */
-
-# if TLS_TCB_AT_TP
-  /* We simply start with zero.  */
-  size_t offset = 0;
-
-  for (size_t cnt = 0; slotinfo[cnt].map != NULL; ++cnt)
-    {
-      assert (cnt < GL(dl_tls_dtv_slotinfo_list)->len);
-
-      size_t firstbyte = (-slotinfo[cnt].map->l_tls_firstbyte_offset
-			  & (slotinfo[cnt].map->l_tls_align - 1));
-      size_t off;
-      max_align = MAX (max_align, slotinfo[cnt].map->l_tls_align);
-
-      if (freebottom - freetop >= slotinfo[cnt].map->l_tls_blocksize)
-	{
-	  off = roundup (freetop + slotinfo[cnt].map->l_tls_blocksize
-			 - firstbyte, slotinfo[cnt].map->l_tls_align)
-		+ firstbyte;
-	  if (off <= freebottom)
-	    {
-	      freetop = off;
-
-	      /* XXX For some architectures we perhaps should store the
-		 negative offset.  */
-	      slotinfo[cnt].map->l_tls_offset = off;
-	      continue;
-	    }
-	}
-
-      off = roundup (offset + slotinfo[cnt].map->l_tls_blocksize - firstbyte,
-		     slotinfo[cnt].map->l_tls_align) + firstbyte;
-      if (off > offset + slotinfo[cnt].map->l_tls_blocksize
-		+ (freebottom - freetop))
-	{
-	  freetop = offset;
-	  freebottom = off - slotinfo[cnt].map->l_tls_blocksize;
-	}
-      offset = off;
-
-      /* XXX For some architectures we perhaps should store the
-	 negative offset.  */
-      slotinfo[cnt].map->l_tls_offset = off;
-    }
-
-  GL(dl_tls_static_used) = offset;
-  GL(dl_tls_static_size) = (roundup (offset + TLS_STATIC_SURPLUS, max_align)
-			    + TLS_TCB_SIZE);
-# elif TLS_DTV_AT_TP
-  /* The TLS blocks start right after the TCB.  */
-  size_t offset = TLS_TCB_SIZE;
-
-  for (size_t cnt = 0; slotinfo[cnt].map != NULL; ++cnt)
-    {
-      assert (cnt < GL(dl_tls_dtv_slotinfo_list)->len);
-
-      size_t firstbyte = (-slotinfo[cnt].map->l_tls_firstbyte_offset
-			  & (slotinfo[cnt].map->l_tls_align - 1));
-      size_t off;
-      max_align = MAX (max_align, slotinfo[cnt].map->l_tls_align);
-
-      if (slotinfo[cnt].map->l_tls_blocksize <= freetop - freebottom)
-	{
-	  off = roundup (freebottom, slotinfo[cnt].map->l_tls_align);
-	  if (off - freebottom < firstbyte)
-	    off += slotinfo[cnt].map->l_tls_align;
-	  if (off + slotinfo[cnt].map->l_tls_blocksize - firstbyte <= freetop)
-	    {
-	      slotinfo[cnt].map->l_tls_offset = off - firstbyte;
-	      freebottom = (off + slotinfo[cnt].map->l_tls_blocksize
-			    - firstbyte);
-	      continue;
-	    }
-	}
-
-      off = roundup (offset, slotinfo[cnt].map->l_tls_align);
-      if (off - offset < firstbyte)
-	off += slotinfo[cnt].map->l_tls_align;
-
-      slotinfo[cnt].map->l_tls_offset = off - firstbyte;
-      if (off - firstbyte - offset > freetop - freebottom)
-	{
-	  freebottom = offset;
-	  freetop = off - firstbyte;
-	}
-
-      offset = off + slotinfo[cnt].map->l_tls_blocksize - firstbyte;
-    }
-
-  GL(dl_tls_static_used) = offset;
-  GL(dl_tls_static_size) = roundup (offset + TLS_STATIC_SURPLUS,
-				    TLS_TCB_ALIGN);
-# else
-#  error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
-# endif
-
-  /* The alignment requirement for the static TLS block.  */
-  GL(dl_tls_static_align) = max_align;
-}
-
-
-/* This is called only when the data structure setup was skipped at startup,
-   when there was no need for it then.  Now we have dynamically loaded
-   something needing TLS, or libpthread needs it.  */
-int
-internal_function
-_dl_tls_setup (void)
-{
-  assert (GL(dl_tls_dtv_slotinfo_list) == NULL);
-  assert (GL(dl_tls_max_dtv_idx) == 0);
-
-  const size_t nelem = 2 + TLS_SLOTINFO_SURPLUS;
-
-  GL(dl_tls_dtv_slotinfo_list)
-    = calloc (1, (sizeof (struct dtv_slotinfo_list)
-		  + nelem * sizeof (struct dtv_slotinfo)));
-  if (GL(dl_tls_dtv_slotinfo_list) == NULL)
-    return -1;
-
-  GL(dl_tls_dtv_slotinfo_list)->len = nelem;
-
-  /* Number of elements in the static TLS block.  It can't be zero
-     because of various assumptions.  The one element is null.  */
-  GL(dl_tls_static_nelem) = GL(dl_tls_max_dtv_idx) = 1;
-
-  /* This initializes more variables for us.  */
-  _dl_determine_tlsoffset ();
-
-  return 0;
-}
-rtld_hidden_def (_dl_tls_setup)
-# endif
-
-static void *
-internal_function
-allocate_dtv (void *result)
-{
-  dtv_t *dtv;
-  size_t dtv_length;
-
-  /* We allocate a few more elements in the dtv than are needed for the
-     initial set of modules.  This should avoid in most cases expansions
-     of the dtv.  */
-  dtv_length = GL(dl_tls_max_dtv_idx) + DTV_SURPLUS;
-  dtv = calloc (dtv_length + 2, sizeof (dtv_t));
-  if (dtv != NULL)
-    {
-      /* This is the initial length of the dtv.  */
-      dtv[0].counter = dtv_length;
-
-      /* The rest of the dtv (including the generation counter) is
-	 Initialize with zero to indicate nothing there.  */
-
-      /* Add the dtv to the thread data structures.  */
-      INSTALL_DTV (result, dtv);
-    }
-  else
-    result = NULL;
-
-  return result;
-}
-
-
-/* Get size and alignment requirements of the static TLS block.  */
-void
-internal_function
-_dl_get_tls_static_info (size_t *sizep, size_t *alignp)
-{
-  *sizep = GL(dl_tls_static_size);
-  *alignp = GL(dl_tls_static_align);
-}
-
-
-void *
-internal_function
-_dl_allocate_tls_storage (void)
-{
-  void *result;
-  size_t size = GL(dl_tls_static_size);
-
-# if TLS_DTV_AT_TP
-  /* Memory layout is:
-     [ TLS_PRE_TCB_SIZE ] [ TLS_TCB_SIZE ] [ TLS blocks ]
-			  ^ This should be returned.  */
-  size += (TLS_PRE_TCB_SIZE + GL(dl_tls_static_align) - 1)
-	  & ~(GL(dl_tls_static_align) - 1);
-# endif
-
-  /* Allocate a correctly aligned chunk of memory.  */
-  result = __libc_memalign (GL(dl_tls_static_align), size);
-  if (__builtin_expect (result != NULL, 1))
-    {
-      /* Allocate the DTV.  */
-      void *allocated = result;
-
-# if TLS_TCB_AT_TP
-      /* The TCB follows the TLS blocks.  */
-      result = (char *) result + size - TLS_TCB_SIZE;
-
-      /* Clear the TCB data structure.  We can't ask the caller (i.e.
-	 libpthread) to do it, because we will initialize the DTV et al.  */
-      memset (result, '\0', TLS_TCB_SIZE);
-# elif TLS_DTV_AT_TP
-      result = (char *) result + size - GL(dl_tls_static_size);
-
-      /* Clear the TCB data structure and TLS_PRE_TCB_SIZE bytes before it.
-	 We can't ask the caller (i.e. libpthread) to do it, because we will
-	 initialize the DTV et al.  */
-      memset ((char *) result - TLS_PRE_TCB_SIZE, '\0',
-	      TLS_PRE_TCB_SIZE + TLS_TCB_SIZE);
-# endif
-
-      result = allocate_dtv (result);
-      if (result == NULL)
-	free (allocated);
-    }
-
-  return result;
-}
-
-
-void *
-internal_function
-_dl_allocate_tls_init (void *result)
-{
-  if (result == NULL)
-    /* The memory allocation failed.  */
-    return NULL;
-
-  dtv_t *dtv = GET_DTV (result);
-  struct dtv_slotinfo_list *listp;
-  size_t total = 0;
-  size_t maxgen = 0;
-
-  /* We have to prepare the dtv for all currently loaded modules using
-     TLS.  For those which are dynamically loaded we add the values
-     indicating deferred allocation.  */
-  listp = GL(dl_tls_dtv_slotinfo_list);
-  while (1)
-    {
-      size_t cnt;
-
-      for (cnt = total == 0 ? 1 : 0; cnt < listp->len; ++cnt)
-	{
-	  struct link_map *map;
-	  void *dest;
-
-	  /* Check for the total number of used slots.  */
-	  if (total + cnt > GL(dl_tls_max_dtv_idx))
-	    break;
-
-	  map = listp->slotinfo[cnt].map;
-	  if (map == NULL)
-	    /* Unused entry.  */
-	    continue;
-
-	  /* Keep track of the maximum generation number.  This might
-	     not be the generation counter.  */
-	  maxgen = MAX (maxgen, listp->slotinfo[cnt].gen);
-
-	  if (map->l_tls_offset == NO_TLS_OFFSET)
-	    {
-	      /* For dynamically loaded modules we simply store
-		 the value indicating deferred allocation.  */
-	      dtv[map->l_tls_modid].pointer.val = TLS_DTV_UNALLOCATED;
-	      dtv[map->l_tls_modid].pointer.is_static = false;
-	      continue;
-	    }
-
-	  assert (map->l_tls_modid == cnt);
-	  assert (map->l_tls_blocksize >= map->l_tls_initimage_size);
-# if TLS_TCB_AT_TP
-	  assert ((size_t) map->l_tls_offset >= map->l_tls_blocksize);
-	  dest = (char *) result - map->l_tls_offset;
-# elif TLS_DTV_AT_TP
-	  dest = (char *) result + map->l_tls_offset;
-# else
-#  error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
-# endif
-
-	  /* Copy the initialization image and clear the BSS part.  */
-	  dtv[map->l_tls_modid].pointer.val = dest;
-	  dtv[map->l_tls_modid].pointer.is_static = true;
-	  memset (__mempcpy (dest, map->l_tls_initimage,
-			     map->l_tls_initimage_size), '\0',
-		  map->l_tls_blocksize - map->l_tls_initimage_size);
-	}
-
-      total += cnt;
-      if (total >= GL(dl_tls_max_dtv_idx))
-	break;
-
-      listp = listp->next;
-      assert (listp != NULL);
-    }
-
-  /* The DTV version is up-to-date now.  */
-  dtv[0].counter = maxgen;
-
-  return result;
-}
-rtld_hidden_def (_dl_allocate_tls_init)
-
-void *
-internal_function
-_dl_allocate_tls (void *mem)
-{
-  return _dl_allocate_tls_init (mem == NULL
-				? _dl_allocate_tls_storage ()
-				: allocate_dtv (mem));
-}
-rtld_hidden_def (_dl_allocate_tls)
-
-
-void
-internal_function
-_dl_deallocate_tls (void *tcb, bool dealloc_tcb)
-{
-  dtv_t *dtv = GET_DTV (tcb);
-
-  /* We need to free the memory allocated for non-static TLS.  */
-  for (size_t cnt = 0; cnt < dtv[-1].counter; ++cnt)
-    if (! dtv[1 + cnt].pointer.is_static
-	&& dtv[1 + cnt].pointer.val != TLS_DTV_UNALLOCATED)
-      free (dtv[1 + cnt].pointer.val);
-
-  /* The array starts with dtv[-1].  */
-#ifdef SHARED
-  if (dtv != GL(dl_initial_dtv))
-#endif
-    free (dtv - 1);
-
-  if (dealloc_tcb)
-    {
-# if TLS_TCB_AT_TP
-      /* The TCB follows the TLS blocks.  Back up to free the whole block.  */
-      tcb -= GL(dl_tls_static_size) - TLS_TCB_SIZE;
-# elif TLS_DTV_AT_TP
-      /* Back up the TLS_PRE_TCB_SIZE bytes.  */
-      tcb -= (TLS_PRE_TCB_SIZE + GL(dl_tls_static_align) - 1)
-	     & ~(GL(dl_tls_static_align) - 1);
-# endif
-      free (tcb);
-    }
-}
-rtld_hidden_def (_dl_deallocate_tls)
-
-
-# ifdef SHARED
-/* The __tls_get_addr function has two basic forms which differ in the
-   arguments.  The IA-64 form takes two parameters, the module ID and
-   offset.  The form used, among others, on IA-32 takes a reference to
-   a special structure which contain the same information.  The second
-   form seems to be more often used (in the moment) so we default to
-   it.  Users of the IA-64 form have to provide adequate definitions
-   of the following macros.  */
-#  ifndef GET_ADDR_ARGS
-#   define GET_ADDR_ARGS tls_index *ti
-#  endif
-#  ifndef GET_ADDR_MODULE
-#   define GET_ADDR_MODULE ti->ti_module
-#  endif
-#  ifndef GET_ADDR_OFFSET
-#   define GET_ADDR_OFFSET ti->ti_offset
-#  endif
-
-
-static void *
-allocate_and_init (struct link_map *map)
-{
-  void *newp;
-
-  newp = __libc_memalign (map->l_tls_align, map->l_tls_blocksize);
-  if (newp == NULL)
-    oom ();
-
-  /* Initialize the memory.  */
-  memset (__mempcpy (newp, map->l_tls_initimage, map->l_tls_initimage_size),
-	  '\0', map->l_tls_blocksize - map->l_tls_initimage_size);
-
-  return newp;
-}
-
-
-struct link_map *
-_dl_update_slotinfo (unsigned long int req_modid)
-{
-  struct link_map *the_map = NULL;
-  dtv_t *dtv = THREAD_DTV ();
-
-  /* The global dl_tls_dtv_slotinfo array contains for each module
-     index the generation counter current when the entry was created.
-     This array never shrinks so that all module indices which were
-     valid at some time can be used to access it.  Before the first
-     use of a new module index in this function the array was extended
-     appropriately.  Access also does not have to be guarded against
-     modifications of the array.  It is assumed that pointer-size
-     values can be read atomically even in SMP environments.  It is
-     possible that other threads at the same time dynamically load
-     code and therefore add to the slotinfo list.  This is a problem
-     since we must not pick up any information about incomplete work.
-     The solution to this is to ignore all dtv slots which were
-     created after the one we are currently interested.  We know that
-     dynamic loading for this module is completed and this is the last
-     load operation we know finished.  */
-  unsigned long int idx = req_modid;
-  struct dtv_slotinfo_list *listp = GL(dl_tls_dtv_slotinfo_list);
-
-  while (idx >= listp->len)
-    {
-      idx -= listp->len;
-      listp = listp->next;
-    }
-
-  if (dtv[0].counter < listp->slotinfo[idx].gen)
-    {
-      /* The generation counter for the slot is higher than what the
-	 current dtv implements.  We have to update the whole dtv but
-	 only those entries with a generation counter <= the one for
-	 the entry we need.  */
-      size_t new_gen = listp->slotinfo[idx].gen;
-      size_t total = 0;
-
-      /* We have to look through the entire dtv slotinfo list.  */
-      listp =  GL(dl_tls_dtv_slotinfo_list);
-      do
-	{
-	  for (size_t cnt = total == 0 ? 1 : 0; cnt < listp->len; ++cnt)
-	    {
-	      size_t gen = listp->slotinfo[cnt].gen;
-
-	      if (gen > new_gen)
-		/* This is a slot for a generation younger than the
-		   one we are handling now.  It might be incompletely
-		   set up so ignore it.  */
-		continue;
-
-	      /* If the entry is older than the current dtv layout we
-		 know we don't have to handle it.  */
-	      if (gen <= dtv[0].counter)
-		continue;
-
-	      /* If there is no map this means the entry is empty.  */
-	      struct link_map *map = listp->slotinfo[cnt].map;
-	      if (map == NULL)
-		{
-		  /* If this modid was used at some point the memory
-		     might still be allocated.  */
-		  if (! dtv[total + cnt].pointer.is_static
-		      && dtv[total + cnt].pointer.val != TLS_DTV_UNALLOCATED)
-		    {
-		      free (dtv[total + cnt].pointer.val);
-		      dtv[total + cnt].pointer.val = TLS_DTV_UNALLOCATED;
-		    }
-
-		  continue;
-		}
-
-	      /* Check whether the current dtv array is large enough.  */
-	      size_t modid = map->l_tls_modid;
-	      assert (total + cnt == modid);
-	      if (dtv[-1].counter < modid)
-		{
-		  /* Reallocate the dtv.  */
-		  dtv_t *newp;
-		  size_t newsize = GL(dl_tls_max_dtv_idx) + DTV_SURPLUS;
-		  size_t oldsize = dtv[-1].counter;
-
-		  assert (map->l_tls_modid <= newsize);
-
-		  if (dtv == GL(dl_initial_dtv))
-		    {
-		      /* This is the initial dtv that was allocated
-			 during rtld startup using the dl-minimal.c
-			 malloc instead of the real malloc.  We can't
-			 free it, we have to abandon the old storage.  */
-
-		      newp = malloc ((2 + newsize) * sizeof (dtv_t));
-		      if (newp == NULL)
-			oom ();
-		      memcpy (newp, &dtv[-1], oldsize * sizeof (dtv_t));
-		    }
-		  else
-		    {
-		      newp = realloc (&dtv[-1],
-				      (2 + newsize) * sizeof (dtv_t));
-		      if (newp == NULL)
-			oom ();
-		    }
-
-		  newp[0].counter = newsize;
-
-		  /* Clear the newly allocated part.  */
-		  memset (newp + 2 + oldsize, '\0',
-			  (newsize - oldsize) * sizeof (dtv_t));
-
-		  /* Point dtv to the generation counter.  */
-		  dtv = &newp[1];
-
-		  /* Install this new dtv in the thread data
-		     structures.  */
-		  INSTALL_NEW_DTV (dtv);
-		}
-
-	      /* If there is currently memory allocate for this
-		 dtv entry free it.  */
-	      /* XXX Ideally we will at some point create a memory
-		 pool.  */
-	      if (! dtv[modid].pointer.is_static
-		  && dtv[modid].pointer.val != TLS_DTV_UNALLOCATED)
-		/* Note that free is called for NULL is well.  We
-		   deallocate even if it is this dtv entry we are
-		   supposed to load.  The reason is that we call
-		   memalign and not malloc.  */
-		free (dtv[modid].pointer.val);
-
-	      /* This module is loaded dynamically- We defer memory
-		 allocation.  */
-	      dtv[modid].pointer.is_static = false;
-	      dtv[modid].pointer.val = TLS_DTV_UNALLOCATED;
-
-	      if (modid == req_modid)
-		the_map = map;
-	    }
-
-	  total += listp->len;
-	}
-      while ((listp = listp->next) != NULL);
-
-      /* This will be the new maximum generation counter.  */
-      dtv[0].counter = new_gen;
-    }
-
-  return the_map;
-}
-
-
-/* The generic dynamic and local dynamic model cannot be used in
-   statically linked applications.  */
-void *
-__tls_get_addr (GET_ADDR_ARGS)
-{
-  dtv_t *dtv = THREAD_DTV ();
-  struct link_map *the_map = NULL;
-  void *p;
-
-  if (__builtin_expect (dtv[0].counter != GL(dl_tls_generation), 0))
-    the_map = _dl_update_slotinfo (GET_ADDR_MODULE);
-
-  p = dtv[GET_ADDR_MODULE].pointer.val;
-
-  if (__builtin_expect (p == TLS_DTV_UNALLOCATED, 0))
-    {
-      /* The allocation was deferred.  Do it now.  */
-      if (the_map == NULL)
-	{
-	  /* Find the link map for this module.  */
-	  size_t idx = GET_ADDR_MODULE;
-	  struct dtv_slotinfo_list *listp = GL(dl_tls_dtv_slotinfo_list);
-
-	  while (idx >= listp->len)
-	    {
-	      idx -= listp->len;
-	      listp = listp->next;
-	    }
-
-	  the_map = listp->slotinfo[idx].map;
-	}
-
-      p = dtv[GET_ADDR_MODULE].pointer.val = allocate_and_init (the_map);
-      dtv[GET_ADDR_MODULE].pointer.is_static = false;
-    }
-
-  return (char *) p + GET_ADDR_OFFSET;
-}
-# endif
-
-
-
-void
-_dl_add_to_slotinfo (struct link_map  *l)
-{
-  /* Now that we know the object is loaded successfully add
-     modules containing TLS data to the dtv info table.  We
-     might have to increase its size.  */
-  struct dtv_slotinfo_list *listp;
-  struct dtv_slotinfo_list *prevp;
-  size_t idx = l->l_tls_modid;
-
-  /* Find the place in the dtv slotinfo list.  */
-  listp = GL(dl_tls_dtv_slotinfo_list);
-  prevp = NULL;		/* Needed to shut up gcc.  */
-  do
-    {
-      /* Does it fit in the array of this list element?  */
-      if (idx < listp->len)
-	break;
-      idx -= listp->len;
-      prevp = listp;
-      listp = listp->next;
-    }
-  while (listp != NULL);
-
-  if (listp == NULL)
-    {
-      /* When we come here it means we have to add a new element
-	 to the slotinfo list.  And the new module must be in
-	 the first slot.  */
-      assert (idx == 0);
-
-      listp = prevp->next = (struct dtv_slotinfo_list *)
-	malloc (sizeof (struct dtv_slotinfo_list)
-		+ TLS_SLOTINFO_SURPLUS * sizeof (struct dtv_slotinfo));
-      if (listp == NULL)
-	{
-	  /* We ran out of memory.  We will simply fail this
-	     call but don't undo anything we did so far.  The
-	     application will crash or be terminated anyway very
-	     soon.  */
-
-	  /* We have to do this since some entries in the dtv
-	     slotinfo array might already point to this
-	     generation.  */
-	  ++GL(dl_tls_generation);
-
-	  _dl_signal_error (ENOMEM, "dlopen", NULL, N_("\
-cannot create TLS data structures"));
-	}
-
-      listp->len = TLS_SLOTINFO_SURPLUS;
-      listp->next = NULL;
-      memset (listp->slotinfo, '\0',
-	      TLS_SLOTINFO_SURPLUS * sizeof (struct dtv_slotinfo));
-    }
-
-  /* Add the information into the slotinfo data structure.  */
-  listp->slotinfo[idx].map = l;
-  listp->slotinfo[idx].gen = GL(dl_tls_generation) + 1;
-}
-#endif	/* use TLS */
diff --git a/sysdeps/generic/dl-trampoline.c b/sysdeps/generic/dl-trampoline.c
deleted file mode 100644
index 3ca89f3879..0000000000
--- a/sysdeps/generic/dl-trampoline.c
+++ /dev/null
@@ -1 +0,0 @@
-#error "Architecture specific PLT trampolines must be defined."
diff --git a/sysdeps/generic/dup.c b/sysdeps/generic/dup.c
deleted file mode 100644
index 5d5e1b4cd5..0000000000
--- a/sysdeps/generic/dup.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-/* Duplicate FD, returning a new file descriptor open on the same file.  */
-int
-__dup (fd)
-     int fd;
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-stub_warning (dup)
-
-weak_alias (__dup, dup)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/dup2.c b/sysdeps/generic/dup2.c
deleted file mode 100644
index 2b897896f6..0000000000
--- a/sysdeps/generic/dup2.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-
-/* Duplicate FD to FD2, closing the old FD2 and making FD2 be
-   open the same file as FD is.  Return FD2 or -1.  */
-int
-__dup2 (fd, fd2)
-     int fd;
-     int fd2;
-{
-  if (fd < 0 || fd2 < 0)
-    {
-      __set_errno (EBADF);
-      return -1;
-    }
-
-  if (fd == fd2)
-    /* No way to check that they are valid.  */
-    return fd2;
-
-  __set_errno (ENOSYS);
-  return -1;
-}
-libc_hidden_def (__dup2)
-stub_warning (dup2)
-
-weak_alias (__dup2, dup2)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_acoshl.c b/sysdeps/generic/e_acoshl.c
deleted file mode 100644
index 2c2fbe8eb4..0000000000
--- a/sysdeps/generic/e_acoshl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_acoshl (long double x)
-{
-  fputs ("__ieee754_acoshl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (acoshl)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_acosl.c b/sysdeps/generic/e_acosl.c
deleted file mode 100644
index d844d885b8..0000000000
--- a/sysdeps/generic/e_acosl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_acosl (long double x)
-{
-  fputs ("__ieee754_acosl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (acosl)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_asinl.c b/sysdeps/generic/e_asinl.c
deleted file mode 100644
index 3b26f030ef..0000000000
--- a/sysdeps/generic/e_asinl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_asinl (long double x)
-{
-  fputs ("__ieee754_asinl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (asinl)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_atan2l.c b/sysdeps/generic/e_atan2l.c
deleted file mode 100644
index 0caed8a32f..0000000000
--- a/sysdeps/generic/e_atan2l.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_atan2l (long double x, long double y)
-{
-  fputs ("__ieee754_atan2l not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (atan2l)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_atanhl.c b/sysdeps/generic/e_atanhl.c
deleted file mode 100644
index 625d42db31..0000000000
--- a/sysdeps/generic/e_atanhl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_atanhl (long double x)
-{
-  fputs ("__ieee754_atanhl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (__ieee754_atanhl)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_coshl.c b/sysdeps/generic/e_coshl.c
deleted file mode 100644
index 0da319b785..0000000000
--- a/sysdeps/generic/e_coshl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_coshl (long double x)
-{
-  fputs ("__ieee754_coshl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (__ieee754_coshl)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_exp10.c b/sysdeps/generic/e_exp10.c
deleted file mode 100644
index a3eccbb9e6..0000000000
--- a/sysdeps/generic/e_exp10.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <math.h>
-#include "math_private.h"
-
-
-double
-__ieee754_exp10 (double arg)
-{
-  /* This is a very stupid and inprecise implementation.  It'll get
-     replaced sometime (soon?).  */
-  return __ieee754_exp (M_LN10 * arg);
-}
diff --git a/sysdeps/generic/e_exp10f.c b/sysdeps/generic/e_exp10f.c
deleted file mode 100644
index 7d06d074b8..0000000000
--- a/sysdeps/generic/e_exp10f.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <math.h>
-#include "math_private.h"
-
-
-float
-__ieee754_exp10f (float arg)
-{
-  /* This is a very stupid and inprecise implementation.  It'll get
-     replaced sometime (soon?).  */
-  return __ieee754_expf (M_LN10 * arg);
-}
diff --git a/sysdeps/generic/e_exp10l.c b/sysdeps/generic/e_exp10l.c
deleted file mode 100644
index 56f0cfec2f..0000000000
--- a/sysdeps/generic/e_exp10l.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <math.h>
-#include "math_private.h"
-
-
-long double
-__ieee754_exp10l (long double arg)
-{
-  /* This is a very stupid and inprecise implementation.  It'll get
-     replaced sometime (soon?).  */
-  return __ieee754_expl (M_LN10l * arg);
-}
diff --git a/sysdeps/generic/e_exp2l.c b/sysdeps/generic/e_exp2l.c
deleted file mode 100644
index 64ef6d3d50..0000000000
--- a/sysdeps/generic/e_exp2l.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_exp2l (long double x)
-{
-  fputs ("__ieee754_exp2l not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (exp2l)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_expl.c b/sysdeps/generic/e_expl.c
deleted file mode 100644
index f9467c38ab..0000000000
--- a/sysdeps/generic/e_expl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_expl (long double x)
-{
-  fputs ("__ieee754_expl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (expl)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_fmodl.c b/sysdeps/generic/e_fmodl.c
deleted file mode 100644
index 380da24e41..0000000000
--- a/sysdeps/generic/e_fmodl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_fmodl (long double x, long double y)
-{
-  fputs ("__ieee754_fmodl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (fmodl)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_gammal_r.c b/sysdeps/generic/e_gammal_r.c
deleted file mode 100644
index 1c45c8421b..0000000000
--- a/sysdeps/generic/e_gammal_r.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_gammal_r (long double x, int *signgamp)
-{
-  *signgamp = 0;
-  fputs ("__ieee754_gammal_r not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (__ieee754_gammal_r)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_hypotl.c b/sysdeps/generic/e_hypotl.c
deleted file mode 100644
index 07df22eb36..0000000000
--- a/sysdeps/generic/e_hypotl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_hypotl (long double x, long double y)
-{
-  fputs ("__ieee754_hypotl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (__ieee754_hypotl)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_j0l.c b/sysdeps/generic/e_j0l.c
deleted file mode 100644
index 1bf0a1de73..0000000000
--- a/sysdeps/generic/e_j0l.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-#include "math_private.h"
-
-long double
-__ieee754_j0l (long double x)
-{
-  fputs ("__ieee754_j0l not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (j0l)
-
-long double
-__ieee754_y0l (long double x)
-{
-  fputs ("__ieee754_y0l not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (y0l)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_j1l.c b/sysdeps/generic/e_j1l.c
deleted file mode 100644
index 656abeba57..0000000000
--- a/sysdeps/generic/e_j1l.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-#include "math_private.h"
-
-long double
-__ieee754_j1l (long double x)
-{
-  fputs ("__ieee754_j1l not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (j1l)
-
-long double
-__ieee754_y1l (long double x)
-{
-  fputs ("__ieee754_y1l not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (y1l)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_jnl.c b/sysdeps/generic/e_jnl.c
deleted file mode 100644
index 1bfc0695a5..0000000000
--- a/sysdeps/generic/e_jnl.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-#include "math_private.h"
-
-long double
-__ieee754_jnl (int n, long double x)
-{
-  fputs ("__ieee754_jnl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (jnl)
-
-long double
-__ieee754_ynl (int n, long double x)
-{
-  fputs ("__ieee754_ynl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (ynl)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_lgammal_r.c b/sysdeps/generic/e_lgammal_r.c
deleted file mode 100644
index 1784b2663f..0000000000
--- a/sysdeps/generic/e_lgammal_r.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-#include "math_private.h"
-
-long double
-__ieee754_lgammal_r (long double x, int *signgamp)
-{
-  *signgamp = 0;
-  fputs ("__ieee754_lgammal_r not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (lgammal)
-stub_warning (lgammal_r)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/e_log10l.c b/sysdeps/generic/e_log10l.c
deleted file mode 100644
index 5bc264b32c..0000000000
--- a/sysdeps/generic/e_log10l.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__ieee754_log10l (long double x)
-{
-  fputs ("__ieee754_log10l not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-stub_warning (log10l)
-#include <stub-tag.h>
diff --git a/sysdeps/generic/errno-loc.c b/sysdeps/generic/errno-loc.c
deleted file mode 100644
index 633590f4f9..0000000000
--- a/sysdeps/generic/errno-loc.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* MT support function to get address of `errno' variable, non-threaded
-   version.
-   Copyright (C) 1996, 1998, 2002, 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <tls.h>
-
-#if ! USE___THREAD && !RTLD_PRIVATE_ERRNO
-#undef errno
-extern int errno;
-#endif
-
-int *
-#if ! USE___THREAD
-weak_const_function
-#endif
-__errno_location (void)
-{
-  return &errno;
-}
-libc_hidden_def (__errno_location)
diff --git a/sysdeps/generic/lio_listio64.c b/sysdeps/generic/lio_listio64.c
deleted file mode 100644
index 2e72c46b0b..0000000000
--- a/sysdeps/generic/lio_listio64.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define BE_AIO64
-#include "lio_listio.c"
diff --git a/sysdeps/generic/msgctl.c b/sysvipc/msgctl.c
index e4451ed368..e4451ed368 100644
--- a/sysdeps/generic/msgctl.c
+++ b/sysvipc/msgctl.c
diff --git a/sysdeps/generic/msgget.c b/sysvipc/msgget.c
index 75f8f1bc7f..75f8f1bc7f 100644
--- a/sysdeps/generic/msgget.c
+++ b/sysvipc/msgget.c
diff --git a/sysdeps/generic/msgrcv.c b/sysvipc/msgrcv.c
index f366fa8170..f366fa8170 100644
--- a/sysdeps/generic/msgrcv.c
+++ b/sysvipc/msgrcv.c
diff --git a/sysdeps/generic/msgsnd.c b/sysvipc/msgsnd.c
index fb4ca1aa56..fb4ca1aa56 100644
--- a/sysdeps/generic/msgsnd.c
+++ b/sysvipc/msgsnd.c
diff --git a/sysdeps/generic/semctl.c b/sysvipc/semctl.c
index 28a8f37387..28a8f37387 100644
--- a/sysdeps/generic/semctl.c
+++ b/sysvipc/semctl.c
diff --git a/sysdeps/generic/semget.c b/sysvipc/semget.c
index a9db299000..a9db299000 100644
--- a/sysdeps/generic/semget.c
+++ b/sysvipc/semget.c
diff --git a/sysdeps/generic/semop.c b/sysvipc/semop.c
index 6ebcb98ba9..6ebcb98ba9 100644
--- a/sysdeps/generic/semop.c
+++ b/sysvipc/semop.c
diff --git a/sysdeps/generic/semtimedop.c b/sysvipc/semtimedop.c
index 82c5682655..82c5682655 100644
--- a/sysdeps/generic/semtimedop.c
+++ b/sysvipc/semtimedop.c
diff --git a/sysdeps/generic/shmat.c b/sysvipc/shmat.c
index f418f3e774..f418f3e774 100644
--- a/sysdeps/generic/shmat.c
+++ b/sysvipc/shmat.c
diff --git a/sysdeps/generic/shmctl.c b/sysvipc/shmctl.c
index 83374e4b92..83374e4b92 100644
--- a/sysdeps/generic/shmctl.c
+++ b/sysvipc/shmctl.c
diff --git a/sysdeps/generic/shmdt.c b/sysvipc/shmdt.c
index e77f39daac..e77f39daac 100644
--- a/sysdeps/generic/shmdt.c
+++ b/sysvipc/shmdt.c
diff --git a/sysdeps/generic/shmget.c b/sysvipc/shmget.c
index 7426de656d..7426de656d 100644
--- a/sysdeps/generic/shmget.c
+++ b/sysvipc/shmget.c
diff --git a/sysdeps/generic/speed.c b/termios/speed.c
index b4acd62230..b4acd62230 100644
--- a/sysdeps/generic/speed.c
+++ b/termios/speed.c
diff --git a/sysdeps/generic/tcdrain.c b/termios/tcdrain.c
index d28ddbf006..d28ddbf006 100644
--- a/sysdeps/generic/tcdrain.c
+++ b/termios/tcdrain.c
diff --git a/sysdeps/generic/tcflow.c b/termios/tcflow.c
index f4db981f28..f4db981f28 100644
--- a/sysdeps/generic/tcflow.c
+++ b/termios/tcflow.c
diff --git a/sysdeps/generic/tcflush.c b/termios/tcflush.c
index c95f78e4ae..c95f78e4ae 100644
--- a/sysdeps/generic/tcflush.c
+++ b/termios/tcflush.c
diff --git a/sysdeps/generic/tcgetattr.c b/termios/tcgetattr.c
index 6751e88b83..6751e88b83 100644
--- a/sysdeps/generic/tcgetattr.c
+++ b/termios/tcgetattr.c
diff --git a/sysdeps/generic/tcgetpgrp.c b/termios/tcgetpgrp.c
index 2a1d846e75..2a1d846e75 100644
--- a/sysdeps/generic/tcgetpgrp.c
+++ b/termios/tcgetpgrp.c
diff --git a/sysdeps/generic/tcsendbrk.c b/termios/tcsendbrk.c
index 4f40cfb153..4f40cfb153 100644
--- a/sysdeps/generic/tcsendbrk.c
+++ b/termios/tcsendbrk.c
diff --git a/sysdeps/generic/tcsetattr.c b/termios/tcsetattr.c
index 205838c87b..205838c87b 100644
--- a/sysdeps/generic/tcsetattr.c
+++ b/termios/tcsetattr.c
diff --git a/sysdeps/generic/tcsetpgrp.c b/termios/tcsetpgrp.c
index 59f58e59aa..59f58e59aa 100644
--- a/sysdeps/generic/tcsetpgrp.c
+++ b/termios/tcsetpgrp.c
diff --git a/sysdeps/generic/ftime.c b/time/ftime.c
index 94dfbcc98b..94dfbcc98b 100644
--- a/sysdeps/generic/ftime.c
+++ b/time/ftime.c
diff --git a/sysdeps/generic/getitimer.c b/time/getitimer.c
index d9f3063e1e..d9f3063e1e 100644
--- a/sysdeps/generic/getitimer.c
+++ b/time/getitimer.c
diff --git a/sysdeps/generic/gettimeofday.c b/time/gettimeofday.c
index f4a170c9e7..f4a170c9e7 100644
--- a/sysdeps/generic/gettimeofday.c
+++ b/time/gettimeofday.c
diff --git a/sysdeps/generic/setitimer.c b/time/setitimer.c
index 755fa06a7b..755fa06a7b 100644
--- a/sysdeps/generic/setitimer.c
+++ b/time/setitimer.c
diff --git a/sysdeps/generic/settimeofday.c b/time/settimeofday.c
index abff6f92a1..abff6f92a1 100644
--- a/sysdeps/generic/settimeofday.c
+++ b/time/settimeofday.c
diff --git a/sysdeps/generic/stime.c b/time/stime.c
index 5ed1b040e2..5ed1b040e2 100644
--- a/sysdeps/generic/stime.c
+++ b/time/stime.c
diff --git a/sysdeps/generic/time.c b/time/time.c
index ec66f119df..ec66f119df 100644
--- a/sysdeps/generic/time.c
+++ b/time/time.c
diff --git a/sysdeps/generic/wcstol.c b/wcsmbs/wcstol.c
index b121d13876..b238d04b19 100644
--- a/sysdeps/generic/wcstol.c
+++ b/wcsmbs/wcstol.c
@@ -1,5 +1,5 @@
 /* Function to parse a `long int' from text.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
@@ -20,4 +20,4 @@
 
 #define	USE_WIDE_CHAR	1
 
-#include <sysdeps/generic/strtol.c>
+#include <stdlib/strtol.c>
diff --git a/sysdeps/generic/wcstol_l.c b/wcsmbs/wcstol_l.c
index f1b4171f18..3d3bf76ea6 100644
--- a/sysdeps/generic/wcstol_l.c
+++ b/wcsmbs/wcstol_l.c
@@ -1,5 +1,5 @@
 /* Convert string representing a number to integer value, using given locale.
-   Copyright (C) 1997, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2002, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -27,4 +27,4 @@
 extern long int ____wcstol_l_internal (const wchar_t *, wchar_t **, int, int,
 				       __locale_t);
 
-#include "strtol_l.c"
+#include <stdlib/strtol_l.c>
diff --git a/sysdeps/generic/wcstoll.c b/wcsmbs/wcstoll.c
index b666762da4..b666762da4 100644
--- a/sysdeps/generic/wcstoll.c
+++ b/wcsmbs/wcstoll.c
diff --git a/sysdeps/generic/wcstoll_l.c b/wcsmbs/wcstoll_l.c
index f1a4ca1623..f1a4ca1623 100644
--- a/sysdeps/generic/wcstoll_l.c
+++ b/wcsmbs/wcstoll_l.c
diff --git a/sysdeps/generic/wcstoul.c b/wcsmbs/wcstoul.c
index f25f7a9bff..f25f7a9bff 100644
--- a/sysdeps/generic/wcstoul.c
+++ b/wcsmbs/wcstoul.c
diff --git a/sysdeps/generic/wcstoul_l.c b/wcsmbs/wcstoul_l.c
index 25058de817..25058de817 100644
--- a/sysdeps/generic/wcstoul_l.c
+++ b/wcsmbs/wcstoul_l.c
diff --git a/sysdeps/generic/wcstoull.c b/wcsmbs/wcstoull.c
index a69a103515..a69a103515 100644
--- a/sysdeps/generic/wcstoull.c
+++ b/wcsmbs/wcstoull.c
diff --git a/sysdeps/generic/wcstoull_l.c b/wcsmbs/wcstoull_l.c
index 32bc3c4bb9..32bc3c4bb9 100644
--- a/sysdeps/generic/wcstoull_l.c
+++ b/wcsmbs/wcstoull_l.c