diff options
| author | Dmitry Artamonow <mad_soft@inbox.ru> | 2009-05-22 07:31:34 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-05-22 19:53:13 +0200 |
| commit | 0f1bfa08ced1bd3482220bf3b97bb55fcc45de31 (patch) | |
| tree | 3e52b13b9f71a48fbe34c54b9776329460c3fa23 | |
| parent | fc9e12bd1987d2c91fc6d2163e6246744aa92bc4 (diff) | |
linux-handhelds-2.6: fix compilation with gcc-4.3
Backport time.h patch from 2.6.25 kernel
(commit 38332cb98772f5ea757e6486bed7ed0381cb5f98)
It fixes following error during compilation:
LD .tmp_vmlinux1
kernel/built-in.o: In function `getnstimeofday':
utsname_sysctl.c:(.text+0xf110): undefined reference to `__aeabi_uldivmod'
kernel/built-in.o: In function `do_gettimeofday':
utsname_sysctl.c:(.text+0xf1d0): undefined reference to `__aeabi_uldivmod'
utsname_sysctl.c:(.text+0xf1ec): undefined reference to `__aeabi_uldivmod'
kernel/built-in.o: In function `do_timer':
utsname_sysctl.c:(.text+0x100ec): undefined reference to `__aeabi_uldivmod'
utsname_sysctl.c:(.text+0x1010c): undefined reference to `__aeabi_uldivmod'
make: *** [.tmp_vmlinux1] Error 1
See also similar OE bug #4333
Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: Koen Kooi <koen@openembedded.org>
| -rw-r--r-- | recipes/linux/linux-handhelds-2.6-2.6.21/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch | 34 | ||||
| -rw-r--r-- | recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb | 3 |
2 files changed, 36 insertions, 1 deletions
diff --git a/recipes/linux/linux-handhelds-2.6-2.6.21/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch b/recipes/linux/linux-handhelds-2.6-2.6.21/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch new file mode 100644 index 0000000000..ad10b67639 --- /dev/null +++ b/recipes/linux/linux-handhelds-2.6-2.6.21/0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch @@ -0,0 +1,34 @@ +From 38332cb98772f5ea757e6486bed7ed0381cb5f98 Mon Sep 17 00:00:00 2001 +From: Segher Boessenkool <segher@kernel.crashing.org> +Date: Tue, 4 Mar 2008 14:59:54 -0800 +Subject: [PATCH] time: prevent the loop in timespec_add_ns() from being optimised away + +Since some architectures don't support __udivdi3(). + +Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> +Cc: john stultz <johnstul@us.ibm.com> +Cc: Ingo Molnar <mingo@elte.hu> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +--- + include/linux/time.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/include/linux/time.h b/include/linux/time.h +index 2091a19..d32ef0a 100644 +--- a/include/linux/time.h ++++ b/include/linux/time.h +@@ -174,6 +174,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) + { + 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++; + } +-- +1.6.0.6 + diff --git a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb index f6bb17302d..d955c0ab39 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r25" +PR = "r26" DEFAULT_PREFERENCE = "-1" @@ -13,6 +13,7 @@ SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('P file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch;patch=1 \ http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;patch=1 \ file://gcc4x-limits.patch;patch=1 \ + file://0001-time-prevent-the-loop-in-timespec_add_ns-from-bei.patch;patch=1 \ file://defconfig" require linux-handhelds-2.6.inc |