diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/arm/init-first.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/init-first.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/init-first.c | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/mips/init-first.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/aio_sigqueue.c | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/sigaction.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/siginfo.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/init-first.c | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sigqueue.c | 9 |
9 files changed, 11 insertions, 34 deletions
diff --git a/sysdeps/arm/init-first.c b/sysdeps/arm/init-first.c index 7e6bcf7..87f9f0a 100644 --- a/sysdeps/arm/init-first.c +++ b/sysdeps/arm/init-first.c @@ -25,8 +25,6 @@ extern void __libc_global_ctors (void); int __libc_multiple_libcs = 1; -pid_t __libc_pid; - static void init (int *data) { diff --git a/sysdeps/generic/init-first.c b/sysdeps/generic/init-first.c index dacefdc..76989d1 100644 --- a/sysdeps/generic/init-first.c +++ b/sysdeps/generic/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. Stub version. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 1998 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 @@ -25,8 +25,6 @@ int __libc_multiple_libcs = 1; extern void __libc_init (int, char **, char **); extern void __getopt_clean_environment (char **); -pid_t __libc_pid; - #ifdef PIC void __libc_init_first (void) diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c index 07718d3..c90ae3d 100644 --- a/sysdeps/mach/hurd/i386/init-first.c +++ b/sysdeps/mach/hurd/i386/init-first.c @@ -41,9 +41,6 @@ int __libc_multiple_libcs = 1; extern int __libc_argc; extern char **__libc_argv; -/* We often need the PID. Cache this value. */ -pid_t __libc_pid = 0xf00baa; - void *(*_cthread_init_routine) (void); /* Returns new SP to use. */ void (*_cthread_exit_routine) (int status) __attribute__ ((__noreturn__)); diff --git a/sysdeps/mach/hurd/mips/init-first.c b/sysdeps/mach/hurd/mips/init-first.c index a411a1b..825b063 100644 --- a/sysdeps/mach/hurd/mips/init-first.c +++ b/sysdeps/mach/hurd/mips/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. For Mips/Hurd. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 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 @@ -39,9 +39,6 @@ int __libc_multiple_libcs = 1; int __libc_argc; char **__libc_argv; -/* We often need the PID. Cache this value. */ -pid_t __libc_pid; - void *(*_cthread_init_routine) (void); /* Returns new SP to use. */ void (*_cthread_exit_routine) (int status) __attribute__ ((__noreturn__)); diff --git a/sysdeps/unix/sysv/linux/aio_sigqueue.c b/sysdeps/unix/sysv/linux/aio_sigqueue.c index 1520ee1..fc1187b 100644 --- a/sysdeps/unix/sysv/linux/aio_sigqueue.c +++ b/sysdeps/unix/sysv/linux/aio_sigqueue.c @@ -41,13 +41,10 @@ __aio_sigqueue (sig, val) info.si_errno = 0; info.si_code = SI_ASYNCIO; - if (__libc_pid ==0xf00baa) - __libc_pid = __getpid (); - info.si_pid = __libc_pid; - + info.si_pid = getpid (); info.si_uid = getuid (); info.si_value = val; - return __syscall_rt_sigqueueinfo (__libc_pid, sig, &info); + return __syscall_rt_sigqueueinfo (info.si_pid, sig, &info); } diff --git a/sysdeps/unix/sysv/linux/bits/sigaction.h b/sysdeps/unix/sysv/linux/bits/sigaction.h index b6637e5..523084b 100644 --- a/sysdeps/unix/sysv/linux/bits/sigaction.h +++ b/sysdeps/unix/sysv/linux/bits/sigaction.h @@ -1,5 +1,5 @@ /* The proper definitions for Linux's sigaction. - Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1993, 94, 95, 96, 97, 98 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 @@ -30,7 +30,7 @@ struct sigaction /* Used if SA_SIGINFO is not set. */ __sighandler_t sa_handler; /* Used if SA_SIGINFO is set. */ - void (*sa_sigaction) __P ((int, siginfo_t *, void *)); + void (*sa_sigaction) __PMT ((int, siginfo_t *, void *)); } __sigaction_handler; #define sa_handler __sigaction_handler.sa_handler @@ -43,7 +43,7 @@ struct sigaction int sa_flags; /* Restore handler. */ - void (*sa_restorer) __P ((void)); + void (*sa_restorer) __PMT ((void)); }; /* Bits in `sa_flags'. */ diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h b/sysdeps/unix/sysv/linux/bits/siginfo.h index 503465b..0a34618 100644 --- a/sysdeps/unix/sysv/linux/bits/siginfo.h +++ b/sysdeps/unix/sysv/linux/bits/siginfo.h @@ -1,5 +1,5 @@ /* siginfo_t, sigevent and constants. Linux version. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 1998 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 @@ -252,8 +252,8 @@ typedef struct sigevent struct { - void (*_function) __P ((sigval_t)); /* Function to start. */ - void *_attribute; /* Really pthread_attr_t. */ + void (*_function) __PMT ((sigval_t)); /* Function to start. */ + void *_attribute; /* Really pthread_attr_t. */ } _sigev_thread; } _sigev_un; } sigevent_t; diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c index c6bf6fb..0931e99 100644 --- a/sysdeps/unix/sysv/linux/init-first.c +++ b/sysdeps/unix/sysv/linux/init-first.c @@ -43,9 +43,6 @@ int __libc_multiple_libcs = 1; int __libc_argc; char **__libc_argv; -/* We often need the UID and PID. Cache these values. */ -pid_t __libc_pid = 0xf00baa; - static void init (int argc, char **argv, char **envp) diff --git a/sysdeps/unix/sysv/linux/sigqueue.c b/sysdeps/unix/sysv/linux/sigqueue.c index 4952386..5719e24 100644 --- a/sysdeps/unix/sysv/linux/sigqueue.c +++ b/sysdeps/unix/sysv/linux/sigqueue.c @@ -21,9 +21,6 @@ extern int __syscall_rt_sigqueueinfo (int, int, siginfo_t *); -/* These variables are used quite often in the libc code. */ -extern pid_t __libc_pid; - /* Return any pending signal or wait for one for the given time. */ int @@ -38,11 +35,7 @@ __sigqueue (pid, sig, val) info.si_signo = sig; info.si_errno = 0; info.si_code = SI_QUEUE; - - if (__libc_pid == 0xf00baa) - __libc_pid = __getpid (); - info.si_pid = __libc_pid; - + info.si_pid = __getpid (); info.si_uid = __getuid (); info.si_value = val; |