AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 21:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Roland McGrath 2014-10-20 14:54:12 -07:00
parent 6af246cf8b
commit e436eb790f
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2014-10-20 Roland McGrath <roland@hack.frob.com> 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 * nptl/pthread_rwlock_timedrdlock.c: #include <sys/time.h> before using
gettimeofday. gettimeofday.
* nptl/pthread_rwlock_timedwrlock.c: Likewise. * nptl/pthread_rwlock_timedwrlock.c: Likewise.

13
nptl/version.c
View File

@ -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. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -22,7 +23,7 @@
static const char banner[] = static const char banner[] =
#include "banner.h" #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\ This is free software; see the source for copying conditions.\n\
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
PARTICULAR PURPOSE.\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 void
__nptl_main (void) __nptl_main (void)
{ {
INTERNAL_SYSCALL_DECL (err); __write (STDOUT_FILENO, (const char *) banner, sizeof banner - 1);
INTERNAL_SYSCALL (write, err, 3, STDOUT_FILENO, (const char *) banner,
sizeof banner - 1);
_exit (0); _exit (0);
} }