diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-26 16:34:06 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-26 16:34:06 +0200 |
| commit | f0f440a6f2e5b88e9f4114110d37689c6148e13d (patch) | |
| tree | 70cde5327dcfb101349a0ec50a7d13b4431d7f6e /sysdeps/generic/ldsodefs.h | |
| parent | de1463d3e4657cf44779185870cdf5a22ee1e415 (diff) | |
| parent | e631e5064e2efc594149a07e726ed086f2d8b84d (diff) | |
Merge commit 'refs/top-bases/t/hurdsig-global-dispositions-versions' into t/hurdsig-global-dispositions-versions
Diffstat (limited to 'sysdeps/generic/ldsodefs.h')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 9944555dd3..3f44809802 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -26,6 +26,7 @@ #define __need_NULL #include <stddef.h> #include <string.h> +#include <stdint.h> #include <elf.h> #include <dlfcn.h> @@ -601,6 +602,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 const 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. */ @@ -633,6 +640,16 @@ extern char **_dl_argv #endif ; #ifdef IS_IN_rtld +extern unsigned int _dl_skip_args attribute_hidden +# ifndef DL_ARGV_NOT_RELRO + attribute_relro +# endif + ; +extern unsigned int _dl_skip_args_internal attribute_hidden +# ifndef DL_ARGV_NOT_RELRO + attribute_relro +# endif + ; extern char **_dl_argv_internal attribute_hidden # ifndef DL_ARGV_NOT_RELRO attribute_relro |