mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-01 13:17:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Assume that NEED_DL_SYSINFO_DSO is always defined

Browse Source 
The definition itself is still needed for generic code.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2022-02-03 10:58:59 +01:00
parent 2d47fa6862
commit f19fc997a5
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysdeps/unix/sysv/linux/dl-sysdep.c
View File

@ -134,11 +134,9 @@ _dl_sysdep_start (void **start_argptr,
new_sysinfo = av->a_un.a_val; new_sysinfo = av->a_un.a_val;
break; break;
#endif #endif
#ifdef NEED_DL_SYSINFO_DSO
case AT_SYSINFO_EHDR: case AT_SYSINFO_EHDR:
GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val; GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val;
break; break;
#endif
case AT_RANDOM: case AT_RANDOM:
_dl_random = (void *) av->a_un.a_val; _dl_random = (void *) av->a_un.a_val;
break; break;
@ -153,10 +151,8 @@ _dl_sysdep_start (void **start_argptr,
#ifdef NEED_DL_SYSINFO #ifdef NEED_DL_SYSINFO
if (new_sysinfo != 0) if (new_sysinfo != 0)
{ {
# ifdef NEED_DL_SYSINFO_DSO
/* Only set the sysinfo value if we also have the vsyscall DSO. */ /* Only set the sysinfo value if we also have the vsyscall DSO. */
if (GLRO(dl_sysinfo_dso) != 0) if (GLRO(dl_sysinfo_dso) != 0)
# endif
GLRO(dl_sysinfo) = new_sysinfo; GLRO(dl_sysinfo) = new_sysinfo;
} }
#endif #endif
@ -309,7 +305,7 @@ int
attribute_hidden attribute_hidden
_dl_discover_osversion (void) _dl_discover_osversion (void)
{ {
#if defined NEED_DL_SYSINFO_DSO && defined SHARED #ifdef SHARED
if (GLRO(dl_sysinfo_map) != NULL) if (GLRO(dl_sysinfo_map) != NULL)
{ {
/* If the kernel-supplied DSO contains a note indicating the kernel's /* 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 bufmem[64];
char *buf = bufmem; char *buf = bufmem;

4
sysdeps/unix/sysv/linux/m68k/sysdep.h
View File

@ -299,8 +299,6 @@ SYSCALL_ERROR_LABEL: \
#define PTR_MANGLE(var) (void) (var) #define PTR_MANGLE(var) (void) (var)
#define PTR_DEMANGLE(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 /* M68K needs system-supplied DSO to access TLS helpers
even when statically linked. */ even when statically linked. */
# define NEED_STATIC_SYSINFO_DSO 1 #define NEED_STATIC_SYSINFO_DSO 1
#endif