diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-26 16:07:10 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-26 16:07:10 +0200 |
| commit | 12ccc71de7e6f111cb57ddb635847d704689ae4e (patch) | |
| tree | 039aaee06dfaa25138e82ba33bb5d745f5a55057 /include | |
| parent | cbb9d63bde7e060a2ae9cdf17a913a6e3f44446f (diff) | |
| parent | 9a079e270a9bec7e1fe28aeda63e07c1bb808d44 (diff) | |
Merge commit 'refs/top-bases/t/tls' into t/tls
Conflicts:
sysdeps/mach/hurd/i386/init-first.c
Address glibc commits 3d3436ae68a907f656a07604eb7e10a50e1c8f85,
dc0a02638583d8e7f7e1cc72643d1b26ec6042fd,
288f7d79fe2dcc8e62c539f57b25d7662a2cd5ff.
Diffstat (limited to 'include')
| -rw-r--r-- | include/link.h | 2 | ||||
| -rw-r--r-- | include/math.h | 3 | ||||
| -rw-r--r-- | include/netdb.h | 1 | ||||
| -rw-r--r-- | include/stdlib.h | 8 |
4 files changed, 11 insertions, 3 deletions
diff --git a/include/link.h b/include/link.h index 7dc3cd1e32..1682467631 100644 --- a/include/link.h +++ b/include/link.h @@ -37,7 +37,7 @@ struct link_map; extern unsigned int la_objopen (struct link_map *__map, Lmid_t __lmid, uintptr_t *__cookie); - +#include <stdint.h> #include <stddef.h> #include <bits/linkmap.h> #include <dl-lookupcfg.h> diff --git a/include/math.h b/include/math.h index 2b040c67fd..cbbce59501 100644 --- a/include/math.h +++ b/include/math.h @@ -23,11 +23,14 @@ hidden_proto (__isnanl) libm_hidden_proto (__fpclassify) libm_hidden_proto (__fpclassifyf) +libm_hidden_proto (__issignaling) +libm_hidden_proto (__issignalingf) libm_hidden_proto (__exp) libm_hidden_proto (__expf) # ifndef __NO_LONG_DOUBLE_MATH libm_hidden_proto (__fpclassifyl) +libm_hidden_proto (__issignalingl) libm_hidden_proto (__expl) libm_hidden_proto (__expm1l) # endif diff --git a/include/netdb.h b/include/netdb.h index 8a569baef3..e97d1bff8e 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -1,5 +1,6 @@ #ifndef _NETDB_H #include <resolv/netdb.h> +#include <stdint.h> #ifndef _ISOMAC /* Macros for accessing h_errno from inside libc. */ diff --git a/include/stdlib.h b/include/stdlib.h index db1812d85a..e50985a5b8 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -102,8 +102,12 @@ extern int __cxa_atexit_internal (void (*func) (void *), void *arg, void *d) extern int __cxa_thread_atexit_impl (void (*func) (void *), void *arg, void *d); -extern void __call_tls_dtors (void); -libc_hidden_proto (__call_tls_dtors); +extern void __call_tls_dtors (void) +#ifndef SHARED + __attribute__ ((weak)) +#endif + ; +libc_hidden_proto (__call_tls_dtors) extern void __cxa_finalize (void *d); |