diff options
| author | Nicolas Thill <nico@openwrt.org> | 2009-04-24 01:28:48 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2009-04-24 01:28:48 +0000 |
| commit | 2783110a97a84c52b590221b637b3596d18dc013 (patch) | |
| tree | f2b2c0d82c7854d632213c67229cadf2df7e3472 /toolchain | |
| parent | 97845201e4b1a657378170fb922fd1dd7ae3e238 (diff) | |
| download | upstream-2783110a97a84c52b590221b637b3596d18dc013.tar.gz upstream-2783110a97a84c52b590221b637b3596d18dc013.tar.bz2 upstream-2783110a97a84c52b590221b637b3596d18dc013.zip | |
uClibc NPTL: remove the pthread daemon() fix and revert r15343
SVN-Revision: 15367
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/uClibc/patches-nptl/130-compile_fix.patch | 36 | ||||
| -rw-r--r-- | toolchain/uClibc/patches-nptl/130-pthread_weak_binding.patch | 10 |
2 files changed, 36 insertions, 10 deletions
diff --git a/toolchain/uClibc/patches-nptl/130-compile_fix.patch b/toolchain/uClibc/patches-nptl/130-compile_fix.patch new file mode 100644 index 0000000000..ed3812a8ea --- /dev/null +++ b/toolchain/uClibc/patches-nptl/130-compile_fix.patch @@ -0,0 +1,36 @@ +--- a/librt/mq_receive.c ++++ b/librt/mq_receive.c +@@ -6,7 +6,8 @@ + #include <stddef.h> + #include <sys/syscall.h> + #include <mqueue.h> +-#warning FIXME: hard dependency on ADVANCED REALTIME feature ++ ++#ifdef __UCLIBC_HAS_ADVANCED_REALTIME__ + + librt_hidden_proto(mq_timedreceive) + +@@ -44,3 +45,5 @@ ssize_t mq_receive(mqd_t mqdes, char *ms + { + return mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, NULL); + } ++ ++#endif /* __UCLIBC_HAS_ADVANCED_REALTIME__ */ +--- a/librt/mq_send.c ++++ b/librt/mq_send.c +@@ -6,7 +6,8 @@ + #include <stddef.h> + #include <sys/syscall.h> + #include <mqueue.h> +-#warning FIXME: hard dependency on ADVANCED REALTIME feature ++ ++#ifdef __UCLIBC_HAS_ADVANCED_REALTIME__ + + librt_hidden_proto(mq_timedsend) + +@@ -43,3 +44,5 @@ int mq_send(mqd_t mqdes, const char *msg + { + return mq_timedsend(mqdes, msg_ptr, msg_len, msg_prio, NULL); + } ++ ++#endif /* __UCLIBC_HAS_ADVANCED_REALTIME__ */ diff --git a/toolchain/uClibc/patches-nptl/130-pthread_weak_binding.patch b/toolchain/uClibc/patches-nptl/130-pthread_weak_binding.patch deleted file mode 100644 index 92227cf418..0000000000 --- a/toolchain/uClibc/patches-nptl/130-pthread_weak_binding.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libc/unistd/daemon.c -+++ b/libc/unistd/daemon.c -@@ -54,7 +54,6 @@ - libc_hidden_proto(dup2) - libc_hidden_proto(setsid) - libc_hidden_proto(chdir) --libc_hidden_proto(fork) - - int daemon( int nochdir, int noclose ) - { |