From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Tue, 31 May 2016 04:38:20 +0000 (UTC)
Subject: [lttng-dev] [PATCH lttng-ust 1/4] Add support for musl libc to
	ust-dlfcn.h
In-Reply-To: <1464640293-10157-1-git-send-email-mjeanson@efficios.com>
References: <1464640293-10157-1-git-send-email-mjeanson@efficios.com>
Message-ID: <1078683747.23560.1464669500716.JavaMail.zimbra@efficios.com>

All merged into master, stable-2.8. The commit marked
"fix" that apply to 2.7 has been backported.

----- On May 30, 2016, at 10:31 PM, Michael Jeanson mjeanson at efficios.com wrote:

> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> include/lttng/ust-dlfcn.h | 4 ++++
> 1 file changed, 4 insertions(+)
> 
> diff --git a/include/lttng/ust-dlfcn.h b/include/lttng/ust-dlfcn.h
> index c92f1bb..7471d94 100644
> --- a/include/lttng/ust-dlfcn.h
> +++ b/include/lttng/ust-dlfcn.h
> @@ -31,6 +31,7 @@
> #error "Please include lttng/ust-dlfcn.h before dlfcn.h."
> #endif /* _DLFCN_H */
> 
> +#ifdef __GLIBC__
> /*
>  * glibc declares dlsym() and dlerror() with __attribute__((leaf)) (see
>  * THROW annotation). Unfortunately, this is not in sync with reality,
> @@ -57,5 +58,8 @@ extern int dlclose(void *__handle) __nonnull ((1));
> extern void *dlsym(void *__restrict __handle,
> 		__const char *__restrict __name) __nonnull ((2));
> extern char *dlerror(void);
> +#else
> +#include <dlfcn.h>
> +#endif /* __GLIBC__ */
> 
> #endif /* _LTTNG_UST_DLFCN_H */
> --
> 2.7.4

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com