diff options
| author | Florian Weimer <fweimer@redhat.com> | 2020-05-25 18:17:27 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-05-25 18:17:27 +0200 |
| commit | de42613540de8d3d70b5f14a14923cab7bd694d0 (patch) | |
| tree | a40b9d1870dc99f5c989e903bc71a06ccaa7b3f4 /sysdeps | |
| parent | 76d5b2f002a1243ddba06bd646249553353f4322 (diff) | |
| download | glibc-de42613540de8d3d70b5f14a14923cab7bd694d0.tar.gz glibc-de42613540de8d3d70b5f14a14923cab7bd694d0.tar.xz glibc-de42613540de8d3d70b5f14a14923cab7bd694d0.zip | |
elf: Turn _dl_printf, _dl_error_printf, _dl_fatal_printf into functions
This change makes it easier to set a breakpoint on these calls. This also addresses the issue that including <ldsodefs.h> without <unistd.h> does not result usable _dl_*printf macros because of the use of the STD*_FILENO macros there. (The private symbol for _dl_fatal_printf will go away again once the exception handling implementation is unified between libc and ld.so.) Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 19 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/localplt.data | 1 |
2 files changed, 8 insertions, 12 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 5ff4a2831b..d08b97a5ef 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -751,24 +751,19 @@ _dl_dprintf (int fd, const char *fmt, ...) /* Write a message on the specified descriptor standard output. The parameters are interpreted as for a `printf' call. */ -#define _dl_printf(fmt, args...) \ - _dl_dprintf (STDOUT_FILENO, fmt, ##args) +void _dl_printf (const char *fmt, ...) + attribute_hidden __attribute__ ((__format__ (__printf__, 1, 2))); /* Write a message on the specified descriptor standard error. The parameters are interpreted as for a `printf' call. */ -#define _dl_error_printf(fmt, args...) \ - _dl_dprintf (STDERR_FILENO, fmt, ##args) +void _dl_error_printf (const char *fmt, ...) + attribute_hidden __attribute__ ((__format__ (__printf__, 1, 2))); /* Write a message on the specified descriptor standard error and exit the program. The parameters are interpreted as for a `printf' call. */ -#define _dl_fatal_printf(fmt, args...) \ - do \ - { \ - _dl_dprintf (STDERR_FILENO, fmt, ##args); \ - _exit (127); \ - } \ - while (1) - +void _dl_fatal_printf (const char *fmt, ...) + __attribute__ ((__format__ (__printf__, 1, 2), __noreturn__)); +rtld_hidden_proto (_dl_fatal_printf) /* An exception raised by the _dl_signal_error function family and caught by _dl_catch_error function family. Exceptions themselves diff --git a/sysdeps/mach/hurd/i386/localplt.data b/sysdeps/mach/hurd/i386/localplt.data index 102323e64f..541c3f32ae 100644 --- a/sysdeps/mach/hurd/i386/localplt.data +++ b/sysdeps/mach/hurd/i386/localplt.data @@ -43,6 +43,7 @@ ld.so: _dl_allocate_tls_init ld.so: _dl_exception_create ld.so: _dl_exception_create_format ld.so: _dl_exception_free +ld.so: _dl_fatal_printf ld.so: _dl_find_dso_for_object ld.so: _dl_init_first ld.so: _dl_mcount |