From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH v2 4/5] Linux: Assume that NEED_DL_SYSINFO_DSO is always defined
Date: Thu, 03 Feb 2022 12:08:29 +0100 [thread overview]
Message-ID: <c2b1cf67d4e35980b784271fa7bfb7cd0d8b82dc.1643886336.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1643886336.git.fweimer@redhat.com>
The definition itself is still needed for generic code.
---
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
--
2.34.1
next prev parent reply other threads:[~2022-02-03 11:08 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-03 11:08 [PATCH v2 0/5] Linux: Auxiliary vector parsing cleanups Florian Weimer
2022-02-03 11:08 ` [PATCH v2 1/5] elf: Merge dl-sysdep.c into the Linux version Florian Weimer
2022-02-08 20:09 ` Adhemerval Zanella
2022-02-03 11:08 ` [PATCH v2 2/5] Linux: Remove HAVE_AUX_SECURE, HAVE_AUX_XID, HAVE_AUX_PAGESIZE Florian Weimer
2022-02-08 20:11 ` Adhemerval Zanella
2022-02-03 11:08 ` [PATCH v2 3/5] Linux: Remove DL_FIND_ARG_COMPONENTS Florian Weimer
2022-02-08 20:12 ` Adhemerval Zanella
2022-02-03 11:08 ` Florian Weimer [this message]
2022-02-08 20:13 ` [PATCH v2 4/5] Linux: Assume that NEED_DL_SYSINFO_DSO is always defined Adhemerval Zanella
2022-02-03 11:08 ` [PATCH v2 5/5] Linux: Consolidate auxiliary vector parsing Florian Weimer
2022-02-08 20:19 ` Adhemerval Zanella
2022-02-08 20:34 ` Florian Weimer
2022-02-08 22:57 ` Adhemerval Zanella
2022-02-10 10:54 ` Florian Weimer
2022-02-10 11:29 ` Adhemerval Zanella
2022-02-10 11:31 ` Florian Weimer
2022-02-10 11:40 ` Adhemerval Zanella
2022-02-10 11:46 ` Adhemerval Zanella
2022-02-11 12:31 ` Szabolcs Nagy
2022-02-11 12:47 ` Adhemerval Zanella
2022-02-11 13:24 ` Szabolcs Nagy
2022-02-11 13:48 ` Adhemerval Zanella
2022-02-11 14:42 ` H.J. Lu
2022-02-11 14:56 ` Florian Weimer
2022-02-11 13:49 ` Florian Weimer
2022-02-11 14:17 ` Adhemerval Zanella
2022-02-11 14:29 ` Szabolcs Nagy
2022-02-11 18:15 ` Adhemerval Zanella
2022-02-11 17:32 ` Florian Weimer
2022-02-11 17:49 ` Szabolcs Nagy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c2b1cf67d4e35980b784271fa7bfb7cd0d8b82dc.1643886336.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).