Mark _dl_catch_error hidden

Since _dl_catch_error is only used internally in ld.so, it should be
declared in sysdeps/generic/ldsodefs.h, not include/dlfcn.h and it can
be made hidden.

	[BZ #19122]
	* include/dlfcn.h (_dl_catch_error): Moved to ...
	* sysdeps/generic/ldsodefs.h (_dl_catch_error): Add
	attribute_hidden.

diff --git a/ChangeLog b/ChangeLog
index b93c0a80ed53daf6063ac5868d88aba9971e3b53..110d6706fe6709cf44613e0506bbec5c9e2daca8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2015-10-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #19122]
+       * include/dlfcn.h (_dl_catch_error): Moved to ...
+       * sysdeps/generic/ldsodefs.h (_dl_catch_error): Add
+       attribute_hidden.
+
        * sysdeps/generic/_itoa.h (_itoa): Add attribute_hidden.
        (_itoa_word): Likewise.
 

diff --git a/include/dlfcn.h b/include/dlfcn.h
index 0ce0af5276218c6dcbb093823d3965de753e9155..2524292ebc32ad7f771cc06e9d520be859734ad1 100644 (file)
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -71,19 +71,6 @@ extern void *_dl_vsym (void *handle, const char *name, const char *version,
                       void *who)
     internal_function;
 
-/* Call OPERATE, catching errors from `dl_signal_error'.  If there is no
-   error, *ERRSTRING is set to null.  If there is an error, *ERRSTRING is
-   set to a string constructed from the strings passed to _dl_signal_error,
-   and the error code passed is the return value and *OBJNAME is set to
-   the object name which experienced the problems.  ERRSTRING if nonzero
-   points to a malloc'ed string which the caller has to free after use.
-   ARGS is passed as argument to OPERATE.  MALLOCEDP is set to true only
-   if the returned string is allocated using the libc's malloc.  */
-extern int _dl_catch_error (const char **objname, const char **errstring,
-                           bool *mallocedp, void (*operate) (void *),
-                           void *args)
-     internal_function;
-
 /* Helper function for <dlfcn.h> functions.  Runs the OPERATE function via
    _dl_catch_error.  Returns zero for success, nonzero for failure; and
    arranges for `dlerror' to return the error details.

diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index bb1b3ed7d2595c14f68b3026d5ca9f7b7d557478..a8caf47bc378d3ec1ba2e4cd0219503faeeb5e76 100644 (file)
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -738,6 +738,18 @@ extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *),
                               void *args)
      internal_function attribute_hidden;
 
+/* Call OPERATE, catching errors from `dl_signal_error'.  If there is no
+   error, *ERRSTRING is set to null.  If there is an error, *ERRSTRING is
+   set to a string constructed from the strings passed to _dl_signal_error,
+   and the error code passed is the return value and *OBJNAME is set to
+   the object name which experienced the problems.  ERRSTRING if nonzero
+   points to a malloc'ed string which the caller has to free after use.
+   ARGS is passed as argument to OPERATE.  MALLOCEDP is set to true only
+   if the returned string is allocated using the libc's malloc.  */
+extern int _dl_catch_error (const char **objname, const char **errstring,
+                           bool *mallocedp, void (*operate) (void *),
+                           void *args)
+     internal_function attribute_hidden;
 
 /* Open the shared object NAME and map in its segments.
    LOADER's DT_RPATH is used in searching for NAME.