diff options
| author | Roland McGrath <roland@hack.frob.com> | 2013-03-15 14:32:04 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2013-03-15 14:32:04 -0700 |
| commit | bc16e260d0e74b36e48d30edc6ea4f1152700c09 (patch) | |
| tree | e13b79c1ec8fa0d0dec5bb6fc6cdde3d299aaebd | |
| parent | af00a34d085eae098349671c7d753a681b90c78f (diff) | |
Move _dl_non_dynamic_init, _dl_aux_init declarations.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ldsodefs.h | 6 |
3 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2013-03-15 Roland McGrath <roland@hack.frob.com> + + * sysdeps/unix/sysv/linux/ldsodefs.h + (_dl_non_dynamic_init, _dl_aux_init): Move declarations to ... + * sysdeps/generic/ldsodefs.h: ... here. + 2013-03-15 Thomas Schwinge <thomas@codesourcery.com> * math/libm-test.inc (ldexp_test): Add missing START/END markers. diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 408737afd8..9944555dd3 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1010,6 +1010,13 @@ extern struct link_map *_dl_find_dso_for_object (const ElfW(Addr) addr) internal_function; rtld_hidden_proto (_dl_find_dso_for_object) +/* Initialization which is normally done by the dynamic linker. */ +extern void _dl_non_dynamic_init (void) internal_function; + +/* Used by static binaries to check the auxiliary vector. */ +extern void _dl_aux_init (ElfW(auxv_t) *av) internal_function; + + __END_DECLS #endif /* ldsodefs.h */ diff --git a/sysdeps/unix/sysv/linux/ldsodefs.h b/sysdeps/unix/sysv/linux/ldsodefs.h index 081fa01f80..18ff8528c2 100644 --- a/sysdeps/unix/sysv/linux/ldsodefs.h +++ b/sysdeps/unix/sysv/linux/ldsodefs.h @@ -29,12 +29,6 @@ /* We have the auxiliary vector. */ #define HAVE_AUX_VECTOR -/* Used by static binaries to check the auxiliary vector. */ -extern void _dl_aux_init (ElfW(auxv_t) *av) internal_function; - -/* Initialization which is normally done by the dynamic linker. */ -extern void _dl_non_dynamic_init (void) internal_function; - /* We can assume that the kernel always provides the AT_UID, AT_EUID, AT_GID, and AT_EGID values in the auxiliary vector from 2.4.0 or so on. */ #define HAVE_AUX_XID |