From f8fa6368a6a0c02164da8e2f52f18d457c6977bd Mon Sep 17 00:00:00 2001
From: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date: Sun, 24 Feb 2008 11:44:29 +0900
Subject: [PATCH] Remove the __STRICT_ANSI__ check from the __u64/__s64
 declaration on 32bit targets.

The previous patch was lacking of i386, microblaze, nios and nios2. This
patch tries to fix them.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
---
 include/asm-i386/types.h       | 6 +++---
 include/asm-microblaze/types.h | 6 +++---
 include/asm-nios/types.h       | 6 +++---
 include/asm-nios2/types.h      | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/asm-i386/types.h b/include/asm-i386/types.h
index 69f8a5a7c6..bdbde4172a 100644
--- a/include/asm-i386/types.h
+++ b/include/asm-i386/types.h
@@ -17,9 +17,9 @@ typedef unsigned short __u16;
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
+#if defined(__GNUC__)
+__extension__ typedef __signed__ long long __s64;
+__extension__ typedef unsigned long long __u64;
 #endif
 
 /*
diff --git a/include/asm-microblaze/types.h b/include/asm-microblaze/types.h
index 8c4bef2870..3895dc4365 100644
--- a/include/asm-microblaze/types.h
+++ b/include/asm-microblaze/types.h
@@ -25,9 +25,9 @@ typedef unsigned short __u16;
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
+#if defined(__GNUC__)
+__extension__ typedef __signed__ long long __s64;
+__extension__ typedef unsigned long long __u64;
 #endif
 
 /*
diff --git a/include/asm-nios/types.h b/include/asm-nios/types.h
index 43fd8f6d2b..24c98a89e4 100644
--- a/include/asm-nios/types.h
+++ b/include/asm-nios/types.h
@@ -25,9 +25,9 @@ typedef unsigned short __u16;
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
+#if defined(__GNUC__)
+__extension__ typedef __signed__ long long __s64;
+__extension__ typedef unsigned long long __u64;
 #endif
 
 /*
diff --git a/include/asm-nios2/types.h b/include/asm-nios2/types.h
index 39e2641787..f13d8bd4b4 100644
--- a/include/asm-nios2/types.h
+++ b/include/asm-nios2/types.h
@@ -25,9 +25,9 @@ typedef unsigned short __u16;
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
+#if defined(__GNUC__)
+__extension__ typedef __signed__ long long __s64;
+__extension__ typedef unsigned long long __u64;
 #endif
 
 /*
-- 
GitLab