From 083021408b13bc261ff3a77734e009d7d2975ea7 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Feb 03 2021 06:33:16 +0000
Subject: Apply patch glibc-fedora-__libc_multiple_libcs.patch


patch_name: glibc-fedora-__libc_multiple_libcs.patch
present_in_specfile: true
location_in_specfile: 13

---

diff --git a/elf/dl-init.c b/elf/dl-init.c
index 3e72fa3..45405cd 100644
--- a/elf/dl-init.c
+++ b/elf/dl-init.c
@@ -118,8 +118,6 @@ _dl_init (struct link_map *main_map, int argc, char **argv, char **env)
   while (i-- > 0)
     call_init (main_map->l_initfini[i], argc, argv, env);
 
-#ifndef HAVE_INLINED_SYSCALLS
   /* Finished starting up.  */
   _dl_starting_up = 0;
-#endif
 }
diff --git a/elf/dl-support.c b/elf/dl-support.c
index b5f10d5..c8439fc 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -117,10 +117,8 @@ struct r_scope_elem _dl_initial_searchlist =
     .r_nlist = 1,
   };
 
-#ifndef HAVE_INLINED_SYSCALLS
 /* Nonzero during startup.  */
 int _dl_starting_up = 1;
-#endif
 
 /* Random data provided by the kernel.  */
 void *_dl_random;
diff --git a/elf/rtld.c b/elf/rtld.c
index 1b0c747..4abc6dd 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -216,7 +216,6 @@ audit_list_iter_next (struct audit_list_iter *iter)
   return iter->previous->name;
 }
 
-#ifndef HAVE_INLINED_SYSCALLS
 /* Set nonzero during loading and initialization of executable and
    libraries, cleared before the executable's entry point runs.  This
    must not be initialized to nonzero, because the unused dynamic
@@ -226,7 +225,6 @@ audit_list_iter_next (struct audit_list_iter *iter)
    never be called.  */
 int _dl_starting_up = 0;
 rtld_hidden_def (_dl_starting_up)
-#endif
 
 /* This is the structure which defines all variables global to ld.so
    (except those which cannot be added for some reason).  */
@@ -900,10 +898,8 @@ dl_main (const ElfW(Phdr) *phdr,
   /* Process the environment variable which control the behaviour.  */
   process_envvars (&mode);
 
-#ifndef HAVE_INLINED_SYSCALLS
   /* Set up a flag which tells we are just starting.  */
   _dl_starting_up = 1;
-#endif
 
   if (*user_entry == (ElfW(Addr)) ENTRY_POINT)
     {