public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Fangrui Song <maskray@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/google/grte/v5-2.27/master] Add a hunk lost in merge
Date: Sat, 28 Aug 2021 00:41:23 +0000 (GMT)	[thread overview]
Message-ID: <20210828004123.B72F0385843B@sourceware.org> (raw)

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


                 reply	other threads:[~2021-08-28  0:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210828004123.B72F0385843B@sourceware.org \
    --to=maskray@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).