From 86cc4b3b9168cd2449384598b71d662da837f551 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 25 Jul 2008 09:27:55 +0000 Subject: linux-openmoko: fix build with gcc 4.3.1 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4946 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../timespec_add_ns_avoid_udivdi3.patch | 20 ++++++++++++++++++++ meta/packages/linux/linux-openmoko_2.6.24+git.bb | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 meta/packages/linux/linux-openmoko/timespec_add_ns_avoid_udivdi3.patch diff --git a/meta/packages/linux/linux-openmoko/timespec_add_ns_avoid_udivdi3.patch b/meta/packages/linux/linux-openmoko/timespec_add_ns_avoid_udivdi3.patch new file mode 100644 index 0000000000..4aba897b06 --- /dev/null +++ b/meta/packages/linux/linux-openmoko/timespec_add_ns_avoid_udivdi3.patch @@ -0,0 +1,20 @@ +Backport of this patch here + +http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg270684.html + +Needed for 2.6.24 to compile with gcc 4.3 +Index: linux-2.6.24/include/linux/time.h +=================================================================== +--- linux-2.6.24.orig/include/linux/time.h 2008-05-28 15:39:46.000000000 -0700 ++++ linux-2.6.24/include/linux/time.h 2008-05-28 15:40:48.000000000 -0700 +@@ -173,6 +173,10 @@ + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { ++ /* The following asm() prevents the compiler from ++ * optimising this loop into a modulo operation. */ ++ asm("" : "+r"(ns)); ++ + ns -= NSEC_PER_SEC; + a->tv_sec++; + } diff --git a/meta/packages/linux/linux-openmoko_2.6.24+git.bb b/meta/packages/linux/linux-openmoko_2.6.24+git.bb index ee3203daf3..a1d573be17 100644 --- a/meta/packages/linux/linux-openmoko_2.6.24+git.bb +++ b/meta/packages/linux/linux-openmoko_2.6.24+git.bb @@ -5,9 +5,10 @@ DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ PE = "1" PV = "${KERNEL_RELEASE}+git${SRCREV}" -PR = "r1" +PR = "r2" -SRC_URI = "git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable" +SRC_URI = "git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \ + file://timespec_add_ns_avoid_udivdi3.patch;patch=1" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf