Move _dl_non_dynamic_init, _dl_aux_init declarations.

diff --git a/ChangeLog b/ChangeLog
index 0ef7625321ee788b5f848ef252a5a8b979e27449..f3eea738576c499831d6662eb39a1852e908926a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 408737afd89573a5a5fb9c5a9544aced00276196..9944555dd30821428d3e3fc73cc15f2d0999588e 100644 (file)
--- 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 081fa01f806c66ea5455eab1ddb217f941f03940..18ff8528c2de0ad2d9524ba977ceee00ec5d146c 100644 (file)
--- 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