diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-07-01 09:48:01 +0200 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-07-01 09:49:08 +0200 |
| commit | 1c1391e6e507337103f2c7ce4da768b2842a8aa1 (patch) | |
| tree | 0bec582f8508313ed53b1f0048122bccb18bf87a | |
| parent | 7682323a3a798d6f15708f228f859a64cb869aa3 (diff) | |
| parent | 18bf00f3123707f9d1d7a2876121dea1c2c39a89 (diff) | |
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>
| -rw-r--r-- | libc/stdio/vswprintf.c | 5 | ||||
| -rw-r--r-- | libubacktrace/Makefile.in | 3 |
2 files changed, 6 insertions, 2 deletions
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))) { 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) |