diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-23 06:55:42 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-23 06:56:46 -0700 |
| commit | 3bb2a677d2fa6fc43fa150b19132c35341ae0160 (patch) | |
| tree | fb0ddab9844b06197a97bef552c8dbcdb933962f | |
| parent | cfa1d49e87eae4d46e0f0d568627b210383534f3 (diff) | |
| parent | abb965d29293288d215e8c2891b780dc8aabe948 (diff) | |
Merge commit 'origin/master' into nptl
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
| -rw-r--r-- | libpthread/linuxthreads/pthread.c | 11 | ||||
| -rw-r--r-- | utils/Makefile.in | 2 |
2 files changed, 12 insertions, 1 deletions
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) 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 |