public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/release/2.35/master] Linux: Assume that NEED_DL_SYSINFO_DSO is always defined
@ 2022-05-17 9:58 Florian Weimer
0 siblings, 0 replies; only message in thread
From: Florian Weimer @ 2022-05-17 9:58 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3948c6ca896bdbf4d1ce08afac8a477d990c03cd
commit 3948c6ca896bdbf4d1ce08afac8a477d990c03cd
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Feb 3 10:58:59 2022 +0100
Linux: Assume that NEED_DL_SYSINFO_DSO is always defined
The definition itself is still needed for generic code.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
(cherry picked from commit f19fc997a5754a6c0bb9e43618f0597e878061f7)
Diff:
---
sysdeps/unix/sysv/linux/dl-sysdep.c | 8 ++------
sysdeps/unix/sysv/linux/m68k/sysdep.h | 4 +---
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c
index a13e0ea7ad..2bda76b820 100644
--- a/sysdeps/unix/sysv/linux/dl-sysdep.c
+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c
@@ -134,11 +134,9 @@ _dl_sysdep_start (void **start_argptr,
new_sysinfo = av->a_un.a_val;
break;
#endif
-#ifdef NEED_DL_SYSINFO_DSO
case AT_SYSINFO_EHDR:
GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val;
break;
-#endif
case AT_RANDOM:
_dl_random = (void *) av->a_un.a_val;
break;
@@ -153,10 +151,8 @@ _dl_sysdep_start (void **start_argptr,
#ifdef NEED_DL_SYSINFO
if (new_sysinfo != 0)
{
-# ifdef NEED_DL_SYSINFO_DSO
/* Only set the sysinfo value if we also have the vsyscall DSO. */
if (GLRO(dl_sysinfo_dso) != 0)
-# endif
GLRO(dl_sysinfo) = new_sysinfo;
}
#endif
@@ -309,7 +305,7 @@ int
attribute_hidden
_dl_discover_osversion (void)
{
-#if defined NEED_DL_SYSINFO_DSO && defined SHARED
+#ifdef SHARED
if (GLRO(dl_sysinfo_map) != NULL)
{
/* If the kernel-supplied DSO contains a note indicating the kernel's
@@ -340,7 +336,7 @@ _dl_discover_osversion (void)
}
}
}
-#endif
+#endif /* SHARED */
char bufmem[64];
char *buf = bufmem;
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
index 628e1be835..d87892a377 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
@@ -299,8 +299,6 @@ SYSCALL_ERROR_LABEL: \
#define PTR_MANGLE(var) (void) (var)
#define PTR_DEMANGLE(var) (void) (var)
-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
/* M68K needs system-supplied DSO to access TLS helpers
even when statically linked. */
-# define NEED_STATIC_SYSINFO_DSO 1
-#endif
+#define NEED_STATIC_SYSINFO_DSO 1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-17 9:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-17 9:58 [glibc/release/2.35/master] Linux: Assume that NEED_DL_SYSINFO_DSO is always defined Florian Weimer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).