about summary refs log tree commit diff
path: root/elf/dl-runtime.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-09-18 19:57:24 +0000
committerJakub Jelinek <jakub@redhat.com>2007-09-18 19:57:24 +0000
commit7913ba4d91b848ec4e5698c59d43198a3ef9215d (patch)
treeafc73f6e0376ae6d07526c5efa9e941641ce1f6d /elf/dl-runtime.c
parentcedf9b89dd3b436ff7fad4c75d3f288ee4cd4ecd (diff)
downloadglibc-7913ba4d91b848ec4e5698c59d43198a3ef9215d.tar.gz
glibc-7913ba4d91b848ec4e5698c59d43198a3ef9215d.tar.xz
glibc-7913ba4d91b848ec4e5698c59d43198a3ef9215d.zip
Updated to fedora-glibc-20070918T1931 cvs/fedora-glibc-2_6_90-14
Diffstat (limited to 'elf/dl-runtime.c')
-rw-r--r--elf/dl-runtime.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index ee2b8b5f6c..968e293409 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -100,7 +100,10 @@ _dl_fixup (
 	 we are not using any threads (yet).  */
       int flags = DL_LOOKUP_ADD_DEPENDENCY;
       if (!RTLD_SINGLE_THREAD_P)
-	THREAD_GSCOPE_SET_FLAG ();
+	{
+	  THREAD_GSCOPE_SET_FLAG ();
+	  flags |= DL_LOOKUP_GSCOPE_LOCK;
+	}
 
       result = _dl_lookup_symbol_x (strtab + sym->st_name, l, &sym, l->l_scope,
 				    version, ELF_RTYPE_CLASS_PLT, flags, NULL);
@@ -192,7 +195,10 @@ _dl_profile_fixup (
 	     we are not using any threads (yet).  */
 	  int flags = DL_LOOKUP_ADD_DEPENDENCY;
 	  if (!RTLD_SINGLE_THREAD_P)
-	    THREAD_GSCOPE_SET_FLAG ();
+	    {
+	      THREAD_GSCOPE_SET_FLAG ();
+	      flags |= DL_LOOKUP_GSCOPE_LOCK;
+	    }
 
 	  result = _dl_lookup_symbol_x (strtab + refsym->st_name, l,
 					&defsym, l->l_scope, version,