about summary refs log tree commit diff
path: root/elf/dl-load.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-02 03:32:24 +0000
committerRoland McGrath <roland@gnu.org>2002-08-02 03:32:24 +0000
commitc2afe833521105e05298500ba5d4676d6c833242 (patch)
tree226bb6da849fe8d860b766d3c365c8cfeb99b19e /elf/dl-load.c
parentae8f7f19faf701667d5e88195e3efc479c4a0746 (diff)
downloadglibc-c2afe833521105e05298500ba5d4676d6c833242.tar.gz
glibc-c2afe833521105e05298500ba5d4676d6c833242.tar.xz
glibc-c2afe833521105e05298500ba5d4676d6c833242.zip
* sysdeps/pthread/bits/libc-tsd.h: Include <tls.h>.
	[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 <errno.h> here.

2002-08-01  Roland McGrath  <roland@redhat.com>

	* 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.
Diffstat (limited to 'elf/dl-load.c')
-rw-r--r--elf/dl-load.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 0948b8f21e..2955bc5173 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1166,8 +1166,8 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
 
   elf_get_dynamic_info (l);
 
-  /* Make sure we are dlopen()ing an object which has the DF_1_NOOPEN
-     flag set.  */
+  /* Make sure we are not dlopen'ing an object
+     that has the DF_1_NOOPEN flag set.  */
   if ((__builtin_expect (l->l_flags_1 & DF_1_NOOPEN, 0)
 #ifdef USE_TLS
        || __builtin_expect (l->l_flags & DF_STATIC_TLS, 0)
@@ -1861,7 +1861,7 @@ cannot create shared object descriptor"));
 	}
       else
 	INTUSE(_dl_signal_error) (errno, name, NULL,
-			       N_("cannot open shared object file"));
+				  N_("cannot open shared object file"));
     }
 
   return _dl_map_object_from_fd (name, fd, &fb, realname, loader, type, mode);