about summary refs log tree commit diff
path: root/nptl/sysdeps/x86_64
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-12-06 11:15:07 +0000
committerRoland McGrath <roland@gnu.org>2002-12-06 11:15:07 +0000
commitfde89ad0091e492bd2d99d9d4925fbd62a7dc643 (patch)
treea3463d94ac501cf65556a614a54a66b64cfaf1ad /nptl/sysdeps/x86_64
parentd58847f9529bd81ff603e3a2beff7c6306165dac (diff)
downloadglibc-fde89ad0091e492bd2d99d9d4925fbd62a7dc643.tar.gz
glibc-fde89ad0091e492bd2d99d9d4925fbd62a7dc643.tar.xz
glibc-fde89ad0091e492bd2d99d9d4925fbd62a7dc643.zip
* sysdeps/generic/libc-tls.c (__libc_setup_tls): Cope with zero ALIGN.
	* malloc/hooks.c [_LIBC && (USE___THREAD || (USE_TLS && !SHARED))]
	(malloc_starter, memalign_starter, free_starter): Don't define these.
	* malloc/malloc.c [_LIBC && (USE___THREAD || (USE_TLS && !SHARED))]:
	Don't declare them either.
	* malloc/arena.c (ptmalloc_init) [_LIBC && USE_TLS]: Don't call
	__pthread_initialize, so no need to set hooks to *_starter.
	(ptmalloc_init_minimal): New function, broken out of ptmalloc_init.
	[_LIBC && SHARED && USE_TLS && !USE___THREAD]
	(__libc_malloc_pthread_startup): New function.
	* malloc/Versions (libc: GLIBC_PRIVATE): New set, add that function.

	* malloc/hooks.c (memalign_starter): New function.
	* malloc/malloc.c: Declare it.
	* malloc/arena.c (save_memalign_hook): New variable.
	(ptmalloc_init): Set __memalign_hook to memalign_starter.

	* elf/dl-minimal.c (free): Clear the memory.
	(calloc): Just call malloc, knowing all memory it returns is cleared.

	* sysdeps/generic/dl-tls.c (allocate_dtv): Use calloc instead of
	malloc and memset; calloc can avoid the zeroing when redundant.
	(_dl_tls_setup): Likewise.
	* elf/dl-load.c (decompose_rpath): Likewise.
	* sysdeps/generic/libc-tls.c (__libc_setup_tls): Comment out memset
	call, since memory from sbrk at startup is already zero.

	* elf/rtld.c (_dl_start, dl_main): TLS_INIT_TP macro now returns an
	error string for failure, null for success.  Update callers.
	* sysdeps/generic/libc-tls.c (__libc_setup_tls): Likewise.
	* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
Diffstat (limited to 'nptl/sysdeps/x86_64')
-rw-r--r--nptl/sysdeps/x86_64/tls.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h
index af3d202d5b..af4ad17abd 100644
--- a/nptl/sysdeps/x86_64/tls.h
+++ b/nptl/sysdeps/x86_64/tls.h
@@ -165,7 +165,8 @@ union user_desc_init
 		     "S" (_descr)					      \
 		   : "memory", "cc", "r11", "cx");			      \
 									      \
-     _result ? -1 : 0; })
+    _result ? "cannot set %fs base address for thread-local storage" : 0;     \
+  })
 
 
 /* Return the address of the dtv for the current thread.  */