From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7814) id B72F0385843B; Sat, 28 Aug 2021 00:41:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B72F0385843B Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Fangrui Song To: glibc-cvs@sourceware.org Subject: [glibc/google/grte/v5-2.27/master] Add a hunk lost in merge X-Act-Checkin: glibc X-Git-Author: Stan Shebs X-Git-Refname: refs/heads/google/grte/v5-2.27/master X-Git-Oldrev: 349ff1d0d5ea752b277798137bb00174694ea212 X-Git-Newrev: 641cae4c36e4d34ebc14690f5db05b3330be46f5 Message-Id: <20210828004123.B72F0385843B@sourceware.org> Date: Sat, 28 Aug 2021 00:41:23 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Aug 2021 00:41:23 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=641cae4c36e4d34ebc14690f5db05b3330be46f5 commit 641cae4c36e4d34ebc14690f5db05b3330be46f5 Author: Stan Shebs Date: Wed Mar 28 20:31:52 2018 -0700 Add a hunk lost in merge Diff: --- dlfcn/dlopen.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c index c35a9eb66b..faf7a48ea7 100644 --- a/dlfcn/dlopen.c +++ b/dlfcn/dlopen.c @@ -96,6 +96,14 @@ __dlopen_with_offset (const char *file, off_t offset, int mode DL_CALLER_DECL) { if (!rtld_active ()) return _dlfcn_hook->dlopen_with_offset (file, offset, mode, DL_CALLER); + + struct dlopen_args oargs; + oargs.file = file; + oargs.offset = offset; + oargs.mode = mode; + oargs.caller = DL_CALLER; + + return __dlopen_common (&oargs); } strong_alias (__dlopen_with_offset, __google_dlopen_with_offset) # endif