forked from rpms/glibc
89e19f3b9e
Upstream commit: b1caa144c74678097cada5a54eda2996bb459d8f - Update mips libm-test-ulps - Update alpha libm-test-ulps - Update ia64 libm-test-ulps - Update sparc libm-test-ulps - Update arm libm-test-ulps - Update aarch64 libm-test-ulps - Updates to the shn_MM locale [BZ #25532] - powerpc: Update ULPs and xfail more ibm128 outputs - i386: Remove build support for GCC older than GCC 6 - oc_FR locale: Fix spelling of April (bug 25639) - Update hppa libm-test-ulps - y2038: linux: Provide __mq_timedreceive_time64 implementation - y2038: linux: Provide __mq_timedsend_time64 implementation - y2038: include: Move struct __timespec64 definition to a separate file - malloc: ensure set_max_fast never stores zero [BZ #25733] - powerpc64le: enforce non-specific long double in .gnu.attributes section - powerpc64le: workaround ieee long double / _Float128 stdc++ bug - powerpc64le: Enforce -mabi=ibmlongdouble when -mfloat128 used - powerpc64le/multiarch: don't generate strong aliases for fmaf128-ppc64 - ldbl-128ibm: simplify iscanonical.h - i386: Disable check_consistency for GCC 5 and above [BZ #25788] - Add IPPROTO_ETHERNET and IPPROTO_MPTCP from Linux 5.6 to netinet/in.h. - Update syscall lists for Linux 5.6. - elf: Implement DT_AUDIT, DT_DEPAUDIT support [BZ #24943] - elf: Simplify handling of lists of audit strings - support: Change xgetline to return 0 on EOF - nptl: Remove x86_64 cancellation assembly implementations [BZ #25765] - aarch64: update bits/hwcap.h - Add tests for Safe-Linking - S390: Regenerate ULPs. - sysv/alpha: Use generic __timeval32 and helpers - linux: Use long time_t for wait4/getrusage - resource: Add a __rusage64 struct - linux: Use long time_t __getitimer/__setitimer - sysv: Define __KERNEL_OLD_TIMEVAL_MATCHES_TIMEVAL64 - math: Add inputs that yield larger errors for float type (x86_64)
92 lines
2.9 KiB
Diff
92 lines
2.9 KiB
Diff
Short description: Cleanup use of _dl_starting_up.
|
|
Author(s): Fedora glibc team <glibc@lists.fedoraproject.org>
|
|
Origin: PATCH
|
|
Upstream status: https://sourceware.org/ml/libc-alpha/2014-02/msg00589.html
|
|
|
|
Upstream discussions:
|
|
https://sourceware.org/ml/libc-alpha/2014-02/msg00580.html
|
|
|
|
Based on the following commit:
|
|
~~~
|
|
From 16552c01a66633c9e412984d9d92616bd4e5303c Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schwab <schwab@redhat.com>
|
|
Date: Fri, 11 Jun 2010 11:04:11 +0200
|
|
Subject: [PATCH] Properly set __libc_multiple_libcs
|
|
|
|
* elf/rtld.c (_dl_starting_up): Always define.
|
|
(dl_main): Always set _dl_starting_up.
|
|
* elf/dl-support.c (_dl_starting_up): Always define.
|
|
* elf/dl-init.c (_dl_init): Always clear _dl_starting_up.
|
|
|
|
---
|
|
ChangeLog | 7 +++++++
|
|
elf/dl-init.c | 4 ----
|
|
elf/dl-support.c | 2 --
|
|
elf/rtld.c | 4 ----
|
|
4 files changed, 7 insertions(+), 10 deletions(-)
|
|
~~~
|
|
|
|
This patch needs to go upstream to get cleaned up, but has always involed
|
|
analysis of the GNU/Hurd parts of the change and that stalled out, but
|
|
perhaps with build-many-glibcs we can now test these changes more easily.
|
|
|
|
diff --git a/elf/dl-init.c b/elf/dl-init.c
|
|
index 1234611a1c89532e..abd1913fb8de9caf 100644
|
|
--- a/elf/dl-init.c
|
|
+++ b/elf/dl-init.c
|
|
@@ -114,8 +114,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 7704c101c5a543a1..ffa235c78df8481f 100644
|
|
--- a/elf/dl-support.c
|
|
+++ b/elf/dl-support.c
|
|
@@ -120,10 +120,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 b2ea21c98b89831e..f3c37875f4f4dba7 100644
|
|
--- a/elf/rtld.c
|
|
+++ b/elf/rtld.c
|
|
@@ -298,7 +298,6 @@ audit_list_next (struct audit_list *list)
|
|
}
|
|
}
|
|
|
|
-#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
|
|
@@ -308,7 +307,6 @@ audit_list_next (struct audit_list *list)
|
|
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). */
|
|
@@ -1155,10 +1153,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)
|
|
{
|