diff options
| author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2014-12-04 13:56:47 -0800 |
|---|---|---|
| committer | Paul Pluzhnikov <ppluzhnikov@google.com> | 2014-12-04 13:56:47 -0800 |
| commit | 1d1e0535b6fb597f52f9123b6613add0cdaa8481 (patch) | |
| tree | b4f819b9e30469e747bd307a6ff48ed2cfff37f8 | |
| parent | 13e6e91707359ddd6a135d53b0e85af25c1f4cc8 (diff) | |
| download | glibc-1d1e0535b6fb597f52f9123b6613add0cdaa8481.tar glibc-1d1e0535b6fb597f52f9123b6613add0cdaa8481.tar.gz glibc-1d1e0535b6fb597f52f9123b6613add0cdaa8481.tar.bz2 glibc-1d1e0535b6fb597f52f9123b6613add0cdaa8481.zip | |
For b/18243822, add back code that was accidentally deleted at the last minute in cr/80600560, and which is required to actually make
| -rw-r--r-- | README.google | 3 | ||||
| -rw-r--r-- | dlfcn/dlopen.c | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/README.google b/README.google index e1da8143e6..05c21c995b 100644 --- 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 485e907ae3..8c0c075b65 100644 --- 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 |