From b0d12dcb635744a4fa0ebd13b6e5743d67da1046 Mon Sep 17 00:00:00 2001 From: Stan Shebs Date: Fri, 12 Nov 2021 06:48:03 -0800 Subject: Use a better workaround for clang lack of _builtin_va_arg_pack --- sysdeps/generic/ldsodefs.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 0495f85e84..8759f6e561 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -744,15 +744,26 @@ extern void _dl_dprintf (int fd, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3))) attribute_hidden; #else +#if defined(__clang__) +#include +#endif __attribute__ ((always_inline, __format__ (__printf__, 2, 3))) static inline void _dl_dprintf (int fd, const char *fmt, ...) { - /* Use local declaration to avoid includign . */ - extern int __dprintf(int fd, const char *format, ...) attribute_hidden; #if defined(__clang__) - __dprintf (fd, fmt); + /* In the absence of __builtin_va_arg_pack, use varargs macros to construct a + direct call to the stdio function that __dprintf eventually gets to. This + is not a robust hack, will break if stdio changes much. */ + extern int _IO_vdprintf (int d, const char *format, va_list arg); + va_list arg; + + va_start (arg, fmt); + _IO_vdprintf (fd, fmt, arg); + va_end (arg); #else + /* Use local declaration to avoid includign . */ + extern int __dprintf(int fd, const char *format, ...) attribute_hidden; __dprintf (fd, fmt, __builtin_va_arg_pack ()); #endif } -- cgit v1.2.1