From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 20 Jan 2009 14:47:53 +0000 (+0000)
Subject: uClibc: compile fix for the new linuxthreads implementation on mips
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dc6d881733e996255fec6bf2fbd4816b4eac5281;p=openwrt%2Fstaging%2Frmilecki.git

uClibc: compile fix for the new linuxthreads implementation on mips

SVN-Revision: 14118
---

diff --git a/toolchain/uClibc/patches/220-libpthread_arm.patch b/toolchain/uClibc/patches/220-libpthread_arm.patch
deleted file mode 100644
index c7a71cac344..00000000000
--- a/toolchain/uClibc/patches/220-libpthread_arm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- /dev/null
-+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
-@@ -0,0 +1,24 @@
-+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Guido Guenther <agx@sigxcpu.org>, 2003.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
-+
-+# define SINGLE_THREAD_P (1)
-+
-+#endif
diff --git a/toolchain/uClibc/patches/220-libpthread_sysdep_fixes.patch b/toolchain/uClibc/patches/220-libpthread_sysdep_fixes.patch
new file mode 100644
index 00000000000..bb76dc1166e
--- /dev/null
+++ b/toolchain/uClibc/patches/220-libpthread_sysdep_fixes.patch
@@ -0,0 +1,37 @@
+--- /dev/null
++++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
+@@ -0,0 +1,24 @@
++/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Guido Guenther <agx@sigxcpu.org>, 2003.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
++
++# define SINGLE_THREAD_P (1)
++
++#endif
+--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
++++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
+@@ -17,7 +17,6 @@
+    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+    02111-1307 USA.  */
+ 
+-#include <sysdep.h>
+ #ifndef __ASSEMBLER__
+ # include <linuxthreads/internals.h>
+ #endif