For b/18243822, add back code that was accidentally deleted at the last minute in...

diff --git a/README.google b/README.google
index e1da8143e664acc65a4f1528b6df30c04555f3cc..05c21c995bd9dc2438d76840314351b99c01328e 100644 (file)
--- a/README.google
+++ b/README.google
@@ -414,3 +414,6 @@ sysdeps/x86_64/start.S
   (backport)
   https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=467fec0bb47464ff49e7075194342b028c75c72f
 
+dlfcn/dlopen.c
+  Re-fix b/18243822 which got broken by cr/80600560 (AARCH64 build fix).
+  (ppluzhnikov, google-local)

diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c
index 485e907ae3768699fc0ec15c06f50ea6dc86cac9..8c0c075b658c99790c0256914bd10c01cf140840 100644 (file)
--- a/dlfcn/dlopen.c
+++ b/dlfcn/dlopen.c
@@ -98,6 +98,14 @@ __dlopen_with_offset (const char *file, off_t offset, int mode DL_CALLER_DECL)
 {
   if (__builtin_expect (_dlfcn_hook != NULL, 0))
     return _dlfcn_hook->dlopen_with_offset (file, offset, mode, DL_CALLER);
+
+  struct dlopen_args args;
+  args.file = file;
+  args.offset = offset;
+  args.mode = mode;
+  args.caller = DL_CALLER;
+
+  return __dlopen_common (&args);
 }
 strong_alias (__dlopen_with_offset, __google_dlopen_with_offset)
 # endif