diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-11-30 15:59:57 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-11-30 15:59:57 +0100 |
| commit | 9e78f6f6e7134a5f299cc8de77370218f8019237 (patch) | |
| tree | 04aa339daf9901b8fc1851353c697528659e7afe /dlfcn | |
| parent | 705a79f82560ff6472cebed86aa5db04cdea3bce (diff) | |
| download | glibc-9e78f6f6e7134a5f299cc8de77370218f8019237.tar.gz | |
Implement _dl_catch_error, _dl_signal_error in libc.so [BZ #16628]
This change moves the main implementation of _dl_catch_error,
_dl_signal_error to libc.so, where TLS variables can be used
directly. This removes a writable function pointer from the
rtld_global variable.
For use during initial relocation, minimal implementations of these
functions are provided in ld.so. These are eventually interposed
by the libc.so implementations. This is implemented by compiling
elf/dl-error-skeleton.c twice, via elf/dl-error.c and
elf/dl-error-minimal.c.
As a side effect of this change, the static version of dl-error.c
no longer includes support for the
_dl_signal_cerror/_dl_receive_error mechanism because it is only
used in ld.so.
Diffstat (limited to 'dlfcn')
| -rw-r--r-- | dlfcn/dlerror.c | 4 | ||||
| -rw-r--r-- | dlfcn/dlinfo.c | 4 | ||||
| -rw-r--r-- | dlfcn/dlmopen.c | 4 | ||||
| -rw-r--r-- | dlfcn/dlopen.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c index 41b2bd6bf2..e0e5648696 100644 --- a/dlfcn/dlerror.c +++ b/dlfcn/dlerror.c @@ -160,8 +160,8 @@ _dlerror_run (void (*operate) (void *), void *args) result->errstring = NULL; } - result->errcode = GLRO(dl_catch_error) (&result->objname, &result->errstring, - &result->malloced, operate, args); + result->errcode = _dl_catch_error (&result->objname, &result->errstring, + &result->malloced, operate, args); /* If no error we mark that no error string is available. */ result->returned = result->errstring == NULL; diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c index eeba8da408..794e354c23 100644 --- a/dlfcn/dlinfo.c +++ b/dlfcn/dlinfo.c @@ -60,7 +60,7 @@ dlinfo_doit (void *argsblock) break; if (l == NULL) - GLRO(dl_signal_error) (0, NULL, NULL, N_("\ + _dl_signal_error (0, NULL, NULL, N_("\ RTLD_SELF used in code not dynamically loaded")); } # endif @@ -69,7 +69,7 @@ RTLD_SELF used in code not dynamically loaded")); { case RTLD_DI_CONFIGADDR: default: - GLRO(dl_signal_error) (0, NULL, NULL, N_("unsupported dlinfo request")); + _dl_signal_error (0, NULL, NULL, N_("unsupported dlinfo request")); break; case RTLD_DI_LMID: diff --git a/dlfcn/dlmopen.c b/dlfcn/dlmopen.c index 6da0d0d691..4eed5136f5 100644 --- a/dlfcn/dlmopen.c +++ b/dlfcn/dlmopen.c @@ -60,12 +60,12 @@ dlmopen_doit (void *a) must be the main one. */ if (args->file == NULL) # endif - GLRO(dl_signal_error) (EINVAL, NULL, NULL, N_("invalid namespace")); + _dl_signal_error (EINVAL, NULL, NULL, N_("invalid namespace")); /* It makes no sense to use RTLD_GLOBAL when loading a DSO into a namespace other than the base namespace. */ if (__glibc_unlikely (args->mode & RTLD_GLOBAL)) - GLRO(dl_signal_error) (EINVAL, NULL, NULL, N_("invalid mode")); + _dl_signal_error (EINVAL, NULL, NULL, N_("invalid mode")); } args->new = GLRO(dl_open) (args->file ?: "", args->mode | __RTLD_DLOPEN, diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c index 453efbd1c0..5263fed5f3 100644 --- a/dlfcn/dlopen.c +++ b/dlfcn/dlopen.c @@ -61,7 +61,7 @@ dlopen_doit (void *a) if (args->mode & ~(RTLD_BINDING_MASK | RTLD_NOLOAD | RTLD_DEEPBIND | RTLD_GLOBAL | RTLD_LOCAL | RTLD_NODELETE | __RTLD_SPROF)) - GLRO(dl_signal_error) (0, NULL, NULL, _("invalid mode parameter")); + _dl_signal_error (0, NULL, NULL, _("invalid mode parameter")); args->new = GLRO(dl_open) (args->file ?: "", args->mode | __RTLD_DLOPEN, args->caller, |