3 files changed, 20 insertions, 5 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 04c6fa4fca..bac19f459e 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -112,7 +112,7 @@ SRCDATE_xauth ?= "20060120"
 SRCDATE_xserver-kdrive = "20050207"
 SRCDATE_qemu ?= "20060723"
 SRCDATE_qemu-native ?= "20060723"
-SRCDATE_oprofile ?= "20061011"
+SRCDATE_oprofile ?= "20070106"
 SRCDATE_zaurusd ?= "20060729"
 SRCDATE_owl-video-widget ?= "20060925"
 SRCDATE_psplash ?= "20061220"
diff --git a/meta/packages/oprofile/oprofile/oprofile_eabi.patch b/meta/packages/oprofile/oprofile/oprofile_eabi.patch
new file mode 100644
index 0000000000..b360cbeaa6
--- /dev/null
+++ b/meta/packages/oprofile/oprofile/oprofile_eabi.patch
@@ -0,0 +1,18 @@
+---
+ daemon/opd_cookie.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: oprofile/daemon/opd_cookie.c
+===================================================================
+--- oprofile.orig/daemon/opd_cookie.c	2005-10-19 00:28:26.000000000 +0100
++++ oprofile/daemon/opd_cookie.c	2007-01-09 15:12:49.000000000 +0000
+@@ -68,7 +68,8 @@ static inline int lookup_dcookie(cookie_
+ 	return syscall(__NR_lookup_dcookie, (unsigned long)(cookie >> 32),
+ 		       (unsigned long)(cookie & 0xffffffff), buf, size);
+ }
+-#elif (defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_ABI32)) /*_MIPSEL */
++#elif (defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_ABI32)) \
++	|| (defined(__arm__) && defined(__ARM_EABI__))
+ static inline int lookup_dcookie(cookie_t cookie, char * buf, size_t size)
+ {
+ 	return syscall(__NR_lookup_dcookie,
diff --git a/meta/packages/oprofile/oprofile_cvs.bb b/meta/packages/oprofile/oprofile_cvs.bb
index 902c569e85..d6de526b07 100644
--- a/meta/packages/oprofile/oprofile_cvs.bb
+++ b/meta/packages/oprofile/oprofile_cvs.bb
@@ -6,11 +6,8 @@ of profiling all running code at low overhead."
 LICENSE = "GPL"
 DEPENDS = "popt binutils"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
-	   file://no_arm_mapping_syms.patch;patch=1 \
-           file://opcontrol_bashisms.patch;patch=1 \
+	   file://oprofile_eabi.patch;patch=1 \
 	   file://acinclude.m4"
 S = "${WORKDIR}/oprofile"