diff options
author | Florian Weimer <fweimer@redhat.com> | 2024-02-01 08:59:02 +0100 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2024-02-01 08:59:02 +0100 |
commit | 7c8df0b9441e34928f2d7d70531e3d55e016c32e (patch) | |
tree | 1edb6203fb1bc53d05df06b2a3013be8fa54c6a1 | |
parent | 0d70accc06a9cbb9b13004116f5fa8b1f41a7150 (diff) | |
download | glibc-7c8df0b9441e34928f2d7d70531e3d55e016c32e.tar glibc-7c8df0b9441e34928f2d7d70531e3d55e016c32e.tar.gz glibc-7c8df0b9441e34928f2d7d70531e3d55e016c32e.tar.bz2 glibc-7c8df0b9441e34928f2d7d70531e3d55e016c32e.zip |
elf: Remove _dl_sysdep_open_object hook function
It is currently not used by any target.
-rw-r--r-- | elf/dl-load.c | 15 | ||||
-rw-r--r-- | elf/dl-sysdep-open.h | 45 |
2 files changed, 0 insertions, 60 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index ce8fdea302..a34cb3559c 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -72,7 +72,6 @@ struct filebuf #include <dl-map-segments.h> #include <dl-unmap-segments.h> #include <dl-machine-reject-phdr.h> -#include <dl-sysdep-open.h> #include <dl-prop.h> #include <not-cancel.h> @@ -2091,20 +2090,6 @@ _dl_map_object (struct link_map *loader, const char *name, &loader->l_runpath_dirs, &realname, &fb, loader, LA_SER_RUNPATH, &found_other_class); - if (fd == -1) - { - realname = _dl_sysdep_open_object (name, namelen, &fd); - if (realname != NULL) - { - fd = open_verify (realname, fd, - &fb, loader ?: GL(dl_ns)[nsid]._ns_loaded, - LA_SER_CONFIG, mode, &found_other_class, - false); - if (fd == -1) - free (realname); - } - } - #ifdef USE_LDCONFIG if (fd == -1 && (__glibc_likely ((mode & __RTLD_SECURE) == 0) diff --git a/elf/dl-sysdep-open.h b/elf/dl-sysdep-open.h deleted file mode 100644 index 73ebc1086e..0000000000 --- a/elf/dl-sysdep-open.h +++ /dev/null @@ -1,45 +0,0 @@ -/* System-specific call to open a shared object by name. Stub version. - Copyright (C) 2015-2024 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 _DL_SYSDEP_OPEN_H -#define _DL_SYSDEP_OPEN_H 1 - -#include <assert.h> -#include <stddef.h> - -/* NAME is a name without slashes, as it appears in a DT_NEEDED entry - or a dlopen call's argument or suchlike. NAMELEN is (strlen (NAME) + 1). - - Find NAME in an OS-dependent fashion, and return its "real" name. - Optionally fill in *FD with a file descriptor open on that file (or - else leave its initial value of -1). The return value is a new - malloc'd string, which will be free'd by the caller. If NAME is - resolved to an actual file that can be opened, then the return - value should name that file (and if *FD was not set, then a normal - __open call on that string will be made). If *FD was set by some - other means than a normal open and there is no "real" name to use, - then __strdup (NAME) is fine (modulo error checking). */ - -static inline char * -_dl_sysdep_open_object (const char *name, size_t namelen, int *fd) -{ - assert (*fd == -1); - return NULL; -} - -#endif /* dl-sysdep-open.h */ |