From 7cae51428244bb0519a5fdadcb153d0ecb41b606 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 13 Jan 2009 02:15:14 +0000 Subject: [PATCH] uclibc: add some libpthread fixes git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14013 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/uClibc/patches/190-install_tls.patch | 12 ++++++++++++ toolchain/uClibc/patches/200-libpthread_static.patch | 11 +++++++++++ 2 files changed, 23 insertions(+) create mode 100644 toolchain/uClibc/patches/190-install_tls.patch create mode 100644 toolchain/uClibc/patches/200-libpthread_static.patch diff --git a/toolchain/uClibc/patches/190-install_tls.patch b/toolchain/uClibc/patches/190-install_tls.patch new file mode 100644 index 000000000..74d403265 --- /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 000000000..269370d07 --- /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)) -- 2.20.1