toolchain/uClibc: use an upstream patch to fix syscall related build errors in 0...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30398 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/toolchain/uClibc/patches-0.9.33/001-backport-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch b/toolchain/uClibc/patches-0.9.33/001-backport-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch
new file mode 100644 (file)
index 0000000..aefedfb
--- /dev/null
+++ b/toolchain/uClibc/patches-0.9.33/001-backport-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch
@@ -0,0 +1,28 @@
+From 812ae602fe96bb40d1743d410eb1eadb6aa722f5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 3 Feb 2012 10:57:44 -0800
+Subject: [PATCH] Declare __err and pass it to INTERNAL_SYSCALL_NCS so subsequent macros can use it
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libc/sysdeps/linux/common/bits/syscalls-common.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libc/sysdeps/linux/common/bits/syscalls-common.h b/libc/sysdeps/linux/common/bits/syscalls-common.h
+index faebd1b..0f5a929 100644
+--- a/libc/sysdeps/linux/common/bits/syscalls-common.h
++++ b/libc/sysdeps/linux/common/bits/syscalls-common.h
+@@ -59,8 +59,8 @@
+ #ifndef INLINE_SYSCALL_NOERR_NCS
+ # define INLINE_SYSCALL_NOERR_NCS(name, nr, args...)                  \
+ ({                                                                    \
+-      /*INTERNAL_SYSCALL_DECL(__err);*/                                       \
+-      long __res = INTERNAL_SYSCALL_NCS(name, /*__err*/, nr, args);   \
++      INTERNAL_SYSCALL_DECL(__err);                                   \
++      long __res = INTERNAL_SYSCALL_NCS(name, __err, nr, args);       \
+       __res;                                                          \
+ })
+ #endif
+-- 
+1.7.2.1
+

diff --git a/toolchain/uClibc/patches-0.9.33/161-mips-add-INLINE_SYSCALL_NOERR-macro.patch b/toolchain/uClibc/patches-0.9.33/161-mips-add-INLINE_SYSCALL_NOERR-macro.patch
deleted file mode 100644 (file)
index 0cf3678..0000000
--- a/toolchain/uClibc/patches-0.9.33/161-mips-add-INLINE_SYSCALL_NOERR-macro.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/libc/sysdeps/linux/mips/bits/syscalls.h
-+++ b/libc/sysdeps/linux/mips/bits/syscalls.h
-@@ -29,6 +29,12 @@
-        }                                                              \
-      result_var; })
- 
-+#define INLINE_SYSCALL_NOERR(name, nr, args...)                               \
-+  ({ INTERNAL_SYSCALL_DECL(err);                                      \
-+     long result_var = INTERNAL_SYSCALL(name, err, nr, args);         \
-+     if (err) do { } while (0);                                               \
-+     result_var; })
-+
- #define INTERNAL_SYSCALL_DECL(err) long err
- 
- #define INTERNAL_SYSCALL_ERROR_P(val, err)   ((long) (err))