diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-01-13 20:44:29 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-01-13 20:44:29 +0000 |
| commit | 696d714c8778290272b9990e741daa3f6dd52b4b (patch) | |
| tree | da1a88bc93fb237eeec0a46a1a038ca4aab577f3 /toolchain/uClibc | |
| parent | 807400938b47e16fd4b6c4812d2968bc5006f58a (diff) | |
| download | upstream-696d714c8778290272b9990e741daa3f6dd52b4b.tar.gz upstream-696d714c8778290272b9990e741daa3f6dd52b4b.tar.bz2 upstream-696d714c8778290272b9990e741daa3f6dd52b4b.zip | |
fix the new libpthread implementation - the function table init was broken
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14027 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/uClibc')
| -rw-r--r-- | toolchain/uClibc/patches/200-libpthread_fix.patch | 35 | ||||
| -rw-r--r-- | toolchain/uClibc/patches/200-libpthread_static.patch | 11 |
2 files changed, 35 insertions, 11 deletions
diff --git a/toolchain/uClibc/patches/200-libpthread_fix.patch b/toolchain/uClibc/patches/200-libpthread_fix.patch new file mode 100644 index 0000000000..8acfa3f96f --- /dev/null +++ b/toolchain/uClibc/patches/200-libpthread_fix.patch @@ -0,0 +1,35 @@ +--- a/libpthread/linuxthreads/libc-cancellation.c ++++ b/libpthread/linuxthreads/libc-cancellation.c +@@ -31,9 +31,6 @@ + weak_extern (__pthread_do_exit) + # endif + +-int __libc_multiple_threads attribute_hidden __attribute__((nocommon)); +-strong_alias (__libc_multiple_threads, __librt_multiple_threads) +- + /* The next two functions are similar to pthread_setcanceltype() but + more specialized for the use in the cancelable functions like write(). + They do not need to check parameters etc. */ +--- a/libpthread/linuxthreads/libc_pthread_init.c ++++ b/libpthread/linuxthreads/libc_pthread_init.c +@@ -33,6 +33,9 @@ libc_hidden_proto(memcpy) + libc_hidden_proto(uselocale) + #endif + ++int __libc_multiple_threads attribute_hidden __attribute__((nocommon)); ++strong_alias (__libc_multiple_threads, __librt_multiple_threads) ++ + int * + __libc_pthread_init (functions) + const struct pthread_functions *functions; +--- a/libpthread/linuxthreads/Makefile.in ++++ b/libpthread/linuxthreads/Makefile.in +@@ -77,7 +77,7 @@ libpthread-a-y += $(libpthread_OBJ:.o=. + else + libpthread-a-y += $(libpthread_OBJ) $(libpthread-static-y) + endif +-libpthread-so-y += $(libpthread_OBJ:.o=.os) ++libpthread-so-y += $(libpthread_OBJ:.o=.oS) + + lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a + lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so diff --git a/toolchain/uClibc/patches/200-libpthread_static.patch b/toolchain/uClibc/patches/200-libpthread_static.patch deleted file mode 100644 index 269370d075..0000000000 --- a/toolchain/uClibc/patches/200-libpthread_static.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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)) |