[git commit master] static build: define pthreads wrappers only for threaded builds

Timo Teräs timo.teras at iki.fi
Mon May 17 14:18:42 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=7350a372e22e5813f1417e388e8651b05174a664
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Otherwise we get compiler errors due to undefined prototypes
as noticed by Denys.

Signed-off-by: Timo Teräs <timo.teras at iki.fi>
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 libc/misc/internals/__uClibc_main.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index a98d92a..d821268 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -69,6 +69,7 @@ uintptr_t __guard attribute_relro;
 
 void internal_function _dl_aux_init (ElfW(auxv_t) *av);
 
+#ifdef __UCLIBC_HAS_THREADS__
 /*
  * uClibc internal locking requires that we have weak aliases
  * for dummy functions in case libpthread.a is not linked in.
@@ -102,6 +103,7 @@ _pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer *__buffer,
         if (__execute)
                 __buffer->__routine(__buffer->__arg);
 }
+#endif /* __UCLIBC_HAS_THREADS__ */
 
 #endif /* !SHARED */
 
-- 
1.6.3.3



More information about the uClibc-cvs mailing list