NPTL: Clean up gratuitous Linuxism in libpthread.so entry point.

diff --git a/ChangeLog b/ChangeLog
index dfad901052430856d2e737b3f867e58ed5d25bd1..f6a03715da8d7df30d2441f6ecdbd45f903ed31e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-10-20  Roland McGrath  <roland@hack.frob.com>
 
+       * nptl/version.c (__nptl_main): Use normal __write rather than
+       INTERNAL_SYSCALL.
+       (banner): Update copyright years.
+
        * nptl/pthread_rwlock_timedrdlock.c: #include <sys/time.h> before using
        gettimeofday.
        * nptl/pthread_rwlock_timedwrlock.c: Likewise.

diff --git a/nptl/version.c b/nptl/version.c
index 74d73ceb6d5dd229dce21e6878ce73b521d3585d..b2095b41adf710fb564eed6c9e9246331d71b8dd 100644 (file)
--- a/nptl/version.c
+++ b/nptl/version.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002-2014 Free Software Foundation, Inc.
+/* Entry point for libpthread DSO.
+   Copyright (C) 2002-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -22,7 +23,7 @@
 
 static const char banner[] =
 #include "banner.h"
-"Copyright (C) 2006 Free Software Foundation, Inc.\n\
+"Copyright (C) 2006-2014 Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
 PARTICULAR PURPOSE.\n"
@@ -32,13 +33,11 @@ PARTICULAR PURPOSE.\n"
 ;
 
 
-extern void __nptl_main (void) __attribute__ ((noreturn));
+/* This is made the e_entry of libpthread.so by LDFLAGS-pthread.so.  */
+__attribute__ ((noreturn))
 void
 __nptl_main (void)
 {
-  INTERNAL_SYSCALL_DECL (err);
-  INTERNAL_SYSCALL (write, err, 3, STDOUT_FILENO, (const char *) banner,
-                   sizeof banner - 1);
-
+  __write (STDOUT_FILENO, (const char *) banner, sizeof banner - 1);
   _exit (0);
 }