backport patch to allow building uClibc-0.9.28.2 on recent x86 kernels

SVN-Revision: 14105

diff --git a/toolchain/uClibc/patches/0.9.28.2/180-fix_kernel_types_with_recent_kernel.patch b/toolchain/uClibc/patches/0.9.28.2/180-fix_kernel_types_with_recent_kernel.patch
new file mode 100644 (file)
index 0000000..829aaca
--- /dev/null
+++ b/toolchain/uClibc/patches/0.9.28.2/180-fix_kernel_types_with_recent_kernel.patch
@@ -0,0 +1,18 @@
+--- uClibc-0.9.28.2-old/libc/sysdeps/linux/i386/bits/kernel_types.h    2004-02-06 08:07:16.000000000 +0100
++++ uClibc-0.9.28.2-new/libc/sysdeps/linux/i386/bits/kernel_types.h    2009-01-18 07:24:34.994293859 +0100
+@@ -4,7 +4,14 @@
+  * our private content, and not the kernel header, will win.
+  *  -Erik
+  */
+-#ifndef __ARCH_I386_POSIX_TYPES_H
++#if !defined(__ARCH_I386_POSIX_TYPES_H) && \
++    !defined(_ASM_X86_64_POSIX_TYPES_H) && \
++    !defined(_ASM_X86_POSIX_TYPES_32_H) && \
++    !defined(_ASM_X86_POSIX_TYPES_64_H)
++
++#define _ASM_X86_POSIX_TYPES_32_H
++#define _ASM_X86_POSIX_TYPES_64_H
++#define _ASM_X86_64_POSIX_TYPES_H
+ #define __ARCH_I386_POSIX_TYPES_H
+ 
+ typedef unsigned short        __kernel_dev_t;

diff --git a/toolchain/uClibc/patches/0.9.28.2/190-uml_x86_64_hack.patch b/toolchain/uClibc/patches/0.9.28.2/190-uml_x86_64_hack.patch
deleted file mode 100644 (file)
index fbb5f5c..0000000
--- a/toolchain/uClibc/patches/0.9.28.2/190-uml_x86_64_hack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur uclibc.old/libc/sysdeps/linux/i386/bits/kernel_types.h uclibc.dev/libc/sysdeps/linux/i386/bits/kernel_types.h
---- uclibc.old/libc/sysdeps/linux/i386/bits/kernel_types.h     2005-08-18 00:49:43.000000000 +0200
-+++ uclibc.dev/libc/sysdeps/linux/i386/bits/kernel_types.h     2006-12-14 07:58:19.000000000 +0100
-@@ -4,7 +4,8 @@
-  * our private content, and not the kernel header, will win.
-  *  -Erik
-  */
--#ifndef __ARCH_I386_POSIX_TYPES_H
-+#if !defined(__ARCH_I386_POSIX_TYPES_H) && !defined(_ASM_X86_64_POSIX_TYPES_H)
-+#define _ASM_X86_64_POSIX_TYPES_H
- #define __ARCH_I386_POSIX_TYPES_H
- 
- typedef unsigned short        __kernel_dev_t;