[08/23] mips: Remove _dl_var_init

Message ID 39e443d8c6048bb2509de5498ad36935f7126261.1620838411.git.fweimer@redhat.com
State New
Headers show
Series
  • nptl: Move almost all remaining functions into libc
Related show

Commit Message

Adhemerval Zanella via Libc-alpha May 12, 2021, 4:57 p.m.
The generic __rtld_static_init code handles GLRO (dl_pagesize).
---
 sysdeps/unix/sysv/linux/mips/Makefile    |  4 --
 sysdeps/unix/sysv/linux/mips/Versions    |  6 --
 sysdeps/unix/sysv/linux/mips/dl-static.c | 84 ------------------------
 sysdeps/unix/sysv/linux/mips/ldsodefs.h  |  6 --
 4 files changed, 100 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/mips/dl-static.c

-- 
2.31.1

Comments

Adhemerval Zanella via Libc-alpha May 13, 2021, 7:37 p.m. | #1
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/mips/Makefile    |  4 --

>  sysdeps/unix/sysv/linux/mips/Versions    |  6 --

>  sysdeps/unix/sysv/linux/mips/dl-static.c | 84 ------------------------

>  sysdeps/unix/sysv/linux/mips/ldsodefs.h  |  6 --

>  4 files changed, 100 deletions(-)

>  delete mode 100644 sysdeps/unix/sysv/linux/mips/dl-static.c

> 

> diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile

> index 026ba242cf..d5725c69d8 100644

> --- a/sysdeps/unix/sysv/linux/mips/Makefile

> +++ b/sysdeps/unix/sysv/linux/mips/Makefile

> @@ -57,10 +57,6 @@ abi-n64_hard_2008-condition := defined(__mips_nan2008) \

>  			       && (_MIPS_SIM == _MIPS_SIM_ABI64)

>  

>  ifeq ($(subdir),elf)

> -ifeq ($(build-shared),yes)

> -# This is needed for DSO loading from static binaries.

> -sysdep-dl-routines += dl-static

> -endif

>  # If the compiler doesn't use GNU.stack note,

>  # this test is expected to fail.

>  ifneq ($(mips-has-gnustack),yes)

> diff --git a/sysdeps/unix/sysv/linux/mips/Versions b/sysdeps/unix/sysv/linux/mips/Versions

> index 0ec82dc480..aeaac41744 100644

> --- a/sysdeps/unix/sysv/linux/mips/Versions

> +++ b/sysdeps/unix/sysv/linux/mips/Versions

> @@ -1,9 +1,3 @@

> -ld {

> -  GLIBC_PRIVATE {

> -    # used for loading by static libraries

> -    _dl_var_init;

> -  }

> -}

>  libc {

>    GLIBC_2.0 {

>      _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;

> diff --git a/sysdeps/unix/sysv/linux/mips/dl-static.c b/sysdeps/unix/sysv/linux/mips/dl-static.c

> deleted file mode 100644

> index 07947c2a00..0000000000

> --- a/sysdeps/unix/sysv/linux/mips/dl-static.c

> +++ /dev/null

> @@ -1,84 +0,0 @@

> -/* Variable initialization.  MIPS version.

> -   Copyright (C) 2001-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/mips/ldsodefs.h b/sysdeps/unix/sysv/linux/mips/ldsodefs.h

> index 7510248ef0..f609eb12c3 100644

> --- a/sysdeps/unix/sysv/linux/mips/ldsodefs.h

> +++ b/sysdeps/unix/sysv/linux/mips/ldsodefs.h

> @@ -23,12 +23,6 @@

>  

>  /* 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)

> -

>  /* Allow ABIVERSION == 1, meaning PLTs and copy relocations are

>     required, with ELFOSABI_SYSV, and ELFOSABI_GNU.  */

>  #undef VALID_ELF_ABIVERSION

>

Patch

diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile
index 026ba242cf..d5725c69d8 100644
--- a/sysdeps/unix/sysv/linux/mips/Makefile
+++ b/sysdeps/unix/sysv/linux/mips/Makefile
@@ -57,10 +57,6 @@  abi-n64_hard_2008-condition := defined(__mips_nan2008) \
 			       && (_MIPS_SIM == _MIPS_SIM_ABI64)
 
 ifeq ($(subdir),elf)
-ifeq ($(build-shared),yes)
-# This is needed for DSO loading from static binaries.
-sysdep-dl-routines += dl-static
-endif
 # If the compiler doesn't use GNU.stack note,
 # this test is expected to fail.
 ifneq ($(mips-has-gnustack),yes)
diff --git a/sysdeps/unix/sysv/linux/mips/Versions b/sysdeps/unix/sysv/linux/mips/Versions
index 0ec82dc480..aeaac41744 100644
--- a/sysdeps/unix/sysv/linux/mips/Versions
+++ b/sysdeps/unix/sysv/linux/mips/Versions
@@ -1,9 +1,3 @@ 
-ld {
-  GLIBC_PRIVATE {
-    # used for loading by static libraries
-    _dl_var_init;
-  }
-}
 libc {
   GLIBC_2.0 {
     _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
diff --git a/sysdeps/unix/sysv/linux/mips/dl-static.c b/sysdeps/unix/sysv/linux/mips/dl-static.c
deleted file mode 100644
index 07947c2a00..0000000000
--- a/sysdeps/unix/sysv/linux/mips/dl-static.c
+++ /dev/null
@@ -1,84 +0,0 @@ 
-/* Variable initialization.  MIPS version.
-   Copyright (C) 2001-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/mips/ldsodefs.h b/sysdeps/unix/sysv/linux/mips/ldsodefs.h
index 7510248ef0..f609eb12c3 100644
--- a/sysdeps/unix/sysv/linux/mips/ldsodefs.h
+++ b/sysdeps/unix/sysv/linux/mips/ldsodefs.h
@@ -23,12 +23,6 @@ 
 
 /* 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)
-
 /* Allow ABIVERSION == 1, meaning PLTs and copy relocations are
    required, with ELFOSABI_SYSV, and ELFOSABI_GNU.  */
 #undef VALID_ELF_ABIVERSION