Merge changes between r17050 and r17194 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@17195 7b3dc134-2b1b-0410-93df-9e9f96275f8d

63 files changed, 157 insertions, 203 deletions

diff --git a/libc/rt/Makefile b/libc/rt/Makefile
index 392d06740..a355f71a2 100644
--- a/libc/rt/Makefile
+++ b/libc/rt/Makefile
@@ -12,9 +12,8 @@
 # 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.
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
 
 #
 #	Sub-makefile for real-time portion of the library.
diff --git a/libc/rt/aio.h b/libc/rt/aio.h
index 644bbe93d..898a1e2db 100644
--- a/libc/rt/aio.h
+++ b/libc/rt/aio.h
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 /*
  * ISO/IEC 9945-1:1996 6.7: Asynchronous Input and Output
diff --git a/libc/rt/aio_cancel.c b/libc/rt/aio_cancel.c
index c24a2f752..e6af7afa6 100644
--- a/libc/rt/aio_cancel.c
+++ b/libc/rt/aio_cancel.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 
 /* We use an UGLY hack to prevent gcc from finding us cheating.  The
diff --git a/libc/rt/aio_error.c b/libc/rt/aio_error.c
index 772d49be2..268dbdd1f 100644
--- a/libc/rt/aio_error.c
+++ b/libc/rt/aio_error.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 
 /* We use an UGLY hack to prevent gcc from finding us cheating.  The
diff --git a/libc/rt/aio_fsync.c b/libc/rt/aio_fsync.c
index bc23d75f6..3893e0757 100644
--- a/libc/rt/aio_fsync.c
+++ b/libc/rt/aio_fsync.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 
 /* We use an UGLY hack to prevent gcc from finding us cheating.  The
diff --git a/libc/rt/aio_misc.c b/libc/rt/aio_misc.c
index c29b8d0ea..46b30b622 100644
--- a/libc/rt/aio_misc.c
+++ b/libc/rt/aio_misc.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <aio_misc.h>
diff --git a/libc/rt/aio_notify.c b/libc/rt/aio_notify.c
index 2c79ee6c2..9f2b46e81 100644
--- a/libc/rt/aio_notify.c
+++ b/libc/rt/aio_notify.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <aio_misc.h>
diff --git a/libc/rt/aio_read.c b/libc/rt/aio_read.c
index db1d19f3d..213a43ce9 100644
--- a/libc/rt/aio_read.c
+++ b/libc/rt/aio_read.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <errno.h>
diff --git a/libc/rt/aio_return.c b/libc/rt/aio_return.c
index 91da28c4c..a43c19508 100644
--- a/libc/rt/aio_return.c
+++ b/libc/rt/aio_return.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 
 /* We use an UGLY hack to prevent gcc from finding us cheating.  The
diff --git a/libc/rt/aio_sigqueue.c b/libc/rt/aio_sigqueue.c
index 0e3ba1f90..c3d7adb82 100644
--- a/libc/rt/aio_sigqueue.c
+++ b/libc/rt/aio_sigqueue.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <errno.h>
diff --git a/libc/rt/aio_suspend.c b/libc/rt/aio_suspend.c
index 0530f0019..ce882fb82 100644
--- a/libc/rt/aio_suspend.c
+++ b/libc/rt/aio_suspend.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 
 /* We use an UGLY hack to prevent gcc from finding us cheating.  The
diff --git a/libc/rt/aio_write.c b/libc/rt/aio_write.c
index bc62fcb46..398e9dbd5 100644
--- a/libc/rt/aio_write.c
+++ b/libc/rt/aio_write.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <errno.h>
diff --git a/libc/rt/bits/mqueue2.h b/libc/rt/bits/mqueue2.h
index aa9f126aa..87365304c 100644
--- a/libc/rt/bits/mqueue2.h
+++ b/libc/rt/bits/mqueue2.h
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef	_FCNTL_H
 # error "Never include <bits/mqueue2.h> directly; use <mqueue.h> instead."
diff --git a/libc/rt/clock_getcpuclockid.c b/libc/rt/clock_getcpuclockid.c
index 39c7e55f6..08972f54f 100644
--- a/libc/rt/clock_getcpuclockid.c
+++ b/libc/rt/clock_getcpuclockid.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <time.h>
diff --git a/libc/rt/clock_getres.c b/libc/rt/clock_getres.c
index f5978da38..576c9bf73 100644
--- a/libc/rt/clock_getres.c
+++ b/libc/rt/clock_getres.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <time.h>
diff --git a/libc/rt/clock_gettime.c b/libc/rt/clock_gettime.c
index ff306120b..1203f0117 100644
--- a/libc/rt/clock_gettime.c
+++ b/libc/rt/clock_gettime.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <time.h>
diff --git a/libc/rt/clock_nanosleep.c b/libc/rt/clock_nanosleep.c
index cff1c2570..954a61501 100644
--- a/libc/rt/clock_nanosleep.c
+++ b/libc/rt/clock_nanosleep.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/time.h>
diff --git a/libc/rt/clock_settime.c b/libc/rt/clock_settime.c
index 9d6a92e05..3b3c3c48d 100644
--- a/libc/rt/clock_settime.c
+++ b/libc/rt/clock_settime.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <time.h>
diff --git a/libc/rt/get_clockfreq.c b/libc/rt/get_clockfreq.c
index 14375ec18..e626e26ce 100644
--- a/libc/rt/get_clockfreq.c
+++ b/libc/rt/get_clockfreq.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <libc-internal.h>
 
diff --git a/libc/rt/lio_listio.c b/libc/rt/lio_listio.c
index d53559449..867a20eca 100644
--- a/libc/rt/lio_listio.c
+++ b/libc/rt/lio_listio.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <errno.h>
diff --git a/libc/rt/mq_close.c b/libc/rt/mq_close.c
index 8237a6438..9c5f9bfd6 100644
--- a/libc/rt/mq_close.c
+++ b/libc/rt/mq_close.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/mq_getattr.c b/libc/rt/mq_getattr.c
index 2d24b85d4..3c35fdd6d 100644
--- a/libc/rt/mq_getattr.c
+++ b/libc/rt/mq_getattr.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/mq_notify.c b/libc/rt/mq_notify.c
index 29de75a47..7b89a6543 100644
--- a/libc/rt/mq_notify.c
+++ b/libc/rt/mq_notify.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/mq_open.c b/libc/rt/mq_open.c
index 77d872ea2..d7986fbc0 100644
--- a/libc/rt/mq_open.c
+++ b/libc/rt/mq_open.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/mq_receive.c b/libc/rt/mq_receive.c
index 527fd7596..c72802f36 100644
--- a/libc/rt/mq_receive.c
+++ b/libc/rt/mq_receive.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/mq_send.c b/libc/rt/mq_send.c
index 8b7cd87f7..748ee4162 100644
--- a/libc/rt/mq_send.c
+++ b/libc/rt/mq_send.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/mq_setattr.c b/libc/rt/mq_setattr.c
index 57ee0759a..58a1e34aa 100644
--- a/libc/rt/mq_setattr.c
+++ b/libc/rt/mq_setattr.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/mq_timedreceive.c b/libc/rt/mq_timedreceive.c
index e4723f812..6c3188a06 100644
--- a/libc/rt/mq_timedreceive.c
+++ b/libc/rt/mq_timedreceive.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/mq_timedsend.c b/libc/rt/mq_timedsend.c
index 5ccfe23b0..a3590c35f 100644
--- a/libc/rt/mq_timedsend.c
+++ b/libc/rt/mq_timedsend.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/mq_unlink.c b/libc/rt/mq_unlink.c
index e947b84f3..f9f973368 100644
--- a/libc/rt/mq_unlink.c
+++ b/libc/rt/mq_unlink.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/mqueue.h b/libc/rt/mqueue.h
index ffdf14011..b80d7491b 100644
--- a/libc/rt/mqueue.h
+++ b/libc/rt/mqueue.h
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifndef _MQUEUE_H
 #define _MQUEUE_H	1
diff --git a/libc/rt/shm_open.c b/libc/rt/shm_open.c
index 6a53903a7..03a67e8ca 100644
--- a/libc/rt/shm_open.c
+++ b/libc/rt/shm_open.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/mman.h>
diff --git a/libc/rt/shm_unlink.c b/libc/rt/shm_unlink.c
index 28478b895..418357776 100644
--- a/libc/rt/shm_unlink.c
+++ b/libc/rt/shm_unlink.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/mman.h>
diff --git a/libc/rt/timer_create.c b/libc/rt/timer_create.c
index 0e3a6b0ac..d595d6e3f 100644
--- a/libc/rt/timer_create.c
+++ b/libc/rt/timer_create.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <time.h>
diff --git a/libc/rt/timer_delete.c b/libc/rt/timer_delete.c
index 4be55aa32..80fb3fc5d 100644
--- a/libc/rt/timer_delete.c
+++ b/libc/rt/timer_delete.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <time.h>
diff --git a/libc/rt/timer_getoverr.c b/libc/rt/timer_getoverr.c
index 6ca7ff8e9..1338de74d 100644
--- a/libc/rt/timer_getoverr.c
+++ b/libc/rt/timer_getoverr.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <time.h>
diff --git a/libc/rt/timer_gettime.c b/libc/rt/timer_gettime.c
index 728028ed3..051073177 100644
--- a/libc/rt/timer_gettime.c
+++ b/libc/rt/timer_gettime.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <time.h>
diff --git a/libc/rt/timer_settime.c b/libc/rt/timer_settime.c
index f494a0edd..0c5090cd5 100644
--- a/libc/rt/timer_settime.c
+++ b/libc/rt/timer_settime.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <time.h>
diff --git a/libc/rt/tst-aio.c b/libc/rt/tst-aio.c
index ba50bdb08..30b45672d 100644
--- a/libc/rt/tst-aio.c
+++ b/libc/rt/tst-aio.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <errno.h>
diff --git a/libc/rt/tst-aio2.c b/libc/rt/tst-aio2.c
index 79076396a..897d37d8b 100644
--- a/libc/rt/tst-aio2.c
+++ b/libc/rt/tst-aio2.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <signal.h>
diff --git a/libc/rt/tst-aio3.c b/libc/rt/tst-aio3.c
index 95da4c132..4d1fe8e97 100644
--- a/libc/rt/tst-aio3.c
+++ b/libc/rt/tst-aio3.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <signal.h>
diff --git a/libc/rt/tst-aio4.c b/libc/rt/tst-aio4.c
index 847974d50..4c7465a91 100644
--- a/libc/rt/tst-aio4.c
+++ b/libc/rt/tst-aio4.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <signal.h>
diff --git a/libc/rt/tst-aio5.c b/libc/rt/tst-aio5.c
index cc7152ecb..283cf2748 100644
--- a/libc/rt/tst-aio5.c
+++ b/libc/rt/tst-aio5.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <signal.h>
diff --git a/libc/rt/tst-aio6.c b/libc/rt/tst-aio6.c
index ac724b01f..cf9906418 100644
--- a/libc/rt/tst-aio6.c
+++ b/libc/rt/tst-aio6.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <errno.h>
diff --git a/libc/rt/tst-aio64.c b/libc/rt/tst-aio64.c
index b6d964fd5..4eeda5b15 100644
--- a/libc/rt/tst-aio64.c
+++ b/libc/rt/tst-aio64.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #define _LARGEFILE_SOURCE 1
 #include <aio.h>
diff --git a/libc/rt/tst-aio7.c b/libc/rt/tst-aio7.c
index 39c366f8e..327d28f1b 100644
--- a/libc/rt/tst-aio7.c
+++ b/libc/rt/tst-aio7.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <aio.h>
 #include <error.h>
diff --git a/libc/rt/tst-clock.c b/libc/rt/tst-clock.c
index f2f18874a..2023cbc6d 100644
--- a/libc/rt/tst-clock.c
+++ b/libc/rt/tst-clock.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/libc/rt/tst-clock_nanosleep.c b/libc/rt/tst-clock_nanosleep.c
index 98a8b5f57..a2d1f0085 100644
--- a/libc/rt/tst-clock_nanosleep.c
+++ b/libc/rt/tst-clock_nanosleep.c
@@ -12,9 +12,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/libc/rt/tst-cpuclock1.c b/libc/rt/tst-cpuclock1.c
index 024df6314..edc04761f 100644
--- a/libc/rt/tst-cpuclock1.c
+++ b/libc/rt/tst-cpuclock1.c
@@ -1,5 +1,5 @@
 /* Test program for process CPU clocks.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2012 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
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -131,11 +130,17 @@ do_test (void)
       result = 1;
       goto done;
     }
+  /* Should be close to 0.0.  */
   printf ("live PID %d before sleep => %lu.%.9lu\n",
 	  child, before.tv_sec, before.tv_nsec);
 
   struct timespec sleeptime = { .tv_nsec = 500000000 };
