Don't use INTDEF/INTUSE with __cxa_atexit (bug 14132).

This patch removes use of the obsolete INTDEF/INTUSE mechanism for
__cxa_atexit, replacing it with libc_hidden_def/libc_hidden_proto.

Tested for x86_64 that installed stripped shared libraries are
unchanged by the patch.

	[BZ #14132]
	* stdlib/cxa_atexit.c (__cxa_atexit): Use libc_hidden_def instead
	of INTDEF.
	* include/stdlib.h (__cxa_atexit_internal): Remove declaration.
	(__cxa_atexit): Use libc_hidden_proto.
	[!NOT_IN_libc] (__cxa_atexit): Remove macro definition.

diff --git a/ChangeLog b/ChangeLog
index 898ca847a1aa408bf4d7041c7e9ec952595c2b38..b645f63159b33aaba288e929679fa15f40741f03 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2014-10-09  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #14132]
+       * stdlib/cxa_atexit.c (__cxa_atexit): Use libc_hidden_def instead
+       of INTDEF.
+       * include/stdlib.h (__cxa_atexit_internal): Remove declaration.
+       (__cxa_atexit): Use libc_hidden_proto.
+       [!NOT_IN_libc] (__cxa_atexit): Remove macro definition.
+
        [BZ #14132]
        * include/wctype.h [!_ISOMAC] (__iswalpha_l_internal): Remove
        declaration.

diff --git a/include/stdlib.h b/include/stdlib.h
index e50985a5b82c3f1259f6b5f55ee0a9fc53c49443..8d8c75368f314266ad11ebc44155a5130b45028f 100644 (file)
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -97,8 +97,7 @@ extern void _quicksort (void *const pbase, size_t total_elems,
 extern int __on_exit (void (*__func) (int __status, void *__arg), void *__arg);
 
 extern int __cxa_atexit (void (*func) (void *), void *arg, void *d);
-extern int __cxa_atexit_internal (void (*func) (void *), void *arg, void *d)
-     attribute_hidden;
+libc_hidden_proto (__cxa_atexit);
 
 extern int __cxa_thread_atexit_impl (void (*func) (void *), void *arg,
                                     void *d);
@@ -229,8 +228,6 @@ extern int __qfcvt_r (long double __value, int __ndigit,
 # ifndef NOT_IN_libc
 #  undef MB_CUR_MAX
 #  define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX))
-
-# define __cxa_atexit(func, arg, d) INTUSE(__cxa_atexit) (func, arg, d)
 # endif
 
 extern void *__default_morecore (ptrdiff_t) __THROW;

diff --git a/stdlib/cxa_atexit.c b/stdlib/cxa_atexit.c
index 21dec7b543653c7337d336ada418c41f910c2bfa..6fa8ad4574f6e4535c43e013dfdf68572160dd04 100644 (file)
--- a/stdlib/cxa_atexit.c
+++ b/stdlib/cxa_atexit.c
@@ -57,7 +57,7 @@ __cxa_atexit (void (*func) (void *), void *arg, void *d)
 {
   return __internal_atexit (func, arg, d, &__exit_funcs);
 }
-INTDEF(__cxa_atexit)
+libc_hidden_def (__cxa_atexit)
 
 
 /* We change global data, so we need locking.  */