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 /elf/dl-libc.c | |
| parent | 705a79f82560ff6472cebed86aa5db04cdea3bce (diff) | |
| download | glibc-9e78f6f6e7134a5f299cc8de77370218f8019237.tar.gz glibc-9e78f6f6e7134a5f299cc8de77370218f8019237.tar.xz glibc-9e78f6f6e7134a5f299cc8de77370218f8019237.zip | |
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 'elf/dl-libc.c')
| -rw-r--r-- | elf/dl-libc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/dl-libc.c b/elf/dl-libc.c index d56de1a57a..dde44c8799 100644 --- a/elf/dl-libc.c +++ b/elf/dl-libc.c @@ -43,8 +43,8 @@ dlerror_run (void (*operate) (void *), void *args) const char *last_errstring = NULL; bool malloced; - int result = (GLRO(dl_catch_error) (&objname, &last_errstring, &malloced, - operate, args) + int result = (_dl_catch_error (&objname, &last_errstring, &malloced, + operate, args) ?: last_errstring != NULL); if (result && malloced) |