lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

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

Browse Source 
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.
This commit is contained in:
Joseph Myers
2014-10-09 11:22:33 +00:00
parent 5deeb19014
commit cb8312455b
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2014-10-09 Joseph Myers <joseph@codesourcery.com> 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] [BZ #14132]
* include/wctype.h [!_ISOMAC] (__iswalpha_l_internal): Remove * include/wctype.h [!_ISOMAC] (__iswalpha_l_internal): Remove
declaration. declaration.

5
include/stdlib.h
View File

@ -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 __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 (void (*func) (void *), void *arg, void *d);
extern int __cxa_atexit_internal (void (*func) (void *), void *arg, void *d) libc_hidden_proto (__cxa_atexit);
attribute_hidden;
extern int __cxa_thread_atexit_impl (void (*func) (void *), void *arg, extern int __cxa_thread_atexit_impl (void (*func) (void *), void *arg,
void *d); void *d);
@ -229,8 +228,6 @@ extern int __qfcvt_r (long double __value, int __ndigit,
# ifndef NOT_IN_libc # ifndef NOT_IN_libc
# undef MB_CUR_MAX # undef MB_CUR_MAX
# define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_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 # endif
extern void *__default_morecore (ptrdiff_t) __THROW; extern void *__default_morecore (ptrdiff_t) __THROW;

2
stdlib/cxa_atexit.c
View File

@ -57,7 +57,7 @@ __cxa_atexit (void (*func) (void *), void *arg, void *d)
{ {
return __internal_atexit (func, arg, d, &__exit_funcs); return __internal_atexit (func, arg, d, &__exit_funcs);
} }
INTDEF(__cxa_atexit) libc_hidden_def (__cxa_atexit)
/* We change global data, so we need locking. */ /* We change global data, so we need locking. */