Updated to fedora-glibc-20061027T1902 cvs/fedora-glibc-2_5_90-2

1 files changed, 3 insertions, 28 deletions

diff --git a/include/link.h b/include/link.h
index 4b2f07e862..80eff3a677 100644
--- a/include/link.h
+++ b/include/link.h
@@ -75,18 +75,6 @@ struct r_search_path_struct
   };
 
 
-/* Structure for a scope.  Each such data structure has a lock.  The
-   lock allows many readers.  It can be invalidated by setting bit 31
-   which means that no more lockers are allowe */
-struct r_scoperec
-{
-  bool remove_after_use;
-  bool notify;
-  int nusers;
-  struct r_scope_elem *scope[0];
-};
-
-
 /* Structure describing a loaded shared object.  The `l_next' and `l_prev'
    members form a chain of all the shared objects loaded at startup.
 
@@ -226,27 +214,14 @@ struct link_map
     ElfW(Addr) l_text_end;
 
     /* Default array for 'l_scope'.  */
-    union
-    {
-      struct r_scoperec l_scoperec_mem;
-      struct
-      {
-	struct r_scoperec scoperec_struct;
-	/* XXX This number should be increased once the scope memory
-	   handling has been tested.  */
-	struct r_scope_elem *scope_elems[4];
-#define NINIT_SCOPE_ELEMS(map) \
-	(sizeof ((map)->l_scope_realmem.scope_elems)			      \
-	 / sizeof ((map)->l_scope_realmem.scope_elems[0]))
-      } l_scope_realmem;
-    };
+    struct r_scope_elem *l_scope_mem[4];
     /* Size of array allocated for 'l_scope'.  */
     size_t l_scope_max;
     /* This is an array defining the lookup scope for this link map.
        There are initially at most three different scope lists.  */
-    struct r_scoperec *l_scoperec;
+    struct r_scope_elem **l_scope;
     /* We need to protect using the SCOPEREC.  */
-    __rtld_mrlock_define (, l_scoperec_lock)
+    __rtld_mrlock_define (, l_scope_lock)
 
     /* A similar array, this time only with the local scope.  This is
        used occasionally.  */