diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-09-18 19:20:56 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-09-18 19:20:56 +0000 |
| commit | b90395e6e9479e06ada7294044aaa150a094150f (patch) | |
| tree | b743ab6c481685f996e700bf24dca01e61258731 /elf/dl-sym.c | |
| parent | 874aa52349cc111d1f6ea5dff24bb14c306714e0 (diff) | |
| download | glibc-b90395e6e9479e06ada7294044aaa150a094150f.tar.gz glibc-b90395e6e9479e06ada7294044aaa150a094150f.tar.xz glibc-b90395e6e9479e06ada7294044aaa150a094150f.zip | |
* sysdeps/generic/ldsodefs.h (DL_LOOKUP_GSCOPE_LOCK): New definition.
* elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Or in DL_LOOKUP_GSCOPE_LOCK into flags after THREAD_GSCOPE_SET_FLAG (). * elf/dl-sym.c (do_sym): Likewise. * include/link.h (struct link_map): Add l_serial field. * elf/dl-object.c (_dl_new_object): Initialize l_serial. * elf/dl-lookup.c (add_dependency): Add flags argument. Remember map->l_serial, if DL_LOOKUP_GSCOPE_LOCK is among flags, use THREAD_GSCOPE_RESET_FLAG before and THREAD_GSCOPE_SET_FLAG after __rtld_lock_lock_recursive (GL(dl_load_lock)) to avoid deadlock. Don't dereference map until it has been found on some list. If map->l_serial changed, return -1.
Diffstat (limited to 'elf/dl-sym.c')
| -rw-r--r-- | elf/dl-sym.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/elf/dl-sym.c b/elf/dl-sym.c index b12ff375fe..43c8274b7d 100644 --- a/elf/dl-sym.c +++ b/elf/dl-sym.c @@ -123,7 +123,8 @@ do_sym (void *handle, const char *name, void *who, args.name = name; args.map = match; args.vers = vers; - args.flags = flags | DL_LOOKUP_ADD_DEPENDENCY; + args.flags + = flags | DL_LOOKUP_ADD_DEPENDENCY | DL_LOOKUP_GSCOPE_LOCK; args.refp = &ref; THREAD_GSCOPE_SET_FLAG (); |