Undid the dl_enable_fastload environment variable changes.

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 6f08e8ad1313ca3ee2257b2530a5211387552420..0906de556ced46fa3b36d4f04b1f26f5e110ee8a 100644 (file)
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1948,7 +1948,7 @@ _dl_map_object (struct link_map *loader, const char *name, off_t offset,
   assert (nsid < GL(dl_nns));
 
   /* Look for this name among those already loaded.  */
-  if (!GLRO(dl_enable_fastload) || name[0] == '\0')
+  if (name[0] == '\0')
     {
       /* Special case: both main exe and vdso can have empty name;
         so search from head: it is important to return the map for main

diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 297ff9dec5b1865cf69b94a2095c4682e9ab3781..06db4e2b941a4add62a7313e58b6970e2f246356 100644 (file)
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -793,8 +793,6 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
   __asm volatile ("" : "+r" (n), "+m" (scope->r_list));
   struct link_map **list = scope->r_list;
 
-  if (GLRO(dl_enable_fastload))
-  {
   if (scope == GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist && i == 0)
     {
       const int skip_to = earliest_pos_from_hash_table (undef_name);
@@ -820,7 +818,6 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
          return 0;
        }
     }
-  }
 
   do
     {

diff --git a/elf/dl-support.c b/elf/dl-support.c
index 4f1c9de4c5ce292e4591e72bd630915992023cdf..a097f22a16656e21d634a4f2fdaef6c0b414ae78 100644 (file)
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -147,7 +147,6 @@ dl_position_table_entry_t *_dl_position_hash_table;
 int _dl_position_hash_mask;
 int _dl_position_hash_cutoff = DL_POSITION_HASH_CUTOFF_DEFAULT;
 int _dl_position_hash_bits;
-int _dl_enable_fastload = 1;
 
 size_t _dl_pagesize = EXEC_PAGESIZE;
 

diff --git a/elf/dl-version.c b/elf/dl-version.c
index 6c1d94123333c47168908f47be2bb1c6ea7a4213..8a1e806c67c1606046b9207bedd41b08da5de316 100644 (file)
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -34,7 +34,7 @@ find_needed (const char *name, struct link_map *map)
   struct link_map *tmap;
   unsigned int n;
 
-  if (!GLRO(dl_enable_fastload) || name[0] == '\0')
+  if (name[0] == '\0')
     {
       /* Special case: both main exe and vdso can have empty name;
         so search from head: it is important to return the map for main
@@ -51,6 +51,7 @@ find_needed (const char *name, struct link_map *map)
        if (_dl_name_match_p (name, tmap))
          return tmap;
     }
+
   /* The required object is not in the global scope, look to see if it is
      a dependency of the current object.  */
   for (n = 0; n < map->l_searchlist.r_nlist; n++)

diff --git a/elf/rtld.c b/elf/rtld.c
index 4f61d49d0ac9a53d9c28b945d844e13b49c916db..a0b22c4bb3e4a2db22fe2b8b4397cddf1f2f6b24 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -293,7 +293,6 @@ struct rtld_global_ro _rtld_global_ro attribute_relro =
     ._dl_tls_get_addr_soft = _dl_tls_get_addr_soft,
     ._dl_position_hash_cutoff = DL_POSITION_HASH_CUTOFF_DEFAULT,
     ._dl_position_hash_bits = 0,
-    ._dl_enable_fastload = 1,
 #ifdef HAVE_DL_DISCOVER_OSVERSION
     ._dl_discover_osversion = _dl_discover_osversion
 #endif
@@ -1773,7 +1772,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
 
   /* We have now finished loading every required (linked-in) object.
      Set up the position hash if needed.  */
-  if (GLRO(dl_enable_fastload) == 1)
   _dl_fill_position_hash (main_map);
 
   HP_TIMING_NOW (stop);
@@ -2706,12 +2704,6 @@ process_envvars (enum mode *modep)
               = _dl_strtoul (&envline[16], NULL);;
           break;
 
-        case 16:
-          if (memcmp (envline, "FASTLOAD_ENABLED", 16) == 0)
-           GLRO(dl_enable_fastload)
-              = _dl_strtoul (&envline[17], NULL);;
-          break;
-
         case 18:
           if (memcmp (envline, "FASTLOAD_HASH_BITS", 18) == 0)
            GLRO(dl_position_hash_bits)

diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 1df593c96b131a2df1fc3869d80b20db9686019d..329a367ded06f1a4b46eed1069cd062a78331ad2 100644 (file)
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -594,7 +594,6 @@ struct rtld_global_ro
   EXTERN int _dl_position_hash_mask;
   EXTERN int _dl_position_hash_bits;
   EXTERN int _dl_position_hash_cutoff;
-  EXTERN int _dl_enable_fastload;
 
 #define DL_POSITION_HASH_BITS_MAX       27  /* (1 << 27) entries.  */
 #if defined(__powerpc__) && !defined(__powerpc64__)