From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 13 Jan 2009 02:15:14 +0000 (+0000)
Subject: uclibc: add some libpthread fixes
X-Git-Tag: reboot~24800
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=087a2bc16c82ab6559cb4000d05eb796c3649006;p=openwrt%2Fstaging%2Fxback.git

uclibc: add some libpthread fixes

SVN-Revision: 14013
---

diff --git a/toolchain/uClibc/patches/190-install_tls.patch b/toolchain/uClibc/patches/190-install_tls.patch
new file mode 100644
index 0000000000..74d403265c
--- /dev/null
+++ b/toolchain/uClibc/patches/190-install_tls.patch
@@ -0,0 +1,12 @@
+--- a/libpthread/linuxthreads/Makefile.in
++++ b/libpthread/linuxthreads/Makefile.in
+@@ -128,7 +128,9 @@ linuxthreads_headers:
+ 	$(Q)$(LN) -sf ../$(PTDIR)/sysdeps/pthread/pthread.h $(top_builddir)include/
+ 	$(Q)$(LN) -sf ../$(PTDIR)/semaphore.h $(top_builddir)include/
+ 	$(Q)$(INSTALL) -d $(top_builddir)include/bits
++	$(Q)$(INSTALL) -d $(top_builddir)include/sys
+ 	$(Q)$(LN) -sf ../../$(PTDIR)/sysdeps/pthread/bits/pthreadtypes.h $(top_builddir)include/bits/
++	$(Q)$(LN) -sf ../../$(PTDIR)/sysdeps/$(TARGET_ARCH)/tls.h $(top_builddir)include/sys/
+ 
+ linuxthreads_headers_clean:
+ 	$(RM) $(top_builddir)include/pthread.h $(top_builddir)include/semaphore.h \
diff --git a/toolchain/uClibc/patches/200-libpthread_static.patch b/toolchain/uClibc/patches/200-libpthread_static.patch
new file mode 100644
index 0000000000..269370d075
--- /dev/null
+++ b/toolchain/uClibc/patches/200-libpthread_static.patch
@@ -0,0 +1,11 @@
+--- a/libpthread/linuxthreads/Makefile.in
++++ b/libpthread/linuxthreads/Makefile.in
+@@ -65,7 +65,7 @@ CFLAGS-OMIT-libc_pthread_init.c := $(CFL
+ libpthread_libc_CSRC := \
+ 	forward.c libc-cancellation.c libc_pthread_init.c # alloca_cutoff.c
+ libpthread_libc_OBJ  := $(patsubst %.c, $(libpthread_OUT)/%.o,$(libpthread_libc_CSRC))
+-libc-static-y += $(libpthread_OUT)/libc_pthread_init.o
++libc-static-y += $(libpthread_OUT)/libc_pthread_init.o $(libpthread_OUT)/libc-cancellation.o
+ libc-shared-y += $(libpthread_libc_OBJ:.o=.oS)
+ 
+ libpthread-static-y += $(patsubst %,$(libpthread_OUT)/%.o,$(libpthread_static_SRC))