toolchain/uClibc/patches-0.9.30/180-fix_kernel_types_with_recent_kernel.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 ---
   8  libc/sysdeps/linux/i386/bits/kernel_types.h |    8 ++++++--
   9  1 files changed, 6 insertions(+), 2 deletions(-)
  10
  11 diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
  12 index 6609dd3..8641a48 100644
  13 --- a/libc/sysdeps/linux/i386/bits/kernel_types.h
  14 +++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
  15 @@ -7,10 +7,14 @@
  16
  17  /* a hack for compiling a 32 bit user space with 64 bit
  18   * kernel on x86_64  */
  19 -#if !defined(__ARCH_I386_POSIX_TYPES_H) && !defined(_ASM_X86_64_POSIX_TYPES_H)
  20 +#if !defined(__ARCH_I386_POSIX_TYPES_H) && \
  21 +    !defined(_ASM_X86_64_POSIX_TYPES_H) && \
  22 +    !defined(_ASM_X86_POSIX_TYPES_32_H) && \
  23 +    !defined(_ASM_X86_POSIX_TYPES_64_H)
  24  #define _ASM_X86_64_POSIX_TYPES_H
  25  #define __ARCH_I386_POSIX_TYPES_H
  26 -
  27 +#define _ASM_X86_POSIX_TYPES_32_H
  28 +#define _ASM_X86_POSIX_TYPES_64_H
  29  typedef unsigned short __kernel_dev_t;
  30  typedef unsigned long  __kernel_ino_t;
  31  typedef unsigned short __kernel_mode_t;
  32 --
  33 1.5.6.5
  34
  35 diff -ruN uClibc-0.9.30-old/libc/sysdeps/linux/x86_64/bits/kernel_types.h uClibc-0.9.30-new/libc/sysdeps/linux/x86_64/bits/kernel_types.h
  36 --- uClibc-0.9.30-old/libc/sysdeps/linux/x86_64/bits/kernel_types.h     2008-07-23 13:23:36.000000000 +0200
  37 +++ uClibc-0.9.30-new/libc/sysdeps/linux/x86_64/bits/kernel_types.h     2009-01-21 16:33:27.000000000 +0100
  38 @@ -4,8 +4,10 @@
  39   * our private content, and not the kernel header, will win.
  40   *  -Erik
  41   */
  42 -#ifndef _ASM_X86_64_POSIX_TYPES_H
  43 +#if !defined(_ASM_X86_64_POSIX_TYPES_H) && \
  44 +    !defined(_ASM_X86_POSIX_TYPES_64_H)
  45  #define _ASM_X86_64_POSIX_TYPES_H
  46 +#define _ASM_X86_POSIX_TYPES_64_H
  47
  48  typedef unsigned long  __kernel_dev_t;
  49  typedef unsigned long  __kernel_ino_t;