aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-01-12 15:57:28 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-01-12 15:57:28 +0000
commitb268646b9f881bb499d5ec237eea89f3e7549482 (patch)
tree3f5f2cb916c2859825d32b7942d58edaa550d37d /toolchain
parent8356803dcf83a49d8d5f7e4b985b77d50c6b67e4 (diff)
downloadbuildroot-novena-b268646b9f881bb499d5ec237eea89f3e7549482.tar.gz
buildroot-novena-b268646b9f881bb499d5ec237eea89f3e7549482.zip
uclibc: 0.9.30-x86-2.6.28+headers-fix: add r24799 as well
Handle x86_84 as well. From uclibc r24799.
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/uClibc/uClibc-0.9.30-x86-2.6.28+-headers-fix.patch27
1 files changed, 26 insertions, 1 deletions
diff --git a/toolchain/uClibc/uClibc-0.9.30-x86-2.6.28+-headers-fix.patch b/toolchain/uClibc/uClibc-0.9.30-x86-2.6.28+-headers-fix.patch
index 2c68583be..f5155a8de 100644
--- a/toolchain/uClibc/uClibc-0.9.30-x86-2.6.28+-headers-fix.patch
+++ b/toolchain/uClibc/uClibc-0.9.30-x86-2.6.28+-headers-fix.patch
@@ -4,8 +4,10 @@ Date: Tue, 23 Dec 2008 09:04:50 +0000
Subject: [PATCH] These defines needs to be considered after recent linux kernel combined i386 and x86_64 into x86
git-svn-id: svn+ssh://uclibc.org/svn/trunk/uClibc@24515 69ca8d6d-28ef-0310-b511-8ec308f3f277
+git-svn-id: svn+ssh://uclibc.org/svn/trunk/uClibc@24799 69ca8d6d-28ef-0310-b511-8ec308f3f277
---
- libc/sysdeps/linux/i386/bits/kernel_types.h | 8 ++++++--
+ libc/sysdeps/linux/i386/bits/kernel_types.h | 8 ++++++--
+ libc/sysdeps/linux/x86_64/bits/kernel_types.h | 11 ++++++++++-
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
@@ -29,6 +31,29 @@ index 6609dd3..8641a48 100644
typedef unsigned short __kernel_dev_t;
typedef unsigned long __kernel_ino_t;
typedef unsigned short __kernel_mode_t;
+diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+index 73f6ffb..b2f7341 100644
+--- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
++++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+@@ -4,8 +4,17 @@
+ * our private content, and not the kernel header, will win.
+ * -Erik
+ */
+-#ifndef _ASM_X86_64_POSIX_TYPES_H
++
++/* a hack for compiling a 32 bit user space with 64 bit
++ * kernel on x86_64 */
++#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_64_POSIX_TYPES_H
++#define __ARCH_I386_POSIX_TYPES_H
++#define _ASM_X86_POSIX_TYPES_32_H
++#define _ASM_X86_POSIX_TYPES_64_H
+
+ typedef unsigned long __kernel_dev_t;
+ typedef unsigned long __kernel_ino_t;
--
1.5.6.5