public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/maskray/grte] Add a hunk lost in merge
@ 2021-08-27 23:25 Fangrui Song
0 siblings, 0 replies; only message in thread
From: Fangrui Song @ 2021-08-27 23:25 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=641cae4c36e4d34ebc14690f5db05b3330be46f5
commit 641cae4c36e4d34ebc14690f5db05b3330be46f5
Author: Stan Shebs <stanshebs@google.com>
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-27 23:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-27 23:25 [glibc/maskray/grte] Add a hunk lost in merge Fangrui Song
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).