From 51593c2775fef1d9fca9e94d9f18622b40a3ab87 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Sat, 19 Jul 2008 09:36:25 +0000
Subject: linux-omap-2.6.25: Fix compile with gcc 4.3.1

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4889 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/linux/linux-omap-2.6.25/fixes.patch | 38 +++++++++++++++++++++++
 meta/packages/linux/linux-omap_2.6.25.bb          |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 meta/packages/linux/linux-omap-2.6.25/fixes.patch

diff --git a/meta/packages/linux/linux-omap-2.6.25/fixes.patch b/meta/packages/linux/linux-omap-2.6.25/fixes.patch
new file mode 100644
index 0000000000..5df21d5faa
--- /dev/null
+++ b/meta/packages/linux/linux-omap-2.6.25/fixes.patch
@@ -0,0 +1,38 @@
+Index: git/arch/arm/Makefile
+===================================================================
+--- git.orig/arch/arm/Makefile	2008-06-13 13:10:59.000000000 +0100
++++ git/arch/arm/Makefile	2008-07-19 10:31:31.000000000 +0100
+@@ -47,7 +47,7 @@
+ # Note that GCC does not numerically define an architecture version
+ # macro, but instead defines a whole series of macros which makes
+ # testing for a specific architecture or later rather impossible.
+-arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a)
++arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
+ arch-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
+ # Only override the compiler option if ARMv6. The ARMv6K extensions are
+ # always available in ARMv7
+Index: git/include/asm-arm/processor.h
+===================================================================
+--- git.orig/include/asm-arm/processor.h	2008-06-13 13:12:19.000000000 +0100
++++ git/include/asm-arm/processor.h	2008-07-19 10:31:31.000000000 +0100
+@@ -109,14 +109,16 @@
+ #if __LINUX_ARM_ARCH__ >= 5
+ 
+ #define ARCH_HAS_PREFETCH
+-static inline void prefetch(const void *ptr)
++#define prefetch(ptr) __builtin_prefetch(ptr)
++
++/*static inline void prefetch(const void *ptr)
+ {
+ 	__asm__ __volatile__(
+-		"pld\t%0"
++		"pld\ta%0"
+ 		:
+-		: "o" (*(char *)ptr)
++		: "p" (ptr)
+ 		: "cc");
+-}
++}*/
+ 
+ #define ARCH_HAS_PREFETCHW
+ #define prefetchw(ptr)	prefetch(ptr)
diff --git a/meta/packages/linux/linux-omap_2.6.25.bb b/meta/packages/linux/linux-omap_2.6.25.bb
index 68d700fc09..356f7551e9 100644
--- a/meta/packages/linux/linux-omap_2.6.25.bb
+++ b/meta/packages/linux/linux-omap_2.6.25.bb
@@ -1,9 +1,10 @@
 require linux-omap.inc
 
-PR = "r1"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "omap-3430sdp"
 SRC_URI="git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git;tag=3ce7ba0c3c9566f50725b0108916180db86e1641 \
+         file://fixes.patch;patch=1 \
          file://defconfig-omap-3430sdp"
 S = "${WORKDIR}/git"
 
-- 
cgit v1.2.3-54-g00ecf