From c2afe833521105e05298500ba5d4676d6c833242 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 2 Aug 2002 03:32:24 +0000 Subject: * sysdeps/pthread/bits/libc-tsd.h: Include . [USE_TLS && HAVE___THREAD]: Just include the sysdeps/generic file, which does the right thing when __thread support is available. * descr.h (struct _pthread_descr_struct) [USE_TLS && HAVE___THREAD]: Omit `p_libc_specific', `p_errnop', `p_errno', `p_h_errnop', `p_h_errno', `p_resp', and `p_res' members. * pthread.c (__pthread_initialize_minimal) [USE_TLS && HAVE___THREAD]: Don't initialize `p_errnop' and `p_h_errnop' members. (__pthread_reset_main_thread): Likewise. (__pthread_initialize_manager): Likewise. * manager.c (__pthread_manager, pthread_handle_create): Likewise. * pthread.c (pthread_initialize) [USE_TLS && HAVE___THREAD]: Don't initialize `p_resp' member. (__pthread_reset_main_thread): Likewise. * manager.c (pthread_handle_create): Likewise. * specific.c (libc_internal_tsd_set, libc_internal_tsd_get): Conditionalize these on [!(USE_TLS && HAVE___THREAD)]. * errno.c [USE_TLS && HAVE___THREAD] (__h_errno_location, __res_state): Don't define these at all. * sysdeps/i386/tls.h (INSTALL_DTV): Add parens around arguments! (INSTALL_NEW_DTV, GET_DTV): Likewise. * sysdeps/sh/tls.h (INSTALL_DTV, INSTALL_NEW_DTV, GET_DTV): Likewise. * weaks.c: Don't include here. 2002-08-01 Roland McGrath * sysdeps/i386/tls.h (TLS_DO_MODIFY_LDT): New macro, broken out of TLS_INIT_TP. (TLS_DO_SET_THREAD_AREA): New macro, uses thread_set_area syscall. (TLS_SETUP_GS_SEGMENT): New macro, try one or the other or both. (TLS_INIT_TP): Use that. --- malloc/malloc.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'malloc') diff --git a/malloc/malloc.c b/malloc/malloc.c index cd40626504..0440be5c22 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -516,6 +516,9 @@ Void_t *(*__morecore)(ptrdiff_t) = __default_morecore; #if (__STD_C || defined(HAVE_MEMCPY)) +#ifdef _LIBC +# include +#else #ifdef WIN32 /* On Win32 memset and memcpy are already declared in windows.h */ #else @@ -528,6 +531,7 @@ Void_t* memcpy(); #endif #endif #endif +#endif /* MALLOC_FAILURE_ACTION is the action to take before "return 0" when -- cgit v1.2.3