AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

For b/18243822, add back code that was accidentally deleted at the last minute in cr/80600560, and which is required to actually make

Browse Source
This commit is contained in:
Paul Pluzhnikov 2014-12-04 13:56:47 -08:00
parent 13e6e91707
commit 1d1e0535b6
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.google
View File

@ -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)

8
dlfcn/dlopen.c
View File

@ -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