From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 1DB3438582A9; Thu, 1 Feb 2024 07:59:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1DB3438582A9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1706774365; bh=dDkNLqV17Nsu+6lSR5l4qH+7Wy4gIIVPVI9Dk0Ryz44=; h=From:To:Subject:Date:From; b=VbhK7JlVer2kUd1YF8XTaxmv3kyV46iELF51tKycZRwGbNveTFuvC7mHEQQ6858GK lbUvKzRXthL2OQz8ETRVp7GLrKlszoIX3ADV6+4hzV3OU+9Cy0S+Fa2TsU1OPl55jX +phaBl+rSj9TqvItrcjjAGriXliAlIZoPsyKLrgc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] elf: Remove _dl_sysdep_open_object hook function X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 0d70accc06a9cbb9b13004116f5fa8b1f41a7150 X-Git-Newrev: 7c8df0b9441e34928f2d7d70531e3d55e016c32e Message-Id: <20240201075925.1DB3438582A9@sourceware.org> Date: Thu, 1 Feb 2024 07:59:25 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7c8df0b9441e34928f2d7d70531e3d55e016c32e commit 7c8df0b9441e34928f2d7d70531e3d55e016c32e Author: Florian Weimer Date: Thu Feb 1 08:59:02 2024 +0100 elf: Remove _dl_sysdep_open_object hook function It is currently not used by any target. Diff: --- elf/dl-load.c | 15 --------------- elf/dl-sysdep-open.h | 45 --------------------------------------------- 2 files changed, 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 #include #include -#include #include #include @@ -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 - . */ - -#ifndef _DL_SYSDEP_OPEN_H -#define _DL_SYSDEP_OPEN_H 1 - -#include -#include - -/* 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 */