aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-10-09 11:22:33 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-10-09 11:22:33 +0000
commitcb8312455b85a4a6c998b4c4a892c28b74cc3c4d (patch)
treec82e28896478cd7417c79617b93389483645d369
parent5deeb190146967ac05828b1fa6821182668356aa (diff)
downloadtermbaud-cb8312455b85a4a6c998b4c4a892c28b74cc3c4d.tar.gz
termbaud-cb8312455b85a4a6c998b4c4a892c28b74cc3c4d.tar.xz
termbaud-cb8312455b85a4a6c998b4c4a892c28b74cc3c4d.zip
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.
-rw-r--r--ChangeLog7
-rw-r--r--include/stdlib.h5
-rw-r--r--stdlib/cxa_atexit.c2
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 898ca847a1a..b645f63159b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
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.
[!_ISOMAC] (__iswdigit_l_internal): Likewise.
diff --git a/include/stdlib.h b/include/stdlib.h
index e50985a5b82..8d8c75368f3 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 21dec7b5436..6fa8ad4574f 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. */