nptl: Decorate thread stack on pthread_create

[platform/upstream/glibc.git] / elf / dl-deps.c

diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index c8bab5c..0549b4a 100644 (file)
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -1,5 +1,5 @@
 /* Load the dependencies of a mapped object.
-   Copyright (C) 1996-2022 Free Software Foundation, Inc.
+   Copyright (C) 1996-2023 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -68,22 +68,6 @@ openaux (void *a)
                              args->map->l_ns);
 }
 
-static ptrdiff_t
-_dl_build_local_scope (struct link_map **list, struct link_map *map)
-{
-  struct link_map **p = list;
-  struct link_map **q;
-
-  *p++ = map;
-  map->l_reserved = 1;
-  if (map->l_initfini)
-    for (q = map->l_initfini + 1; *q; ++q)
-      if (! (*q)->l_reserved)
-       p += _dl_build_local_scope (p, *q);
-  return p - list;
-}
-
-
 /* We use a very special kind of list to track the path
    through the list of loaded shared objects.  We have to
    produce a flat list with unique members of all involved objects.
@@ -489,6 +473,8 @@ _dl_map_object_deps (struct link_map *map,
 
   for (nlist = 0, runp = known; runp; runp = runp->next)
     {
+      /* _dl_sort_maps ignores l_faked object, so it is safe to not consider
+        them for nlist.  */
       if (__builtin_expect (trace_mode, 0) && runp->map->l_faked)
        /* This can happen when we trace the loading.  */
        --map->l_searchlist.r_nlist;
@@ -504,56 +490,6 @@ _dl_map_object_deps (struct link_map *map,
       runp->map->l_reserved = 0;
     }
 
-  if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK, 0) != 0
-      && map == GL(dl_ns)[LM_ID_BASE]._ns_loaded)
-    {
-      /* If we are to compute conflicts, we have to build local scope
-        for each library, not just the ultimate loader.  */
-      for (i = 0; i < nlist; ++i)
-       {
-         struct link_map *l = map->l_searchlist.r_list[i];
-         unsigned int j, cnt;
-
-         /* The local scope has been already computed.  */
-         if (l == map
-             || (l->l_local_scope[0]
-                 && l->l_local_scope[0]->r_nlist) != 0)
-           continue;
-
-         if (l->l_info[AUXTAG] || l->l_info[FILTERTAG])
-           {
-             /* As current DT_AUXILIARY/DT_FILTER implementation needs to be
-                rewritten, no need to bother with prelinking the old
-                implementation.  */
-             _dl_signal_error (EINVAL, l->l_name, NULL, N_("\
-Filters not supported with LD_TRACE_PRELINKING"));
-           }
-
-         cnt = _dl_build_local_scope (l_initfini, l);
-         assert (cnt <= nlist);
-         for (j = 0; j < cnt; j++)
-           {
-             l_initfini[j]->l_reserved = 0;
-             if (j && __builtin_expect (l_initfini[j]->l_info[DT_SYMBOLIC]
-                                        != NULL, 0))
-               l->l_symbolic_in_local_scope = true;
-           }
-
-         l->l_local_scope[0] =
-           (struct r_scope_elem *) malloc (sizeof (struct r_scope_elem)
-                                           + (cnt
-                                              * sizeof (struct link_map *)));
-         if (l->l_local_scope[0] == NULL)
-           _dl_signal_error (ENOMEM, map->l_name, NULL,
-                             N_("cannot allocate symbol search list"));
-         l->l_local_scope[0]->r_nlist = cnt;
-         l->l_local_scope[0]->r_list =
-           (struct link_map **) (l->l_local_scope[0] + 1);
-         memcpy (l->l_local_scope[0]->r_list, l_initfini,
-                 cnt * sizeof (struct link_map *));
-       }
-    }
-
   /* Maybe we can remove some relocation dependencies now.  */
   struct link_map_reldeps *l_reldeps = NULL;
   if (map->l_reldeps != NULL)