| From df180f43dd9fc651ac760e7fe4a4dcf9e6dd42f1 Mon Sep 17 00:00:00 2001 |
| From: kraj <kraj@69ca8d6d-28ef-0310-b511-8ec308f3f277> |
| 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/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 |
| index 6609dd3..8641a48 100644 |
| --- a/libc/sysdeps/linux/i386/bits/kernel_types.h |
| +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h |
| @@ -7,10 +7,14 @@ |
| |
| /* 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) |
| +#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 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 |
| |
