From c61993f7e0ad3a9014a4b73823faf1ba914f48a0 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Fri, 24 Jun 2011 16:27:36 +0200 Subject: libubacktrace: fix makefile clean target Fix makefile lean target removing the old reference to the non existing libubacktrace_ARCH_OUT variable. Signed-off-by: Carmelo Amoroso --- libubacktrace/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libubacktrace/Makefile.in b/libubacktrace/Makefile.in index f75f68b75..2474b1759 100644 --- a/libubacktrace/Makefile.in +++ b/libubacktrace/Makefile.in @@ -71,5 +71,4 @@ $(top_builddir)lib/libubacktrace.a: $(libubacktrace-a-y) $(do_ar) CLEAN_libubacktrace: - $(do_rm) $(addprefix $(libubacktrace_OUT)/*., o os oS a) \ - $(addprefix $(libubacktrace_ARCH_OUT)/*., o os oS a) + $(do_rm) $(addprefix $(libubacktrace_OUT)/*., o os oS a) -- cgit v1.2.3 From 18bf00f3123707f9d1d7a2876121dea1c2c39a89 Mon Sep 17 00:00:00 2001 From: Maksim Rayskiy Date: Thu, 16 Jun 2011 18:14:01 -0700 Subject: libc: add missing lock initialization in vswprintf Unlike vsnprintf, vswprintf does not properly initialize locking elements of FILE structure, which in some unfortunate cases can result in lockups in _vfwprintf_internal. Interesting, the initialization code was removed in 2a915734a32c5aec9a6a76c13bcb074d30e64171 at the same time as it was added to vsnprintf. Signed-off-by: Maksim Rayskiy Signed-off-by: Carmelo Amoroso --- libc/stdio/vswprintf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libc/stdio/vswprintf.c b/libc/stdio/vswprintf.c index e509216e9..219524830 100644 --- a/libc/stdio/vswprintf.c +++ b/libc/stdio/vswprintf.c @@ -39,6 +39,11 @@ int vswprintf(wchar_t *__restrict buf, size_t size, __INIT_MBSTATE(&(f.__state)); #endif /* __STDIO_MBSTATE */ +#ifdef __UCLIBC_HAS_THREADS__ + f.__user_locking = 1; /* Set user locking. */ + STDIO_INIT_MUTEX(f.__lock); +#endif /* __UCLIBC_HAS_THREADS__ */ + f.__nextopen = NULL; if (size > ((SIZE_MAX - (size_t) buf)/sizeof(wchar_t))) { -- cgit v1.2.3