mirror of
https://abf.rosa.ru/djam/glibc.git
synced 2025-02-23 23:12:48 +00:00
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
diff -up glibc-2.31.20200715/elf/dl-init.c.13~ glibc-2.31.20200715/elf/dl-init.c
|
|
--- glibc-2.31.20200715/elf/dl-init.c.13~ 2020-07-15 17:58:07.000000000 +0200
|
|
+++ glibc-2.31.20200715/elf/dl-init.c 2020-07-15 23:52:46.296238095 +0200
|
|
@@ -120,8 +120,6 @@ _dl_init (struct link_map *main_map, int
|
|
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 -up glibc-2.31.20200715/elf/dl-support.c.13~ glibc-2.31.20200715/elf/dl-support.c
|
|
--- glibc-2.31.20200715/elf/dl-support.c.13~ 2020-07-15 17:58:07.000000000 +0200
|
|
+++ glibc-2.31.20200715/elf/dl-support.c 2020-07-15 23:52:46.296238095 +0200
|
|
@@ -120,10 +120,8 @@ struct r_scope_elem _dl_initial_searchli
|
|
.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 -up glibc-2.31.20200715/elf/rtld.c.13~ glibc-2.31.20200715/elf/rtld.c
|
|
--- glibc-2.31.20200715/elf/rtld.c.13~ 2020-07-15 17:58:07.000000000 +0200
|
|
+++ glibc-2.31.20200715/elf/rtld.c 2020-07-15 23:57:44.187875422 +0200
|
|
@@ -316,7 +316,6 @@ audit_list_count (struct audit_list *lis
|
|
return naudit;
|
|
}
|
|
|
|
-#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
|
|
@@ -326,7 +325,6 @@ audit_list_count (struct audit_list *lis
|
|
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). */
|
|
@@ -1178,10 +1176,8 @@ dl_main (const ElfW(Phdr) *phdr,
|
|
/* Process the environment variable which control the behaviour. */
|
|
process_envvars (&mode, &audit_list);
|
|
|
|
-#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)
|
|
{
|