toolchain/uClibc: avr32 patch should apply to 0.9.30.1
authorPeter Korsgaard <jacmet@sunsite.dk>
Tue, 15 Dec 2009 09:47:39 +0000 (10:47 +0100)
committerPeter Korsgaard <jacmet@sunsite.dk>
Tue, 15 Dec 2009 09:47:39 +0000 (10:47 +0100)
avr32 uses 0.9.30.1, not 0.9.30.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
toolchain/uClibc/uClibc-0.9.30-fix-varargs-in-prctl-syscall.patch.avr32 [deleted file]
toolchain/uClibc/uClibc-0.9.30.1-fix-varargs-in-prctl-syscall.patch.avr32 [new file with mode: 0644]

diff --git a/toolchain/uClibc/uClibc-0.9.30-fix-varargs-in-prctl-syscall.patch.avr32 b/toolchain/uClibc/uClibc-0.9.30-fix-varargs-in-prctl-syscall.patch.avr32
deleted file mode 100644 (file)
index 8b27a84..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/libc/sysdeps/linux/common/prctl.c
-+++ b/libc/sysdeps/linux/common/prctl.c
-@@ -12,6 +12,24 @@
- /* psm: including sys/prctl.h would depend on kernel headers */
- #ifdef __NR_prctl
--extern int prctl (int, long, long, long, long);
--_syscall5(int, prctl, int, option, long, arg2, long, arg3, long, arg4, long, arg5)
-+#define __NR___syscall_prctl  __NR_prctl
-+static inline _syscall5(int, __syscall_prctl, int, option, long, arg2, long, arg3, long,
-+              arg4, long, arg5);
-+
-+int prctl(int option, ...) {
-+      long arg2 = 0;
-+      long arg3 = 0;
-+      long arg4 = 0;
-+      long arg5 = 0;
-+      va_list ap;
-+
-+      va_start(ap, option);
-+      arg2 = va_arg(ap, long);
-+      arg3 = va_arg(ap, long);
-+      arg4 = va_arg(ap, long);
-+      arg5 = va_arg(ap, long);
-+      va_end(ap);
-+
-+      return __syscall_prctl(option, arg2, arg3, arg4, arg5);
-+}
- #endif
diff --git a/toolchain/uClibc/uClibc-0.9.30.1-fix-varargs-in-prctl-syscall.patch.avr32 b/toolchain/uClibc/uClibc-0.9.30.1-fix-varargs-in-prctl-syscall.patch.avr32
new file mode 100644 (file)
index 0000000..8b27a84
--- /dev/null
@@ -0,0 +1,29 @@
+--- a/libc/sysdeps/linux/common/prctl.c
++++ b/libc/sysdeps/linux/common/prctl.c
+@@ -12,6 +12,24 @@
+ /* psm: including sys/prctl.h would depend on kernel headers */
+ #ifdef __NR_prctl
+-extern int prctl (int, long, long, long, long);
+-_syscall5(int, prctl, int, option, long, arg2, long, arg3, long, arg4, long, arg5)
++#define __NR___syscall_prctl  __NR_prctl
++static inline _syscall5(int, __syscall_prctl, int, option, long, arg2, long, arg3, long,
++              arg4, long, arg5);
++
++int prctl(int option, ...) {
++      long arg2 = 0;
++      long arg3 = 0;
++      long arg4 = 0;
++      long arg5 = 0;
++      va_list ap;
++
++      va_start(ap, option);
++      arg2 = va_arg(ap, long);
++      arg3 = va_arg(ap, long);
++      arg4 = va_arg(ap, long);
++      arg5 = va_arg(ap, long);
++      va_end(ap);
++
++      return __syscall_prctl(option, arg2, arg3, arg4, arg5);
++}
+ #endif