[git commit master 1/1] nptl: fix static linking

Carmelo Amoroso carmelo.amoroso at st.com
Thu Sep 9 12:03:10 UTC 2010


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

We need dl-tls.c for static libc or we will get missing symbols when
linking thinkgs like openssl static.

Signed-off-by: Natanael Copa <natanael.copa at gmail.com>
Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
---
 libpthread/nptl/Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
index 99a726a..3e9676a 100644
--- a/libpthread/nptl/Makefile.in
+++ b/libpthread/nptl/Makefile.in
@@ -48,9 +48,9 @@ libc-shared-routines-y := $(addprefix $(libpthread_OUT)/,$(libc-shared-routines-
 libc-static-routines-y := $(addprefix $(libpthread_OUT)/,$(libc-static-routines-y:.c=.o))
 libc-shared-y += $(libc-shared-routines-y) $(libpthread_libc_OBJS:.o=.oS)
 ifeq ($(DOPIC),y)
-libc-static-y += $(libc-static-routines-y:.o=.os) $(libpthread_libc_a_OBJS:.o=.os) # $(libpthread_ld_tls_COBJ:.o=.os)
+libc-static-y += $(libc-static-routines-y:.o=.os) $(libpthread_libc_a_OBJS:.o=.os) $(libpthread_ld_tls_COBJ:.o=.os)
 else
-libc-static-y += $(libc-static-routines-y) $(libpthread_libc_a_OBJS) # $(libpthread_ld_tls_COBJ)
+libc-static-y += $(libc-static-routines-y) $(libpthread_libc_a_OBJS) $(libpthread_ld_tls_COBJ)
 endif
 
 librt-pt-routines-y := $(patsubst %.c,$(libpthread_pthread_OUT)/%.o,$(filter-out $(notdir $(libpthread_librt_OBJS:.o=.c)), $(librt-pt-routines-y)))
-- 
1.7.1



More information about the uClibc-cvs mailing list