Re: [PATCH 07/23] m68k: Remove _dl_var_init

[Adhemerval Zanella <adhemerval.zanella@linaro.org>]

On 12/05/2021 13:57, Florian Weimer via Libc-alpha wrote:
> The generic __rtld_static_init code handles GLRO (dl_pagesize).

LGTM.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  sysdeps/unix/sysv/linux/m68k/Makefile    |  1 -
>  sysdeps/unix/sysv/linux/m68k/Versions    |  5 --
>  sysdeps/unix/sysv/linux/m68k/dl-static.c | 84 ------------------------
>  sysdeps/unix/sysv/linux/m68k/ldsodefs.h  | 32 ---------
>  4 files changed, 122 deletions(-)
>  delete mode 100644 sysdeps/unix/sysv/linux/m68k/dl-static.c
>  delete mode 100644 sysdeps/unix/sysv/linux/m68k/ldsodefs.h
> 
> diff --git a/sysdeps/unix/sysv/linux/m68k/Makefile b/sysdeps/unix/sysv/linux/m68k/Makefile
> index be40fae68a..18ad2bf0ee 100644
> --- a/sysdeps/unix/sysv/linux/m68k/Makefile
> +++ b/sysdeps/unix/sysv/linux/m68k/Makefile
> @@ -17,7 +17,6 @@ sysdep_headers += sys/reg.h
>  endif
>  
>  ifeq ($(subdir),elf)
> -sysdep-dl-routines += dl-static
>  sysdep-others += lddlibc4
>  install-bin += lddlibc4
>  endif
> diff --git a/sysdeps/unix/sysv/linux/m68k/Versions b/sysdeps/unix/sysv/linux/m68k/Versions
> index 4b18795513..d98ae120c1 100644
> --- a/sysdeps/unix/sysv/linux/m68k/Versions
> +++ b/sysdeps/unix/sysv/linux/m68k/Versions
> @@ -1,8 +1,3 @@
> -ld {
> -  GLIBC_PRIVATE {
> -    _dl_var_init;
> -  }
> -}
>  libc {
>    GLIBC_2.0 {
>      # Exception handling support functions from libgcc
> diff --git a/sysdeps/unix/sysv/linux/m68k/dl-static.c b/sysdeps/unix/sysv/linux/m68k/dl-static.c
> deleted file mode 100644
> index e959d8b750..0000000000
> --- a/sysdeps/unix/sysv/linux/m68k/dl-static.c
> +++ /dev/null
> @@ -1,84 +0,0 @@
> -/* Variable initialization.  M68K version.
> -   Copyright (C) 2013-2021 Free Software Foundation, Inc.
> -   This file is part of the GNU C Library.
> -
> -   The GNU C Library is free software; you can redistribute it and/or
> -   modify it under the terms of the GNU Lesser General Public
> -   License as published by the Free Software Foundation; either
> -   version 2.1 of the License, or (at your option) any later version.
> -
> -   The GNU C Library is distributed in the hope that it will be useful,
> -   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -   Lesser General Public License for more details.
> -
> -   You should have received a copy of the GNU Lesser General Public
> -   License along with the GNU C Library; if not, see
> -   <https://www.gnu.org/licenses/>.  */
> -
> -#include <ldsodefs.h>
> -
> -#ifdef SHARED
> -
> -void
> -_dl_var_init (void *array[])
> -{
> -  /* It has to match "variables" below. */
> -  enum
> -    {
> -      DL_PAGESIZE = 0,
> -    };
> -
> -  GLRO(dl_pagesize) = *(size_t *) array[DL_PAGESIZE];
> -}
> -
> -#else
> -
> -static void *variables[] =
> -{
> -  &GLRO(dl_pagesize)
> -};
> -
> -static void
> -_dl_unprotect_relro (struct link_map *l)
> -{
> -  ElfW(Addr) start = ((l->l_addr + l->l_relro_addr)
> -		      & ~(GLRO(dl_pagesize) - 1));
> -  ElfW(Addr) end = ((l->l_addr + l->l_relro_addr + l->l_relro_size)
> -		    & ~(GLRO(dl_pagesize) - 1));
> -
> -  if (start != end)
> -    __mprotect ((void *) start, end - start, PROT_READ | PROT_WRITE);
> -}
> -
> -void
> -_dl_static_init (struct link_map *l)
> -{
> -  struct link_map *rtld_map = l;
> -  struct r_scope_elem **scope;
> -  const ElfW(Sym) *ref = NULL;
> -  lookup_t loadbase;
> -  void (*f) (void *[]);
> -  size_t i;
> -
> -  loadbase = _dl_lookup_symbol_x ("_dl_var_init", l, &ref, l->l_local_scope,
> -				  NULL, 0, 1, NULL);
> -
> -  for (scope = l->l_local_scope; *scope != NULL; scope++)
> -    for (i = 0; i < (*scope)->r_nlist; i++)
> -      if ((*scope)->r_list[i] == loadbase)
> -	{
> -	  rtld_map = (*scope)->r_list[i];
> -	  break;
> -	}
> -
> -  if (ref != NULL)
> -    {
> -      f = (void (*) (void *[])) DL_SYMBOL_ADDRESS (loadbase, ref);
> -      _dl_unprotect_relro (rtld_map);
> -      f (variables);
> -      _dl_protect_relro (rtld_map);
> -    }
> -}
> -
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/m68k/ldsodefs.h b/sysdeps/unix/sysv/linux/m68k/ldsodefs.h
> deleted file mode 100644
> index ef46b21ed8..0000000000
> --- a/sysdeps/unix/sysv/linux/m68k/ldsodefs.h
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -/* Run-time dynamic linker data structures for loaded ELF shared objects. M68K.
> -   Copyright (C) 2013-2021 Free Software Foundation, Inc.
> -   This file is part of the GNU C Library.
> -
> -   The GNU C Library is free software; you can redistribute it and/or
> -   modify it under the terms of the GNU Lesser General Public
> -   License as published by the Free Software Foundation; either
> -   version 2.1 of the License, or (at your option) any later version.
> -
> -   The GNU C Library is distributed in the hope that it will be useful,
> -   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -   Lesser General Public License for more details.
> -
> -   You should have received a copy of the GNU Lesser General Public
> -   License along with the GNU C Library; if not, see
> -   <https://www.gnu.org/licenses/>.  */
> -
> -#ifndef	_LDSODEFS_H
> -
> -/* Get the real definitions.  */
> -#include_next <ldsodefs.h>
> -
> -/* Now define our stuff.  */
> -
> -/* We need special support to initialize DSO loaded for statically linked
> -   binaries.  */
> -extern void _dl_static_init (struct link_map *map);
> -#undef DL_STATIC_INIT
> -#define DL_STATIC_INIT(map) _dl_static_init (map)
> -
> -#endif /* ldsodefs.h */
>