aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2009-01-19 14:53:45 +0000
committerNicolas Thill <nico@openwrt.org>2009-01-19 14:53:45 +0000
commit291e71f792431b5863d2b34ebf0ff40b717d0fc5 (patch)
treefacd0163e98e13f046167ffcc16ac9d4dea19fe6 /toolchain
parentfec30c2b2b71d32150f8ecd1c42a3e0f84c83126 (diff)
downloadupstream-291e71f792431b5863d2b34ebf0ff40b717d0fc5.tar.gz
upstream-291e71f792431b5863d2b34ebf0ff40b717d0fc5.tar.bz2
upstream-291e71f792431b5863d2b34ebf0ff40b717d0fc5.zip
backport patch to allow building uClibc-0.9.28.2 on recent x86 kernels
SVN-Revision: 14105
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/patches/0.9.28.2/180-fix_kernel_types_with_recent_kernel.patch18
-rw-r--r--toolchain/uClibc/patches/0.9.28.2/190-uml_x86_64_hack.patch13
2 files changed, 18 insertions, 13 deletions
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
index 0000000000..829aaca5e1
--- /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
index fbb5f5cfa2..0000000000
--- 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;