toolchain/uClibc/uClibc-0.9.30-x86-2.6.28+-headers-fix.patch

   1 From df180f43dd9fc651ac760e7fe4a4dcf9e6dd42f1 Mon Sep 17 00:00:00 2001
   2 From: kraj <kraj@69ca8d6d-28ef-0310-b511-8ec308f3f277>
   3 Date: Tue, 23 Dec 2008 09:04:50 +0000
   4 Subject: [PATCH] These defines needs to be considered after recent linux kernel combined i386 and x86_64 into x86
   5
   6 git-svn-id: svn+ssh://uclibc.org/svn/trunk/uClibc@24515 69ca8d6d-28ef-0310-b511-8ec308f3f277
   7 git-svn-id: svn+ssh://uclibc.org/svn/trunk/uClibc@24799 69ca8d6d-28ef-0310-b511-8ec308f3f277
   8 ---
   9  libc/sysdeps/linux/i386/bits/kernel_types.h   |    8 ++++++--
  10  libc/sysdeps/linux/x86_64/bits/kernel_types.h |   11 ++++++++++-
  11  1 files changed, 6 insertions(+), 2 deletions(-)
  12
  13 diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
  14 index 6609dd3..8641a48 100644
  15 --- a/libc/sysdeps/linux/i386/bits/kernel_types.h
  16 +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
  17 @@ -7,10 +7,14 @@
  18
  19  /* a hack for compiling a 32 bit user space with 64 bit
  20   * kernel on x86_64  */
  21 -#if !defined(__ARCH_I386_POSIX_TYPES_H) && !defined(_ASM_X86_64_POSIX_TYPES_H)
  22 +#if !defined(__ARCH_I386_POSIX_TYPES_H) && \
  23 +    !defined(_ASM_X86_64_POSIX_TYPES_H) && \
  24 +    !defined(_ASM_X86_POSIX_TYPES_32_H) && \
  25 +    !defined(_ASM_X86_POSIX_TYPES_64_H)
  26  #define _ASM_X86_64_POSIX_TYPES_H
  27  #define __ARCH_I386_POSIX_TYPES_H
  28 -
  29 +#define _ASM_X86_POSIX_TYPES_32_H
  30 +#define _ASM_X86_POSIX_TYPES_64_H
  31  typedef unsigned short __kernel_dev_t;
  32  typedef unsigned long  __kernel_ino_t;
  33  typedef unsigned short __kernel_mode_t;
  34 diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
  35 index 73f6ffb..b2f7341 100644
  36 --- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
  37 +++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
  38 @@ -4,8 +4,17 @@
  39   * our private content, and not the kernel header, will win.
  40   *  -Erik
  41   */
  42 -#ifndef _ASM_X86_64_POSIX_TYPES_H
  43 +
  44 +/* a hack for compiling a 32 bit user space with 64 bit
  45 + * kernel on x86_64  */
  46 +#if !defined(__ARCH_I386_POSIX_TYPES_H) && \
  47 +    !defined(_ASM_X86_64_POSIX_TYPES_H) && \
  48 +    !defined(_ASM_X86_POSIX_TYPES_32_H) && \
  49 +    !defined(_ASM_X86_POSIX_TYPES_64_H)
  50  #define _ASM_X86_64_POSIX_TYPES_H
  51 +#define __ARCH_I386_POSIX_TYPES_H
  52 +#define _ASM_X86_POSIX_TYPES_32_H
  53 +#define _ASM_X86_POSIX_TYPES_64_H
  54
  55  typedef unsigned long  __kernel_dev_t;
  56  typedef unsigned long  __kernel_ino_t;
  57 --
  58 1.5.6.5
  59