Merge remote-tracking branch 'origin/master' into prelink

* origin/master:
  libc: add missing lock initialization in vswprintf
  libubacktrace: fix makefile clean target

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>

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))) {

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)