uclibc: use numbered patches for 0.9.33.2
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 16 Jul 2013 08:03:23 +0000 (10:03 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Tue, 16 Jul 2013 13:29:50 +0000 (15:29 +0200)
In preparation to the addition of more patches that require a correct
ordering, rename uClibc 0.9.33.2 patches.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/uclibc/0.9.33.2/uclibc-0001-bits-time.h-sync-with-glibc-2.16.patch [new file with mode: 0644]
package/uclibc/0.9.33.2/uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch [new file with mode: 0644]
package/uclibc/0.9.33.2/uclibc-0003-Add-dup3-syscall.patch [new file with mode: 0644]
package/uclibc/0.9.33.2/uclibc-0004-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch [new file with mode: 0644]
package/uclibc/0.9.33.2/uclibc-0005-Patch-from-OpenWRT-for-avr32.patch [new file with mode: 0644]
package/uclibc/0.9.33.2/uclibc-OpenWRT-140-avr32_atomic_fix.patch [deleted file]
package/uclibc/0.9.33.2/uclibc-bits-time.h-sync-with-glibc-2.16.patch [deleted file]
package/uclibc/0.9.33.2/uclibc-define-MSG_CMSG_CLOEXEC.patch [deleted file]
package/uclibc/0.9.33.2/uclibc-dup3.patch [deleted file]
package/uclibc/0.9.33.2/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch [deleted file]

diff --git a/package/uclibc/0.9.33.2/uclibc-0001-bits-time.h-sync-with-glibc-2.16.patch b/package/uclibc/0.9.33.2/uclibc-0001-bits-time.h-sync-with-glibc-2.16.patch
new file mode 100644 (file)
index 0000000..d93df6d
--- /dev/null
@@ -0,0 +1,37 @@
+From bb08cd16cb0353b3d4116ca8959dbecd2e78f545 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Tue, 3 Jul 2012 15:54:57 +0200
+Subject: [PATCH 1/8] bits/time.h: sync with glibc 2.16
+
+CLOCK_MONOTONIC_RAW is available since 2.6.28
+(2d42244ae71d: clocksource: introduce CLOCK_MONOTONIC_RAW), and
+CLOCK_*_COARSE since 2.6.32 (da15cfdae033: time: Introduce
+CLOCK_REALTIME_COARSE).
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ libc/sysdeps/linux/common/bits/time.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libc/sysdeps/linux/common/bits/time.h b/libc/sysdeps/linux/common/bits/time.h
+index 7ed54bf..c871223 100644
+--- a/libc/sysdeps/linux/common/bits/time.h
++++ b/libc/sysdeps/linux/common/bits/time.h
+@@ -54,6 +54,12 @@
+ #   define CLOCK_PROCESS_CPUTIME_ID   2
+ /* Thread-specific CPU-time clock.  */
+ #   define CLOCK_THREAD_CPUTIME_ID    3
++/* Monotonic system-wide clock, not adjusted for frequency scaling.  */
++#   define CLOCK_MONOTONIC_RAW                4
++/* Identifier for system-wide realtime clock, updated only on ticks.  */
++#   define CLOCK_REALTIME_COARSE      5
++/* Monotonic system-wide clock, updated only on ticks.  */
++#   define CLOCK_MONOTONIC_COARSE     6
+ /* Flag to indicate time is absolute.  */
+ #   define TIMER_ABSTIME              1
+-- 
+1.8.1.2
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch b/package/uclibc/0.9.33.2/uclibc-0002-Add-definition-of-MSG_WAITFORONE-and-MSG_CMSG_CLOEXE.patch
new file mode 100644 (file)
index 0000000..9353e5b
--- /dev/null
@@ -0,0 +1,39 @@
+From e95694dfd24779acaab0bb1500f182e46f8a518d Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 13 Jul 2013 17:13:55 +0200
+Subject: [PATCH 2/8] Add definition of MSG_WAITFORONE and MSG_CMSG_CLOEXEC
+
+From yocto:
+http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch
+
+Upstream-Status: Pending
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ libc/sysdeps/linux/common/bits/socket.h | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/common/bits/socket.h b/libc/sysdeps/linux/common/bits/socket.h
+index 7e12733..338fd92 100644
+--- a/libc/sysdeps/linux/common/bits/socket.h
++++ b/libc/sysdeps/linux/common/bits/socket.h
+@@ -235,8 +235,15 @@ enum
+ #define       MSG_ERRQUEUE    MSG_ERRQUEUE
+     MSG_NOSIGNAL      = 0x4000, /* Do not generate SIGPIPE.  */
+ #define       MSG_NOSIGNAL    MSG_NOSIGNAL
+-    MSG_MORE          = 0x8000  /* Sender will send more.  */
++    MSG_MORE          = 0x8000,  /* Sender will send more.  */
+ #define       MSG_MORE        MSG_MORE
++    MSG_WAITFORONE      = 0x10000, /* Wait for at least one packet to return.*/
++#define MSG_WAITFORONE  MSG_WAITFORONE
++
++    MSG_CMSG_CLOEXEC    = 0x40000000    /* Set close_on_exit for file
++                                           descriptor received through
++                                           SCM_RIGHTS.  */
++#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
+   };
+-- 
+1.8.1.2
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0003-Add-dup3-syscall.patch b/package/uclibc/0.9.33.2/uclibc-0003-Add-dup3-syscall.patch
new file mode 100644 (file)
index 0000000..663b0e1
--- /dev/null
@@ -0,0 +1,54 @@
+From 518bc50ae42540574bba360225c8a65b56b79148 Mon Sep 17 00:00:00 2001
+From: Jonas Bonn <jonas@southpole.se>
+Date: Tue, 6 Sep 2011 10:30:40 +0200
+Subject: [PATCH 3/8] Add dup3 syscall
+
+Signed-off-by: Jonas Bonn <jonas@southpole.se>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ include/unistd.h                 |  4 ++++
+ libc/sysdeps/linux/common/dup3.c | 17 +++++++++++++++++
+ 2 files changed, 21 insertions(+)
+ create mode 100644 libc/sysdeps/linux/common/dup3.c
+
+diff --git a/include/unistd.h b/include/unistd.h
+index 1b2fd4d..f7d070b 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -513,6 +513,10 @@ extern int dup (int __fd) __THROW __wur;
+ extern int dup2 (int __fd, int __fd2) __THROW;
+ libc_hidden_proto(dup2)
++/* Duplicate FD to FD2, closing FD2 and making it open on the same file.  */
++extern int dup3 (int __fd, int __fd2, int __flags) __THROW;
++libc_hidden_proto(dup3)
++
+ /* NULL-terminated array of "NAME=VALUE" environment variables.  */
+ extern char **__environ;
+ #ifdef __USE_GNU
+diff --git a/libc/sysdeps/linux/common/dup3.c b/libc/sysdeps/linux/common/dup3.c
+new file mode 100644
+index 0000000..7b57438
+--- /dev/null
++++ b/libc/sysdeps/linux/common/dup3.c
+@@ -0,0 +1,17 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * dup3() for uClibc
++ *
++ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <unistd.h>
++
++
++#ifdef __NR_dup3
++_syscall3(int, dup3, int, oldfd, int, newfd, int, flags)
++libc_hidden_def(dup3)
++#endif
+-- 
+1.8.1.2
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0004-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch b/package/uclibc/0.9.33.2/uclibc-0004-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
new file mode 100644 (file)
index 0000000..0381ba8
--- /dev/null
@@ -0,0 +1,393 @@
+From 7fef6b983456e4c529a5239ea90715050e6f4452 Mon Sep 17 00:00:00 2001
+From: Chris Packham <chris.packham@alliedtelesis.co.nz>
+Date: Mon, 1 Oct 2012 18:12:54 +1300
+Subject: [PATCH 4/8] libc/sysdeps: add __kernel_long and __kernel_ulong
+
+Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
+exported header files were updated to use these new types. Add the
+definitions for __kernel_long_t and __kernel_ulong_t to the relevant
+kernel_types.h headers.
+
+This change was automated with the following scriptlet
+
+  git grep --name-only 'typedef.*__kernel_old_dev_t' \
+    | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
+  typedef long\t\t__kernel_long_t;\
+  typedef unsigned long\t__kernel_ulong_t;'
+
+Whitespace in arm, avr32, hppa, sparc was then manually fixed up.
+
+Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
+--
+Here's a cleaned up patch which should get the whitespace right. I'm a
+bit iffy about the sparc changes they make sense to me but it's not a
+platform I have access to.
+
+I can break this up per arch or per maintainer if requested.
+
+ libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
+ libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
+ libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
+ libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
+ libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
+ libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
+ libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
+ libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
+ libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
+ libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
+ 22 files changed, 50 insertions(+)
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ libc/sysdeps/linux/alpha/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/arm/bits/kernel_types.h        | 2 ++
+ libc/sysdeps/linux/avr32/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/bfin/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/c6x/bits/kernel_types.h        | 2 ++
+ libc/sysdeps/linux/cris/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/e1/bits/kernel_types.h         | 2 ++
+ libc/sysdeps/linux/h8300/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/hppa/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/i386/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/ia64/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/m68k/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/microblaze/bits/kernel_types.h | 2 ++
+ libc/sysdeps/linux/mips/bits/kernel_types.h       | 4 ++++
+ libc/sysdeps/linux/nios2/bits/kernel_types.h      | 2 ++
+ libc/sysdeps/linux/powerpc/bits/kernel_types.h    | 4 ++++
+ libc/sysdeps/linux/sh/bits/kernel_types.h         | 2 ++
+ libc/sysdeps/linux/sh64/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/sparc/bits/kernel_types.h      | 4 ++++
+ libc/sysdeps/linux/v850/bits/kernel_types.h       | 2 ++
+ libc/sysdeps/linux/x86_64/bits/kernel_types.h     | 2 ++
+ libc/sysdeps/linux/xtensa/bits/kernel_types.h     | 2 ++
+ 22 files changed, 50 insertions(+)
+
+diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
+index d5574c9..cd59b9d 100644
+--- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
++++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
+@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
+ typedef __kernel_uid_t __kernel_uid32_t;
+ typedef __kernel_gid_t __kernel_gid32_t;
+ typedef __kernel_dev_t __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef struct {
+       int val[2];
+diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
+index 766a306..6b36f32 100644
+--- a/libc/sysdeps/linux/arm/bits/kernel_types.h
++++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short               __kernel_old_uid_t;
+ typedef unsigned short                __kernel_old_gid_t;
+ typedef long long             __kernel_loff_t;
+ typedef __kernel_dev_t                __kernel_old_dev_t;
++typedef long                  __kernel_long_t;
++typedef unsigned long         __kernel_ulong_t;
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
+index f7d8b52..c551d57 100644
+--- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
++++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
+@@ -39,6 +39,8 @@ typedef unsigned int         __kernel_gid32_t;
+ typedef unsigned short                __kernel_old_uid_t;
+ typedef unsigned short                __kernel_old_gid_t;
+ typedef unsigned short                __kernel_old_dev_t;
++typedef long                  __kernel_long_t;
++typedef unsigned long         __kernel_ulong_t;
+ #ifdef __GNUC__
+ typedef long long             __kernel_loff_t;
+diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
+index d69a875..9fec595 100644
+--- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
++++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short       __kernel_old_uid_t;
+ typedef unsigned short        __kernel_old_gid_t;
+ typedef long long     __kernel_loff_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
+index 7557309..2c363a8 100644
+--- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
++++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
+@@ -22,6 +22,8 @@ typedef unsigned int __kernel_gid32_t;
+ typedef unsigned int  __kernel_old_uid_t;
+ typedef unsigned int  __kernel_old_gid_t;
+ typedef unsigned int  __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef unsigned int  __kernel_size_t;
+ typedef int           __kernel_ssize_t;
+ typedef int           __kernel_ptrdiff_t;
+diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
+index f122c7f..5d31f7b 100644
+--- a/libc/sysdeps/linux/cris/bits/kernel_types.h
++++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
+@@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t;
+ typedef unsigned short  __kernel_old_uid_t;
+ typedef unsigned short  __kernel_old_gid_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ #ifdef __GNUC__
+ typedef long long     __kernel_loff_t;
+diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
+index 8017d85..f55a129 100644
+--- a/libc/sysdeps/linux/e1/bits/kernel_types.h
++++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
+@@ -31,6 +31,8 @@ typedef unsigned int __kernel_gid32_t;
+ typedef unsigned short        __kernel_old_uid_t;
+ typedef unsigned short        __kernel_old_gid_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef long long     __kernel_loff_t;
+ /*
+diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
+index 0570675..4cfd1bf 100644
+--- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
++++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short       __kernel_old_uid_t;
+ typedef unsigned short        __kernel_old_gid_t;
+ typedef long long     __kernel_loff_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
+index 4441f9b..6b2e794 100644
+--- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
++++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
+@@ -45,6 +45,8 @@ typedef long long            __kernel_off64_t;
+ typedef unsigned long long    __kernel_ino64_t;
+ typedef unsigned int          __kernel_old_dev_t;
++typedef long                  __kernel_long_t;
++typedef unsigned long         __kernel_ulong_t;
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
+index 9c07c72..59044b8 100644
+--- a/libc/sysdeps/linux/i386/bits/kernel_types.h
++++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
+@@ -40,6 +40,8 @@ typedef unsigned int __kernel_gid32_t;
+ typedef unsigned short        __kernel_old_uid_t;
+ typedef unsigned short        __kernel_old_gid_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef long long     __kernel_loff_t;
+ typedef struct {
+diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
+index c8ef86d..e31dc65 100644
+--- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
+@@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
+ typedef unsigned int  __kernel_dev_t;
+ typedef unsigned int  __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ #endif /* _ASM_IA64_POSIX_TYPES_H */
+diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
+index 0a77a8f..176b968 100644
+--- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
++++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short       __kernel_old_uid_t;
+ typedef unsigned short        __kernel_old_gid_t;
+ typedef long long     __kernel_loff_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
+index 2a70575..a9f736b 100644
+--- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
++++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
+@@ -44,6 +44,8 @@ typedef unsigned int __kernel_gid32_t;
+ typedef unsigned int  __kernel_old_uid_t;
+ typedef unsigned int  __kernel_old_gid_t;
+ typedef unsigned int  __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ #ifdef __GNUC__
+ typedef long long     __kernel_loff_t;
+diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
+index 9fc3b96..97faeac 100644
+--- a/libc/sysdeps/linux/mips/bits/kernel_types.h
++++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef int          __kernel_gid32_t;
+ typedef __kernel_uid_t        __kernel_old_uid_t;
+ typedef __kernel_gid_t        __kernel_old_gid_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef long long      __kernel_loff_t;
+ #else
+ typedef unsigned int  __kernel_dev_t;
+@@ -68,6 +70,8 @@ typedef int          __kernel_gid32_t;
+ typedef __kernel_uid_t        __kernel_old_uid_t;
+ typedef __kernel_gid_t        __kernel_old_gid_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef long long      __kernel_loff_t;
+ #endif
+diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
+index 8b86d79..3c030e7 100644
+--- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
++++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
+@@ -31,6 +31,8 @@ typedef unsigned int __kernel_gid32_t;
+ typedef unsigned short        __kernel_old_uid_t;
+ typedef unsigned short        __kernel_old_gid_t;
+ typedef unsigned short        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef long long     __kernel_loff_t;
+ typedef struct {
+diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
+index 3f3b933..1167de2 100644
+--- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
++++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
+@@ -36,6 +36,8 @@ typedef unsigned int __kernel_gid32_t;
+ typedef unsigned int  __kernel_old_uid_t;
+ typedef unsigned int  __kernel_old_gid_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ #else
+ typedef unsigned int  __kernel_dev_t;
+ typedef unsigned int  __kernel_ino_t;
+@@ -61,6 +63,8 @@ typedef unsigned int __kernel_gid32_t;
+ typedef unsigned int  __kernel_old_uid_t;
+ typedef unsigned int  __kernel_old_gid_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef long long     __kernel_loff_t;
+ #endif
+diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
+index f96e9fa..ac97261 100644
+--- a/libc/sysdeps/linux/sh/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned int __kernel_gid32_t;
+ typedef unsigned short        __kernel_old_uid_t;
+ typedef unsigned short        __kernel_old_gid_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef long long     __kernel_loff_t;
+ typedef struct {
+diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
+index 671cc83..8cc6c61 100644
+--- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
+@@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t;
+ typedef unsigned short  __kernel_old_uid_t;
+ typedef unsigned short  __kernel_old_gid_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef long long       __kernel_loff_t;
+ typedef struct {
+diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
+index 0cc4bc2..a10e075 100644
+--- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
++++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
+@@ -32,6 +32,8 @@ typedef unsigned short              __kernel_gid16_t;
+ typedef __kernel_uid_t               __kernel_old_uid_t;
+ typedef __kernel_gid_t         __kernel_old_gid_t;
+ typedef __kernel_dev_t         __kernel_old_dev_t;
++typedef long                   __kernel_long_t;
++typedef unsigned long          __kernel_ulong_t;
+ typedef __kernel_uid_t               __kernel_uid32_t;
+ typedef __kernel_gid_t               __kernel_gid32_t;
+ typedef int                  __kernel_suseconds_t;
+@@ -62,6 +64,8 @@ typedef unsigned int        __kernel_gid32_t;
+ typedef unsigned short               __kernel_old_uid_t;
+ typedef unsigned short               __kernel_old_gid_t;
+ typedef __kernel_dev_t         __kernel_old_dev_t;
++typedef long                   __kernel_long_t;
++typedef unsigned long          __kernel_ulong_t;
+ typedef long long              __kernel_loff_t;
+ #endif
+diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
+index 3e851ab..780aa8a 100644
+--- a/libc/sysdeps/linux/v850/bits/kernel_types.h
++++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
+@@ -41,6 +41,8 @@ typedef unsigned int __kernel_gid32_t;
+ typedef unsigned short        __kernel_old_uid_t;
+ typedef unsigned short        __kernel_old_gid_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef struct {
+ #ifdef __USE_ALL
+diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+index de800d7..0cae08c 100644
+--- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+@@ -40,6 +40,8 @@ typedef unsigned int __kernel_gid32_t;
+ typedef unsigned short        __kernel_old_uid_t;
+ typedef unsigned short        __kernel_old_gid_t;
+ typedef __kernel_dev_t        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef long long     __kernel_loff_t;
+ typedef struct {
+diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
+index 44f1075..ed38f2e 100644
+--- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
++++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
+@@ -33,6 +33,8 @@ typedef unsigned int __kernel_gid32_t;
+ typedef unsigned short        __kernel_old_uid_t;
+ typedef unsigned short        __kernel_old_gid_t;
+ typedef unsigned short        __kernel_old_dev_t;
++typedef long          __kernel_long_t;
++typedef unsigned long __kernel_ulong_t;
+ typedef long long     __kernel_loff_t;
+ /* Beginning in 2.6 kernels, which is the first version that includes the
+-- 
+1.8.1.2
+
diff --git a/package/uclibc/0.9.33.2/uclibc-0005-Patch-from-OpenWRT-for-avr32.patch b/package/uclibc/0.9.33.2/uclibc-0005-Patch-from-OpenWRT-for-avr32.patch
new file mode 100644 (file)
index 0000000..9b6be2b
--- /dev/null
@@ -0,0 +1,28 @@
+From b0bbb35065e1c8fdd308573f38eed35c30760d87 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 13 Jul 2013 17:14:49 +0200
+Subject: [PATCH 5/8] Patch from OpenWRT for avr32.
+
+https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.32/140-avr32_atomic_fix.patch
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ libc/sysdeps/linux/avr32/bits/atomic.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libc/sysdeps/linux/avr32/bits/atomic.h b/libc/sysdeps/linux/avr32/bits/atomic.h
+index e6be41f..3bc2aee 100644
+--- a/libc/sysdeps/linux/avr32/bits/atomic.h
++++ b/libc/sysdeps/linux/avr32/bits/atomic.h
+@@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t;
+ #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)   \
+       ({                                                              \
++              __uint32_t __result;                                    \
+               __typeof__(*(mem)) __prev;                              \
+               __asm__ __volatile__(                                   \
+                       "/* __arch_compare_and_exchange_val_32_acq */\n" \
+-- 
+1.8.1.2
+
diff --git a/package/uclibc/0.9.33.2/uclibc-OpenWRT-140-avr32_atomic_fix.patch b/package/uclibc/0.9.33.2/uclibc-OpenWRT-140-avr32_atomic_fix.patch
deleted file mode 100644 (file)
index e28b6d2..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Patch from OpenWRT for avr32.
-
-https://dev.openwrt.org/browser/trunk/toolchain/uClibc/patches-0.9.32/140-avr32_atomic_fix.patch
-
-Signed-off-by: Simon Dawson <spdawson@gmail.com>
-
---- a/libc/sysdeps/linux/avr32/bits/atomic.h
-+++ b/libc/sysdeps/linux/avr32/bits/atomic.h
-@@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t;
- #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)   \
-       ({                                                              \
-+              __uint32_t __result;                                    \
-               __typeof__(*(mem)) __prev;                              \
-               __asm__ __volatile__(                                   \
-                       "/* __arch_compare_and_exchange_val_32_acq */\n" \
diff --git a/package/uclibc/0.9.33.2/uclibc-bits-time.h-sync-with-glibc-2.16.patch b/package/uclibc/0.9.33.2/uclibc-bits-time.h-sync-with-glibc-2.16.patch
deleted file mode 100644 (file)
index 2ad0032..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3d1b82c7d9dce11c733fe23a85df7f975c7e2486 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Tue, 3 Jul 2012 15:54:57 +0200
-Subject: [PATCH] bits/time.h: sync with glibc 2.16
-
-CLOCK_MONOTONIC_RAW is available since 2.6.28
-(2d42244ae71d: clocksource: introduce CLOCK_MONOTONIC_RAW), and
-CLOCK_*_COARSE since 2.6.32 (da15cfdae033: time: Introduce
-CLOCK_REALTIME_COARSE).
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
----
- libc/sysdeps/linux/common/bits/time.h |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libc/sysdeps/linux/common/bits/time.h b/libc/sysdeps/linux/common/bits/time.h
-index 7ed54bf..c871223 100644
---- a/libc/sysdeps/linux/common/bits/time.h
-+++ b/libc/sysdeps/linux/common/bits/time.h
-@@ -54,6 +54,12 @@
- #   define CLOCK_PROCESS_CPUTIME_ID   2
- /* Thread-specific CPU-time clock.  */
- #   define CLOCK_THREAD_CPUTIME_ID    3
-+/* Monotonic system-wide clock, not adjusted for frequency scaling.  */
-+#   define CLOCK_MONOTONIC_RAW                4
-+/* Identifier for system-wide realtime clock, updated only on ticks.  */
-+#   define CLOCK_REALTIME_COARSE      5
-+/* Monotonic system-wide clock, updated only on ticks.  */
-+#   define CLOCK_MONOTONIC_COARSE     6
- /* Flag to indicate time is absolute.  */
- #   define TIMER_ABSTIME              1
--- 
-1.7.10.4
-
diff --git a/package/uclibc/0.9.33.2/uclibc-define-MSG_CMSG_CLOEXEC.patch b/package/uclibc/0.9.33.2/uclibc-define-MSG_CMSG_CLOEXEC.patch
deleted file mode 100644 (file)
index c699b6b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-Add definition of MSG_WAITFORONE and MSG_CMSG_CLOEXEC
-
-From yocto:
-http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch
-
-Upstream-Status: Pending
-
-Index: git/libc/sysdeps/linux/common/bits/socket.h
-===================================================================
---- git.orig/libc/sysdeps/linux/common/bits/socket.h   2012-01-26 23:23:21.537456132 -0800
-+++ git/libc/sysdeps/linux/common/bits/socket.h        2012-01-26 23:25:10.125461388 -0800
-@@ -235,8 +235,15 @@
- #define       MSG_ERRQUEUE    MSG_ERRQUEUE
-     MSG_NOSIGNAL      = 0x4000, /* Do not generate SIGPIPE.  */
- #define       MSG_NOSIGNAL    MSG_NOSIGNAL
--    MSG_MORE          = 0x8000  /* Sender will send more.  */
-+    MSG_MORE          = 0x8000,  /* Sender will send more.  */
- #define       MSG_MORE        MSG_MORE
-+    MSG_WAITFORONE      = 0x10000, /* Wait for at least one packet to return.*/
-+#define MSG_WAITFORONE  MSG_WAITFORONE
-+
-+    MSG_CMSG_CLOEXEC    = 0x40000000    /* Set close_on_exit for file
-+                                           descriptor received through
-+                                           SCM_RIGHTS.  */
-+#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
-   };
diff --git a/package/uclibc/0.9.33.2/uclibc-dup3.patch b/package/uclibc/0.9.33.2/uclibc-dup3.patch
deleted file mode 100644 (file)
index 87fe2a6..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Jonas Bonn <jonas@southpole.se>
-Subject: [RFC PATCH 16/38] Add dup3 syscall
-Date: Tue,  6 Sep 2011 10:30:40 +0200
-
-Signed-off-by: Jonas Bonn <jonas@southpole.se>
----
- include/unistd.h                 |    4 ++++
- libc/sysdeps/linux/common/dup3.c |   15 +++++++++++++++
- 2 files changed, 19 insertions(+), 0 deletions(-)
- create mode 100644 libc/sysdeps/linux/common/dup3.c
-
-diff --git a/include/unistd.h b/include/unistd.h
-index 9568790..7c2fa4a 100644
---- a/include/unistd.h
-+++ b/include/unistd.h
-@@ -513,6 +513,10 @@ extern int dup (int __fd) __THROW __wur;
- extern int dup2 (int __fd, int __fd2) __THROW;
- libc_hidden_proto(dup2)
-+/* Duplicate FD to FD2, closing FD2 and making it open on the same file.  */
-+extern int dup3 (int __fd, int __fd2, int __flags) __THROW;
-+libc_hidden_proto(dup3)
-+
- /* NULL-terminated array of "NAME=VALUE" environment variables.  */
- extern char **__environ;
- #ifdef __USE_GNU
-diff --git a/libc/sysdeps/linux/common/dup3.c b/libc/sysdeps/linux/common/dup3.c
-new file mode 100644
-index 0000000..5fdab2e
---- /dev/null
-+++ b/libc/sysdeps/linux/common/dup3.c
-@@ -0,0 +1,17 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * dup3() for uClibc
-+ *
-+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
-+ *
-+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-+ */
-+
-+#include <sys/syscall.h>
-+#include <unistd.h>
-+
-+
-+#ifdef __NR_dup3
-+_syscall3(int, dup3, int, oldfd, int, newfd, int, flags)
-+libc_hidden_def(dup3)
-+#endif
--- 
-1.7.5.4
-
-_______________________________________________
-uClibc mailing list
-uClibc@uclibc.org
-http://lists.busybox.net/mailman/listinfo/uclibc
diff --git a/package/uclibc/0.9.33.2/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch b/package/uclibc/0.9.33.2/uclibc-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
deleted file mode 100644 (file)
index 4ba60e9..0000000
+++ /dev/null
@@ -1,392 +0,0 @@
-From 6a76edddaa62ff06f178143b582167734cb55c18 Mon Sep 17 00:00:00 2001
-From: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Date: Mon, 1 Oct 2012 18:12:54 +1300
-Subject: [PATCH] libc/sysdeps: add __kernel_long and __kernel_ulong
-
-Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
-exported header files were updated to use these new types. Add the
-definitions for __kernel_long_t and __kernel_ulong_t to the relevant
-kernel_types.h headers.
-
-This change was automated with the following scriptlet
-
-  git grep --name-only 'typedef.*__kernel_old_dev_t' \
-    | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
-  typedef long\t\t__kernel_long_t;\
-  typedef unsigned long\t__kernel_ulong_t;'
-
-Whitespace in arm, avr32, hppa, sparc was then manually fixed up.
-
-Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
-Here's a cleaned up patch which should get the whitespace right. I'm a
-bit iffy about the sparc changes they make sense to me but it's not a
-platform I have access to.
-
-I can break this up per arch or per maintainer if requested.
-
- libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
- libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
- libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
- libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
- libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
- libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
- libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
- libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
- libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
- libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
- libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
- libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
- libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
- libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
- 22 files changed, 50 insertions(+)
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- libc/sysdeps/linux/alpha/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/arm/bits/kernel_types.h        | 2 ++
- libc/sysdeps/linux/avr32/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/bfin/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/c6x/bits/kernel_types.h        | 2 ++
- libc/sysdeps/linux/cris/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/e1/bits/kernel_types.h         | 2 ++
- libc/sysdeps/linux/h8300/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/hppa/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/i386/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/ia64/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/m68k/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/microblaze/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/mips/bits/kernel_types.h       | 4 ++++
- libc/sysdeps/linux/nios2/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/powerpc/bits/kernel_types.h    | 4 ++++
- libc/sysdeps/linux/sh/bits/kernel_types.h         | 2 ++
- libc/sysdeps/linux/sh64/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/sparc/bits/kernel_types.h      | 4 ++++
- libc/sysdeps/linux/v850/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/x86_64/bits/kernel_types.h     | 2 ++
- libc/sysdeps/linux/xtensa/bits/kernel_types.h     | 2 ++
- 22 files changed, 50 insertions(+)
-
-diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
-index d5574c9..cd59b9d 100644
---- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
-@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
- typedef __kernel_uid_t __kernel_uid32_t;
- typedef __kernel_gid_t __kernel_gid32_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef struct {
-       int val[2];
-diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
-index 766a306..6b36f32 100644
---- a/libc/sysdeps/linux/arm/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short               __kernel_old_uid_t;
- typedef unsigned short                __kernel_old_gid_t;
- typedef long long             __kernel_loff_t;
- typedef __kernel_dev_t                __kernel_old_dev_t;
-+typedef long                  __kernel_long_t;
-+typedef unsigned long         __kernel_ulong_t;
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-index f7d8b52..c551d57 100644
---- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-@@ -39,6 +39,8 @@ typedef unsigned int         __kernel_gid32_t;
- typedef unsigned short                __kernel_old_uid_t;
- typedef unsigned short                __kernel_old_gid_t;
- typedef unsigned short                __kernel_old_dev_t;
-+typedef long                  __kernel_long_t;
-+typedef unsigned long         __kernel_ulong_t;
- #ifdef __GNUC__
- typedef long long             __kernel_loff_t;
-diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
-index d69a875..9fec595 100644
---- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short       __kernel_old_uid_t;
- typedef unsigned short        __kernel_old_gid_t;
- typedef long long     __kernel_loff_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
-index 7557309..2c363a8 100644
---- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
-@@ -22,6 +22,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned int  __kernel_old_uid_t;
- typedef unsigned int  __kernel_old_gid_t;
- typedef unsigned int  __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef unsigned int  __kernel_size_t;
- typedef int           __kernel_ssize_t;
- typedef int           __kernel_ptrdiff_t;
-diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
-index f122c7f..5d31f7b 100644
---- a/libc/sysdeps/linux/cris/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
-@@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t;
- typedef unsigned short  __kernel_old_uid_t;
- typedef unsigned short  __kernel_old_gid_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- #ifdef __GNUC__
- typedef long long     __kernel_loff_t;
-diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
-index 8017d85..f55a129 100644
---- a/libc/sysdeps/linux/e1/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
-@@ -31,6 +31,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short        __kernel_old_uid_t;
- typedef unsigned short        __kernel_old_gid_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long     __kernel_loff_t;
- /*
-diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
-index 0570675..4cfd1bf 100644
---- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short       __kernel_old_uid_t;
- typedef unsigned short        __kernel_old_gid_t;
- typedef long long     __kernel_loff_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
-index 4441f9b..6b2e794 100644
---- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
-@@ -45,6 +45,8 @@ typedef long long            __kernel_off64_t;
- typedef unsigned long long    __kernel_ino64_t;
- typedef unsigned int          __kernel_old_dev_t;
-+typedef long                  __kernel_long_t;
-+typedef unsigned long         __kernel_ulong_t;
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
-index 9c07c72..59044b8 100644
---- a/libc/sysdeps/linux/i386/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
-@@ -40,6 +40,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short        __kernel_old_uid_t;
- typedef unsigned short        __kernel_old_gid_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long     __kernel_loff_t;
- typedef struct {
-diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
-index c8ef86d..e31dc65 100644
---- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
-@@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
- typedef unsigned int  __kernel_dev_t;
- typedef unsigned int  __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- #endif /* _ASM_IA64_POSIX_TYPES_H */
-diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
-index 0a77a8f..176b968 100644
---- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short       __kernel_old_uid_t;
- typedef unsigned short        __kernel_old_gid_t;
- typedef long long     __kernel_loff_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-index 2a70575..a9f736b 100644
---- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-@@ -44,6 +44,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned int  __kernel_old_uid_t;
- typedef unsigned int  __kernel_old_gid_t;
- typedef unsigned int  __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- #ifdef __GNUC__
- typedef long long     __kernel_loff_t;
-diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
-index 9fc3b96..97faeac 100644
---- a/libc/sysdeps/linux/mips/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef int          __kernel_gid32_t;
- typedef __kernel_uid_t        __kernel_old_uid_t;
- typedef __kernel_gid_t        __kernel_old_gid_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long      __kernel_loff_t;
- #else
- typedef unsigned int  __kernel_dev_t;
-@@ -68,6 +70,8 @@ typedef int          __kernel_gid32_t;
- typedef __kernel_uid_t        __kernel_old_uid_t;
- typedef __kernel_gid_t        __kernel_old_gid_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long      __kernel_loff_t;
- #endif
-diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
-index 8b86d79..3c030e7 100644
---- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
-@@ -31,6 +31,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short        __kernel_old_uid_t;
- typedef unsigned short        __kernel_old_gid_t;
- typedef unsigned short        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long     __kernel_loff_t;
- typedef struct {
-diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-index 3f3b933..1167de2 100644
---- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-@@ -36,6 +36,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned int  __kernel_old_uid_t;
- typedef unsigned int  __kernel_old_gid_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- #else
- typedef unsigned int  __kernel_dev_t;
- typedef unsigned int  __kernel_ino_t;
-@@ -61,6 +63,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned int  __kernel_old_uid_t;
- typedef unsigned int  __kernel_old_gid_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long     __kernel_loff_t;
- #endif
-diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
-index f96e9fa..ac97261 100644
---- a/libc/sysdeps/linux/sh/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short        __kernel_old_uid_t;
- typedef unsigned short        __kernel_old_gid_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long     __kernel_loff_t;
- typedef struct {
-diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
-index 671cc83..8cc6c61 100644
---- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
-@@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t;
- typedef unsigned short  __kernel_old_uid_t;
- typedef unsigned short  __kernel_old_gid_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long       __kernel_loff_t;
- typedef struct {
-diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
-index 0cc4bc2..a10e075 100644
---- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short              __kernel_gid16_t;
- typedef __kernel_uid_t               __kernel_old_uid_t;
- typedef __kernel_gid_t         __kernel_old_gid_t;
- typedef __kernel_dev_t         __kernel_old_dev_t;
-+typedef long                   __kernel_long_t;
-+typedef unsigned long          __kernel_ulong_t;
- typedef __kernel_uid_t               __kernel_uid32_t;
- typedef __kernel_gid_t               __kernel_gid32_t;
- typedef int                  __kernel_suseconds_t;
-@@ -62,6 +64,8 @@ typedef unsigned int        __kernel_gid32_t;
- typedef unsigned short               __kernel_old_uid_t;
- typedef unsigned short               __kernel_old_gid_t;
- typedef __kernel_dev_t         __kernel_old_dev_t;
-+typedef long                   __kernel_long_t;
-+typedef unsigned long          __kernel_ulong_t;
- typedef long long              __kernel_loff_t;
- #endif
-diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
-index 3e851ab..780aa8a 100644
---- a/libc/sysdeps/linux/v850/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
-@@ -41,6 +41,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short        __kernel_old_uid_t;
- typedef unsigned short        __kernel_old_gid_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-index de800d7..0cae08c 100644
---- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-@@ -40,6 +40,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short        __kernel_old_uid_t;
- typedef unsigned short        __kernel_old_gid_t;
- typedef __kernel_dev_t        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long     __kernel_loff_t;
- typedef struct {
-diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-index 44f1075..ed38f2e 100644
---- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-@@ -33,6 +33,8 @@ typedef unsigned int __kernel_gid32_t;
- typedef unsigned short        __kernel_old_uid_t;
- typedef unsigned short        __kernel_old_gid_t;
- typedef unsigned short        __kernel_old_dev_t;
-+typedef long          __kernel_long_t;
-+typedef unsigned long __kernel_ulong_t;
- typedef long long     __kernel_loff_t;
- /* Beginning in 2.6 kernels, which is the first version that includes the
--- 
-1.8.1.5
-