From 77c18ab76ea3441f0686a4f21374305325b63566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Tue, 13 Apr 2010 09:38:59 +0300 Subject: linuxthreads.new: initialize stdio locking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit uClibc requires the threading library to enable locking for stdio, or the locking is not done at all. Signed-off-by: Timo Teräs Signed-off-by: Austin Foxley --- libpthread/linuxthreads/pthread.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libpthread/linuxthreads/pthread.c b/libpthread/linuxthreads/pthread.c index 6ae9a10d9..614cad1f4 100644 --- a/libpthread/linuxthreads/pthread.c +++ b/libpthread/linuxthreads/pthread.c @@ -613,6 +613,17 @@ static void pthread_initialize(void) #ifdef USE_TLS GL(dl_init_static_tls) = &__pthread_init_static_tls; #endif + + /* uClibc-specific stdio initialization for threads. */ + { + FILE *fp; + _stdio_user_locking = 0; /* 2 if threading not initialized */ + for (fp = _stdio_openlist; fp != NULL; fp = fp->__nextopen) { + if (fp->__user_locking != 1) { + fp->__user_locking = 0; + } + } + } } void __pthread_initialize(void) -- cgit v1.2.3 From abb965d29293288d215e8c2891b780dc8aabe948 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 22 Apr 2010 14:52:48 +0000 Subject: utils: fix install prefix for getconf So we don't get /usr/usr/bin/getconf when DEVEL_PREFIX="/usr" Signed-off-by: Natanael Copa Signed-off-by: Bernhard Reutner-Fischer --- utils/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/Makefile.in b/utils/Makefile.in index 89cb800e9..8cb06a37b 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -117,7 +117,7 @@ install-y += utils_install # This installs both utils and hostutils, so doesn't depend on either. utils_install: $(addsuffix $(DOTHOST), $(utils_OBJ) $(utils_LOCALE_OBJ)) - $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)usr/bin/getconf + $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/getconf ifeq ($(HAVE_SHARED),y) $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig -- cgit v1.2.3