diff options
| author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2014-11-23 18:12:56 -0800 |
|---|---|---|
| committer | Paul Pluzhnikov <ppluzhnikov@google.com> | 2014-11-23 18:12:56 -0800 |
| commit | cf93513721608bab943c2dc964617ec7ec5dab75 (patch) | |
| tree | 89172493ce3d0e4c6cf02b97f0245bd986997974 /dlfcn/dlopen.c | |
| parent | 6f9557ac2ebba75161875563ba43fcd4a881e149 (diff) | |
| download | glibc-cf93513721608bab943c2dc964617ec7ec5dab75.zip glibc-cf93513721608bab943c2dc964617ec7ec5dab75.tar.gz glibc-cf93513721608bab943c2dc964617ec7ec5dab75.tar.bz2 | |
Fix arm build by only using _itoa when building ld-linux, and not 'sln'. Also disable __google_dlopen_with_offset in fully-static link
Diffstat (limited to 'dlfcn/dlopen.c')
| -rw-r--r-- | dlfcn/dlopen.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c index 319ae6e..c35a9eb 100644 --- a/dlfcn/dlopen.c +++ b/dlfcn/dlopen.c @@ -33,13 +33,6 @@ dlopen (const char *file, int mode) static_link_warning (dlopen) #endif -void * -dlopen_with_offset (const char *file, off_t offset, int mode) -{ - return __dlopen_with_offset (file, offset, mode, RETURN_ADDRESS (0)); -} -static_link_warning (dlopen_with_offset) - #else struct dlopen_args @@ -97,23 +90,13 @@ __dlopen_common (struct dlopen_args *args) # endif } +# ifdef SHARED void * __dlopen_with_offset (const char *file, off_t offset, int mode DL_CALLER_DECL) { -# ifdef SHARED if (!rtld_active ()) return _dlfcn_hook->dlopen_with_offset (file, offset, mode, DL_CALLER); -# endif - - struct dlopen_args oargs; - oargs.file = file; - oargs.offset = offset; - oargs.mode = mode; - oargs.caller = DL_CALLER; - - return __dlopen_common (&oargs); } -# ifdef SHARED strong_alias (__dlopen_with_offset, __google_dlopen_with_offset) # endif |