-  nanosleep (&sleeptime, NULL);
+  if (nanosleep (&sleeptime, NULL) != 0)
+    {
+      perror ("nanosleep");
+      result = 1;
+      goto done;
+    }
 
   if (clock_gettime (child_clock, &after) < 0)
     {
@@ -144,6 +149,7 @@ do_test (void)
       result = 1;
       goto done;
     }
+  /* Should be close to 0.5.  */
   printf ("live PID %d after sleep => %lu.%.9lu\n",
 	  child, after.tv_sec, after.tv_nsec);
 
@@ -214,7 +220,12 @@ do_test (void)
   /* Wait long enough to let the child finish dying.  */
 
   sleeptime.tv_nsec = 200000000;
-  nanosleep (&sleeptime, NULL);
+  if (nanosleep (&sleeptime, NULL) != 0)
+    {
+      perror ("nanosleep");
+      result = 1;
+      goto done;
+    }
 
   struct timespec dead;
   if (clock_gettime (child_clock, &dead) < 0)
@@ -224,6 +235,7 @@ do_test (void)
       result = 1;
       goto done;
     }
+  /* Should be close to 0.6.  */
   printf ("dead PID %d => %lu.%.9lu\n",
 	  child, dead.tv_sec, dead.tv_nsec);
 
diff --git a/libc/rt/tst-cpuclock2.c b/libc/rt/tst-cpuclock2.c
index d1621f3d0..e3545f2e3 100644
--- a/libc/rt/tst-cpuclock2.c
+++ b/libc/rt/tst-cpuclock2.c
@@ -1,5 +1,5 @@
 /* Test program for process and thread CPU clocks.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2012 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
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <unistd.h>
 
@@ -217,7 +216,7 @@ do_test (void)
   struct timespec res;
   if (clock_getres (th_clock, &res) < 0)
     {
-      printf ("clock_getres on thread clock %lx => %s\n",
+      printf ("clock_getres on live thread clock %lx => %s\n",
 	      (unsigned long int) th_clock, strerror (errno));
       result = 1;
       return 1;
@@ -229,7 +228,7 @@ do_test (void)
   if (clock_gettime (process_clock, &process_before) < 0)
     {
       printf ("clock_gettime on process clock %lx => %s\n",
-	      (unsigned long int) th_clock, strerror (errno));
+	      (unsigned long int) process_clock, strerror (errno));
       return 1;
     }
 
@@ -246,15 +245,19 @@ do_test (void)
   struct timespec me_before, me_after;
   if (clock_gettime (my_thread_clock, &me_before) < 0)
     {
-      printf ("clock_gettime on live thread clock %lx => %s\n",
-	      (unsigned long int) th_clock, strerror (errno));
+      printf ("clock_gettime on self thread clock %lx => %s\n",
+	      (unsigned long int) my_thread_clock, strerror (errno));
       return 1;
     }
   printf ("self thread before sleep => %lu.%.9lu\n",
 	  me_before.tv_sec, me_before.tv_nsec);
 
   struct timespec sleeptime = { .tv_nsec = 500000000 };
-  nanosleep (&sleeptime, NULL);
+  if (nanosleep (&sleeptime, NULL) != 0)
+    {
+      perror ("nanosleep");
+      return 1;
+    }
 
   if (clock_gettime (th_clock, &after) < 0)
     {
@@ -268,14 +271,14 @@ do_test (void)
   if (clock_gettime (process_clock, &process_after) < 0)
     {
       printf ("clock_gettime on process clock %lx => %s\n",
-	      (unsigned long int) th_clock, strerror (errno));
+	      (unsigned long int) process_clock, strerror (errno));
       return 1;
     }
 
   if (clock_gettime (my_thread_clock, &me_after) < 0)
     {
-      printf ("clock_gettime on live thread clock %lx => %s\n",
-	      (unsigned long int) th_clock, strerror (errno));
+      printf ("clock_gettime on self thread clock %lx => %s\n",
+	      (unsigned long int) my_thread_clock, strerror (errno));
       return 1;
     }
   printf ("self thread after sleep => %lu.%.9lu\n",
@@ -287,7 +290,7 @@ do_test (void)
 
   if (th_diff < 100000000 || th_diff > 600000000)
     {
-      printf ("thread before - after %llu outside reasonable range\n",
+      printf ("live thread before - after %llu outside reasonable range\n",
 	      th_diff);
       result = 1;
     }
@@ -306,7 +309,7 @@ do_test (void)
       result = 1;
     }
 
-  process_after.tv_nsec += test_nanosleep (th_clock, "thread",
+  process_after.tv_nsec += test_nanosleep (th_clock, "live thread",
 					   &after, &result);
   process_after.tv_nsec += test_nanosleep (process_clock, "process",
 					   &process_after, &result);
diff --git a/libc/rt/tst-mqueue.h b/libc/rt/tst-mqueue.h
index 8e73be51c..1401c3e03 100644
--- a/libc/rt/tst-mqueue.h
+++ b/libc/rt/tst-mqueue.h
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <mqueue.h>
 #include <search.h>
diff --git a/libc/rt/tst-mqueue1.c b/libc/rt/tst-mqueue1.c
index 9c5d940f9..82a62de44 100644
--- a/libc/rt/tst-mqueue1.c
+++ b/libc/rt/tst-mqueue1.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/libc/rt/tst-mqueue2.c b/libc/rt/tst-mqueue2.c
index 1948965c6..9fbaedd90 100644
--- a/libc/rt/tst-mqueue2.c
+++ b/libc/rt/tst-mqueue2.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/libc/rt/tst-mqueue3.c b/libc/rt/tst-mqueue3.c
index 990e05728..5686f43f7 100644
--- a/libc/rt/tst-mqueue3.c
+++ b/libc/rt/tst-mqueue3.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/tst-mqueue4.c b/libc/rt/tst-mqueue4.c
index aa31706f8..87ef0c3c0 100644
--- a/libc/rt/tst-mqueue4.c
+++ b/libc/rt/tst-mqueue4.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/libc/rt/tst-mqueue5.c b/libc/rt/tst-mqueue5.c
index 97571da8a..58e2ebfb4 100644
--- a/libc/rt/tst-mqueue5.c
+++ b/libc/rt/tst-mqueue5.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/libc/rt/tst-mqueue6.c b/libc/rt/tst-mqueue6.c
index 5c9ee69e1..8d84c1929 100644
--- a/libc/rt/tst-mqueue6.c
+++ b/libc/rt/tst-mqueue6.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/libc/rt/tst-mqueue7.c b/libc/rt/tst-mqueue7.c
index 34222f834..e8d53ad83 100644
--- a/libc/rt/tst-mqueue7.c
+++ b/libc/rt/tst-mqueue7.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/libc/rt/tst-mqueue8.c b/libc/rt/tst-mqueue8.c
index 7e902aa60..b80e4e5c3 100644
--- a/libc/rt/tst-mqueue8.c
+++ b/libc/rt/tst-mqueue8.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/tst-mqueue9.c b/libc/rt/tst-mqueue9.c
index fb057d4ad..7098b847e 100644
--- a/libc/rt/tst-mqueue9.c
+++ b/libc/rt/tst-mqueue9.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <mqueue.h>
diff --git a/libc/rt/tst-shm.c b/libc/rt/tst-shm.c
index 5838b0ee1..92593bd27 100644
--- a/libc/rt/tst-shm.c
+++ b/libc/rt/tst-shm.c
@@ -14,9 +14,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <error.h>
diff --git a/libc/rt/tst-timer.c b/libc/rt/tst-timer.c
index d9b69a246..3ab87f108 100644
--- a/libc/rt/tst-timer.c
+++ b/libc/rt/tst-timer.c
@@ -13,9 +13,8 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <unistd.h>
 
diff --git a/libc/rt/tst-timer4.c b/libc/rt/tst-timer4.c
index 5bec01181..fafb5651b 100644
--- a/libc/rt/tst-timer4.c
+++ b/libc/rt/tst-timer4.c
@@ -14,9 +14,8 @@
    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; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, see <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <signal.h>