diff options
| author | Roland McGrath <roland@hack.frob.com> | 2013-03-28 15:33:57 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2013-03-28 15:33:57 -0700 |
| commit | 3d3436ae68a907f656a07604eb7e10a50e1c8f85 (patch) | |
| tree | 85f688e349dd601f3297813f4f6abf0f08631838 /sysdeps | |
| parent | af15c191766fd413ef6fedc9d54b87962332ca71 (diff) | |
| download | glibc-3d3436ae68a907f656a07604eb7e10a50e1c8f85.tar.gz glibc-3d3436ae68a907f656a07604eb7e10a50e1c8f85.tar.xz glibc-3d3436ae68a907f656a07604eb7e10a50e1c8f85.zip | |
Consolidate declarations of _dl_phdr, _dl_phnum.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 6 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/init-first.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 9944555dd3..89db552542 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -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. */ diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c index c51737b488..3cfddce15f 100644 --- a/sysdeps/mach/hurd/i386/init-first.c +++ b/sysdeps/mach/hurd/i386/init-first.c @@ -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; |