From 2783110a97a84c52b590221b637b3596d18dc013 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 24 Apr 2009 01:28:48 +0000
Subject: uClibc NPTL: remove the pthread daemon() fix and revert r15343

SVN-Revision: 15367
---
 .../uClibc/patches-nptl/130-compile_fix.patch      | 36 ++++++++++++++++++++++
 .../patches-nptl/130-pthread_weak_binding.patch    | 10 ------
 2 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 toolchain/uClibc/patches-nptl/130-compile_fix.patch
 delete mode 100644 toolchain/uClibc/patches-nptl/130-pthread_weak_binding.patch

(limited to 'toolchain')

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 0000000..ed3812a
--- /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 92227cf..0000000
--- 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 )
- {
-- 
cgit v1.1