|
 |
076f82 |
commit 08728256faf69b159b9ecd64f7f8b734f5f456e4
|
|
|
076f82 |
Author: Florian Weimer <fweimer@redhat.com>
|
|
|
076f82 |
Date: Thu Feb 3 10:58:59 2022 +0100
|
|
|
076f82 |
|
|
|
076f82 |
Linux: Assume that NEED_DL_SYSINFO_DSO is always defined
|
|
|
076f82 |
|
|
|
076f82 |
The definition itself is still needed for generic code.
|
|
|
076f82 |
|
|
|
076f82 |
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
|
076f82 |
(cherry picked from commit f19fc997a5754a6c0bb9e43618f0597e878061f7)
|
|
|
076f82 |
|
|
|
076f82 |
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
|
076f82 |
index e36b3e6b63b1aa7e..1829dab4f38b560c 100644
|
|
|
076f82 |
--- a/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
|
076f82 |
+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
|
076f82 |
@@ -134,11 +134,9 @@ _dl_sysdep_start (void **start_argptr,
|
|
|
076f82 |
new_sysinfo = av->a_un.a_val;
|
|
|
076f82 |
break;
|
|
|
076f82 |
#endif
|
|
|
076f82 |
-#ifdef NEED_DL_SYSINFO_DSO
|
|
|
076f82 |
case AT_SYSINFO_EHDR:
|
|
|
076f82 |
GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val;
|
|
|
076f82 |
break;
|
|
|
076f82 |
-#endif
|
|
|
076f82 |
case AT_RANDOM:
|
|
|
076f82 |
_dl_random = (void *) av->a_un.a_val;
|
|
|
076f82 |
break;
|
|
|
076f82 |
@@ -153,10 +151,8 @@ _dl_sysdep_start (void **start_argptr,
|
|
|
076f82 |
#ifdef NEED_DL_SYSINFO
|
|
|
076f82 |
if (new_sysinfo != 0)
|
|
|
076f82 |
{
|
|
|
076f82 |
-# ifdef NEED_DL_SYSINFO_DSO
|
|
|
076f82 |
/* Only set the sysinfo value if we also have the vsyscall DSO. */
|
|
|
076f82 |
if (GLRO(dl_sysinfo_dso) != 0)
|
|
|
076f82 |
-# endif
|
|
|
076f82 |
GLRO(dl_sysinfo) = new_sysinfo;
|
|
|
076f82 |
}
|
|
|
076f82 |
#endif
|
|
|
076f82 |
@@ -309,7 +305,7 @@ int
|
|
|
076f82 |
attribute_hidden
|
|
|
076f82 |
_dl_discover_osversion (void)
|
|
|
076f82 |
{
|
|
|
076f82 |
-#if defined NEED_DL_SYSINFO_DSO && defined SHARED
|
|
|
076f82 |
+#ifdef SHARED
|
|
|
076f82 |
if (GLRO(dl_sysinfo_map) != NULL)
|
|
|
076f82 |
{
|
|
|
076f82 |
/* If the kernel-supplied DSO contains a note indicating the kernel's
|
|
|
076f82 |
@@ -340,7 +336,7 @@ _dl_discover_osversion (void)
|
|
|
076f82 |
}
|
|
|
076f82 |
}
|
|
|
076f82 |
}
|
|
|
076f82 |
-#endif
|
|
|
076f82 |
+#endif /* SHARED */
|
|
|
076f82 |
|
|
|
076f82 |
char bufmem[64];
|
|
|
076f82 |
char *buf = bufmem;
|
|
|
076f82 |
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
|
|
|
076f82 |
index b29986339a7e6cc0..11b93f2fa0af0e71 100644
|
|
|
076f82 |
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
|
|
|
076f82 |
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
|
|
|
076f82 |
@@ -301,8 +301,6 @@ SYSCALL_ERROR_LABEL: \
|
|
|
076f82 |
#define PTR_MANGLE(var) (void) (var)
|
|
|
076f82 |
#define PTR_DEMANGLE(var) (void) (var)
|
|
|
076f82 |
|
|
|
076f82 |
-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
|
|
|
076f82 |
/* M68K needs system-supplied DSO to access TLS helpers
|
|
|
076f82 |
even when statically linked. */
|
|
|
076f82 |
-# define NEED_STATIC_SYSINFO_DSO 1
|
|
|
076f82 |
-#endif
|
|
|
076f82 |
+#define NEED_STATIC_SYSINFO_DSO 1
|