changeset 824:3c81b6825017

The 2.6.31 kernel broke sh4 in qemu 0.9.30.1 because bits/kernel_types.h is and has always been utterly horrible.
author Rob Landley <rob@landley.net>
date Thu, 17 Sep 2009 22:03:42 -0500
parents 3c6565240019
children d42727e9e075
files sources/patches/uClibc-fixsh4.patch
diffstat 1 files changed, 28 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sources/patches/uClibc-fixsh4.patch	Thu Sep 17 22:03:42 2009 -0500
@@ -0,0 +1,28 @@
+diff -ru uClibc/libc/sysdeps/linux/sh/bits/kernel_types.h uClibc2/libc/sysdeps/linux/sh/bits/kernel_types.h
+--- uClibc/libc/sysdeps/linux/sh/bits/kernel_types.h	2008-07-23 06:23:36.000000000 -0500
++++ uClibc2/libc/sysdeps/linux/sh/bits/kernel_types.h	2009-09-17 21:05:29.000000000 -0500
+@@ -4,8 +4,9 @@
+  * our private content, and not the kernel header, will win.
+  *  -Erik
+  */
+-#ifndef __ASM_SH_POSIX_TYPES_H
++#if !defined(__ASM_SH_POSIX_TYPES_H) && !defined(__ASM_SH_POSIX_TYPES_32_H)
+ #define __ASM_SH_POSIX_TYPES_H
++#define __ASM_SH_POSIX_TYPES_32_H
+ 
+ typedef unsigned short	__kernel_dev_t;
+ typedef unsigned long	__kernel_ino_t;
+diff -ru uClibc/libc/sysdeps/linux/sh64/bits/kernel_types.h uClibc2/libc/sysdeps/linux/sh64/bits/kernel_types.h
+--- uClibc/libc/sysdeps/linux/sh64/bits/kernel_types.h	2008-07-23 06:23:36.000000000 -0500
++++ uClibc2/libc/sysdeps/linux/sh64/bits/kernel_types.h	2009-09-17 21:06:35.000000000 -0500
+@@ -16,8 +16,9 @@
+  * our private content, and not the kernel header, will win.
+  *  -Erik
+  */
+-#ifndef __ASM_SH64_POSIX_TYPES_H
++#if !defined(__ASM_SH64_POSIX_TYPES_H) && !defined(__ASM_SH_POSIX_TYPES_64_H)
+ #define __ASM_SH64_POSIX_TYPES_H
++#define __ASM_SH_POSIX_TYPES_64_H
+ 
+ typedef unsigned short  __kernel_dev_t;
+ typedef unsigned long   __kernel_ino_t;