backport patch to allow building uClibc-0.9.28.2 on recent x86 kernels

SVN-Revision: 14105
This commit is contained in:
Nicolas Thill 2009-01-19 14:53:45 +00:00
parent fec30c2b2b
commit 291e71f792
2 changed files with 18 additions and 13 deletions

View file

@ -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;

View file

@ -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;