OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consolidate declarations of _dl_phdr, _dl_phnum.

Browse Source
This commit is contained in:
Roland McGrath 2013-03-28 15:33:57 -07:00
parent af15c19176
commit 3d3436ae68
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2013-03-28 Roland McGrath <roland@hack.frob.com>
* sysdeps/generic/ldsodefs.h [!SHARED] (_dl_phdr, _dl_phnum):
Declare them here.
* elf/dl-iteratephdr.c [!SHARED] (_dl_phdr, _dl_phnum): Not here.
* csu/libc-tls.c: Nor here.
* sysdeps/mach/hurd/i386/init-first.c (init1): Nor here.
* sysdeps/posix/libc_fatal.c: Don't include <sys/syslog.h>.
(__libc_message): Never call vsyslog.

4
csu/libc-tls.c
View File

@ -28,10 +28,6 @@
#error makefile bug, this file is for static only
#endif
extern ElfW(Phdr) *_dl_phdr;
extern size_t _dl_phnum;
dtv_t _dl_static_dtv[2 + TLS_SLOTINFO_SURPLUS];

4
elf/dl-iteratephdr.c
View File

@ -92,10 +92,6 @@ weak_alias (__dl_iterate_phdr, dl_iterate_phdr);
#else
/* dl-support.c defines these and initializes them early on. */
extern ElfW(Phdr) *_dl_phdr;
extern size_t _dl_phnum;
int
dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
size_t size, void *data), void *data)

6
sysdeps/generic/ldsodefs.h
View File

@ -601,6 +601,12 @@ extern const struct rtld_global_ro _rtld_global_ro
#endif
#undef EXTERN
#ifndef SHARED
/* dl-support.c defines these and initializes them early on. */
extern ElfW(Phdr) *_dl_phdr;
extern size_t _dl_phnum;
#endif
#ifdef IS_IN_rtld
/* This is the initial value of GL(dl_error_catch_tsd).
A non-TLS libpthread will change it. */

4
sysdeps/mach/hurd/i386/init-first.c
View File

@ -106,10 +106,6 @@ init1 (int argc, char *arg0, ...)
char **argv = &arg0;
char **envp = &argv[argc + 1];
struct hurd_startup_data *d;
#ifndef SHARED
extern ElfW(Phdr) *_dl_phdr;
extern size_t _dl_phnum;
#endif
while (*envp)
++envp;