| Message ID | c2b1cf67d4e35980b784271fa7bfb7cd0d8b82dc.1643886336.git.fweimer@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Linux: Auxiliary vector parsing cleanups | expand |
On 03/02/2022 08:08, Florian Weimer via Libc-alpha wrote: > The definition itself is still needed for generic code. LGTM, thanks. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > 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
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