diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-03 08:26:04 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-03 08:26:04 +0200 |
| commit | 6a1ed32789eaec6e1cd4345552e7342b5b18da5f (patch) | |
| tree | cb2adb82af54f07d6d086d8b91c42d6d5fec23ac /include/dlfcn.h | |
| parent | 77f876c0e3ac08a98daa60fbad44061d4e4c3d14 (diff) | |
| download | glibc-6a1ed32789eaec6e1cd4345552e7342b5b18da5f.tar.gz glibc-6a1ed32789eaec6e1cd4345552e7342b5b18da5f.tar.xz glibc-6a1ed32789eaec6e1cd4345552e7342b5b18da5f.zip | |
dlfcn: Move dlmopen into libc
The symbol was moved using scripts/move-symbol-to-libc.py. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'include/dlfcn.h')
| -rw-r--r-- | include/dlfcn.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/dlfcn.h b/include/dlfcn.h index 2b174f8670..27309ab1dd 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -15,15 +15,15 @@ #define __LM_ID_CALLER -2 +/* These variables are defined and initialized in the startup code. */ +extern int __libc_argc attribute_hidden; +extern char **__libc_argv attribute_hidden; + #ifdef SHARED /* Locally stored program arguments. */ extern int __dlfcn_argc attribute_hidden; extern char **__dlfcn_argv attribute_hidden; #else -/* These variables are defined and initialized in the startup code. */ -extern int __libc_argc attribute_hidden; -extern char **__libc_argv attribute_hidden; - # define __dlfcn_argc __libc_argc # define __dlfcn_argv __libc_argv #endif @@ -133,8 +133,8 @@ libc_hidden_proto (_dlfcn_hook) extern void *__dlopen (const char *file, int mode DL_CALLER_DECL) attribute_hidden; -extern void *__dlmopen (Lmid_t nsid, const char *file, int mode DL_CALLER_DECL) - attribute_hidden; +extern void *__dlmopen (Lmid_t nsid, const char *file, int mode, + void *dl_caller); extern int __dlclose (void *handle); extern void *__dlsym (void *handle, const char *name, void *dl_caller); extern void *__dlvsym (void *handle, const char *name, const char *version |