diff mbox

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

Message ID Pine.LNX.4.64.1410082340190.4884@digraph.polyomino.org.uk
State Committed
Headers

Commit Message

Joseph Myers Oct. 8, 2014, 11:41 p.m. UTC 
  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.

2014-10-08  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.

Comments

Andreas Schwab Oct. 9, 2014, 8:26 a.m. UTC | #1 
"Joseph S. Myers" <joseph@codesourcery.com> writes:

> 	[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.

Ok.

Andreas.
diff mbox

Patch

diff --git a/include/stdlib.h b/include/stdlib.h
index e50985a..8d8c753 100644
--- 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 21dec7b..6fa8ad4 100644
--- 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.  */