[06/23] ia64: Remove _dl_var_init

Message ID c981e5cdeec861813104551217ad7447f43fd30b.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)
and GLRO (dl_clktck).
---
 sysdeps/unix/sysv/linux/ia64/Makefile    |  4 --
 sysdeps/unix/sysv/linux/ia64/Versions    |  5 --
 sysdeps/unix/sysv/linux/ia64/dl-static.c | 61 ------------------------
 sysdeps/unix/sysv/linux/ia64/ldsodefs.h  | 32 -------------
 4 files changed, 102 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/ia64/dl-static.c
 delete mode 100644 sysdeps/unix/sysv/linux/ia64/ldsodefs.h

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

> and GLRO (dl_clktck).


LGTM.

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


> ---

>  sysdeps/unix/sysv/linux/ia64/Makefile    |  4 --

>  sysdeps/unix/sysv/linux/ia64/Versions    |  5 --

>  sysdeps/unix/sysv/linux/ia64/dl-static.c | 61 ------------------------

>  sysdeps/unix/sysv/linux/ia64/ldsodefs.h  | 32 -------------

>  4 files changed, 102 deletions(-)

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

>  delete mode 100644 sysdeps/unix/sysv/linux/ia64/ldsodefs.h

> 

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

> index f6a08d15d0..da85ba43e2 100644

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

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

> @@ -13,10 +13,6 @@ sysdep_routines += ioperm clone2

>  gen-as-const-headers += sigaltstack-offsets.sym

>  endif

>  

> -ifeq ($(subdir),elf)

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

> -endif

> -

>  ifeq ($(subdir),rt)

>  librt-routines += rt-sysdep

>  librt-shared-only-routines += rt-sysdep

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

> index 116f4e8503..214e6f9f1a 100644

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

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

> @@ -1,8 +1,3 @@

> -ld {

> -  GLIBC_PRIVATE {

> -    _dl_var_init;

> -  }

> -}

>  libc {

>    GLIBC_2.2 {

>      ioperm; iopl;

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

> deleted file mode 100644

> index 1cc2563b36..0000000000

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

> +++ /dev/null

> @@ -1,61 +0,0 @@

> -/* Variable initialization.  IA-64 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,

> -      DL_CLKTCK

> -    };

> -

> -  GLRO(dl_pagesize) = *((size_t *) array[DL_PAGESIZE]);

> -  GLRO(dl_clktck) = *((int *) array[DL_CLKTCK]);

> -}

> -

> -#else

> -

> -static void *variables[] =

> -{

> -  &GLRO(dl_pagesize),

> -  &GLRO(dl_clktck)

> -};

> -

> -void

> -_dl_static_init (struct link_map *map)

> -{

> -  const ElfW(Sym) *ref = NULL;

> -  lookup_t loadbase;

> -  void (*f) (void *[]);

> -

> -  loadbase = _dl_lookup_symbol_x ("_dl_var_init", map, &ref,

> -				  map->l_local_scope, NULL, 0, 1, NULL);

> -  if (ref != NULL)

> -    {

> -      f = (void (*) (void *[])) DL_SYMBOL_ADDRESS (loadbase, ref);

> -      f (variables);

> -    }

> -}

> -

> -#endif

> diff --git a/sysdeps/unix/sysv/linux/ia64/ldsodefs.h b/sysdeps/unix/sysv/linux/ia64/ldsodefs.h

> deleted file mode 100644

> index c868efe592..0000000000

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

> +++ /dev/null

> @@ -1,32 +0,0 @@

> -/* Run-time dynamic linker data structures for loaded ELF shared objects. IA64.

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

> -

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

>

Patch

diff --git a/sysdeps/unix/sysv/linux/ia64/Makefile b/sysdeps/unix/sysv/linux/ia64/Makefile
index f6a08d15d0..da85ba43e2 100644
--- a/sysdeps/unix/sysv/linux/ia64/Makefile
+++ b/sysdeps/unix/sysv/linux/ia64/Makefile
@@ -13,10 +13,6 @@  sysdep_routines += ioperm clone2
 gen-as-const-headers += sigaltstack-offsets.sym
 endif
 
-ifeq ($(subdir),elf)
-sysdep-dl-routines += dl-static
-endif
-
 ifeq ($(subdir),rt)
 librt-routines += rt-sysdep
 librt-shared-only-routines += rt-sysdep
diff --git a/sysdeps/unix/sysv/linux/ia64/Versions b/sysdeps/unix/sysv/linux/ia64/Versions
index 116f4e8503..214e6f9f1a 100644
--- a/sysdeps/unix/sysv/linux/ia64/Versions
+++ b/sysdeps/unix/sysv/linux/ia64/Versions
@@ -1,8 +1,3 @@ 
-ld {
-  GLIBC_PRIVATE {
-    _dl_var_init;
-  }
-}
 libc {
   GLIBC_2.2 {
     ioperm; iopl;
diff --git a/sysdeps/unix/sysv/linux/ia64/dl-static.c b/sysdeps/unix/sysv/linux/ia64/dl-static.c
deleted file mode 100644
index 1cc2563b36..0000000000
--- a/sysdeps/unix/sysv/linux/ia64/dl-static.c
+++ /dev/null
@@ -1,61 +0,0 @@ 
-/* Variable initialization.  IA-64 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,
-      DL_CLKTCK
-    };
-
-  GLRO(dl_pagesize) = *((size_t *) array[DL_PAGESIZE]);
-  GLRO(dl_clktck) = *((int *) array[DL_CLKTCK]);
-}
-
-#else
-
-static void *variables[] =
-{
-  &GLRO(dl_pagesize),
-  &GLRO(dl_clktck)
-};
-
-void
-_dl_static_init (struct link_map *map)
-{
-  const ElfW(Sym) *ref = NULL;
-  lookup_t loadbase;
-  void (*f) (void *[]);
-
-  loadbase = _dl_lookup_symbol_x ("_dl_var_init", map, &ref,
-				  map->l_local_scope, NULL, 0, 1, NULL);
-  if (ref != NULL)
-    {
-      f = (void (*) (void *[])) DL_SYMBOL_ADDRESS (loadbase, ref);
-      f (variables);
-    }
-}
-
-#endif
diff --git a/sysdeps/unix/sysv/linux/ia64/ldsodefs.h b/sysdeps/unix/sysv/linux/ia64/ldsodefs.h
deleted file mode 100644
index c868efe592..0000000000
--- a/sysdeps/unix/sysv/linux/ia64/ldsodefs.h
+++ /dev/null
@@ -1,32 +0,0 @@ 
-/* Run-time dynamic linker data structures for loaded ELF shared objects. IA64.
-   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/>.  */
-
-#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 */