summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-12-02 12:20:09 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-05 22:47:08 +0000
commite3a384578f677c05d812d99c2c92aa13670bd06a (patch)
tree256521c19b8ea3b4e216f508f4fef68eb651854e
parentf5c071d93c9e6f57930bce56b1e4f009c160a826 (diff)
downloadpoky-e3a384578f677c05d812d99c2c92aa13670bd06a.tar.gz
libatomics-ops: patch source code for x32
This Fixes bug: [YOCTO #1418] Remove the `q' suffix on x86-64 atomic instructions. We don't need the `q' suffix on x86_64 atomic instructions for AO_t, which is defined as "unsigned long". "unsigned long" is 32bit for x32 and 64bit for x86-64. The register operand in x86-64 atomic instructions is sufficient to properly determine the register size. (From OE-Core rev: daaaeb1bd1467a2bed75722ce3ff35be970402e0) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: H.J. Lu <hjl.tools@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/libatomics-ops/libatomics-ops_fix_for_x32.patch41
-rw-r--r--meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb5
2 files changed, 44 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops/libatomics-ops_fix_for_x32.patch b/meta/recipes-multimedia/pulseaudio/libatomics-ops/libatomics-ops_fix_for_x32.patch
new file mode 100644
index 0000000000..17686063de
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops/libatomics-ops_fix_for_x32.patch
@@ -0,0 +1,41 @@
1Upstream-Status: Pending
2
3Remove the `q' suffix on x86-64 atomic instructions.
4
5We don't need the `q' suffix on x86_64 atomic instructions for AO_t,
6which is defined as "unsigned long". "unsigned long" is 32bit for x32
7and 64bit for x86-64. The register operand in x86-64 atomic instructions
8is sufficient to properly determine the register size.
9
10Received this patch from H.J. Lu <hjl.tools@gmail.com>
11Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/02
12
13--- libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/x86_64.h.x32 2005-09-28 17:16:38.000000000 -0700
14+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/x86_64.h 2011-12-02 09:29:54.265251875 -0800
15@@ -60,7 +60,7 @@ AO_fetch_and_add_full (volatile AO_t *p,
16 {
17 AO_t result;
18
19- __asm__ __volatile__ ("lock; xaddq %0, %1" :
20+ __asm__ __volatile__ ("lock; xadd %0, %1" :
21 "=r" (result), "=m" (*p) : "0" (incr), "m" (*p)
22 : "memory");
23 return result;
24@@ -111,7 +111,7 @@ AO_int_fetch_and_add_full (volatile unsi
25 AO_INLINE void
26 AO_or_full (volatile AO_t *p, AO_t incr)
27 {
28- __asm__ __volatile__ ("lock; orq %1, %0" :
29+ __asm__ __volatile__ ("lock; or %1, %0" :
30 "=m" (*p) : "r" (incr), "m" (*p) : "memory");
31 }
32
33@@ -136,7 +136,7 @@ AO_compare_and_swap_full(volatile AO_t *
34 AO_t old, AO_t new_val)
35 {
36 char result;
37- __asm__ __volatile__("lock; cmpxchgq %3, %0; setz %1"
38+ __asm__ __volatile__("lock; cmpxchg %3, %0; setz %1"
39 : "=m"(*addr), "=q"(result)
40 : "m"(*addr), "r" (new_val), "a"(old) : "memory");
41 return (int) result;
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
index c84917a7b3..184c167fc0 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
@@ -6,12 +6,13 @@ LICENSE = "GPLv2 & MIT"
6LIC_FILES_CHKSUM = "file://doc/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 6LIC_FILES_CHKSUM = "file://doc/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://doc/LICENSING.txt;md5=607073e04548eac7d1f763e480477bab \ 7 file://doc/LICENSING.txt;md5=607073e04548eac7d1f763e480477bab \
8 " 8 "
9PR = "r7" 9PR = "r8"
10 10
11SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-${PV}.tar.gz \ 11SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-${PV}.tar.gz \
12 file://fedora/libatomic_ops-1.2-ppclwzfix.patch \ 12 file://fedora/libatomic_ops-1.2-ppclwzfix.patch \
13 file://gentoo/libatomic_ops-1.2-mips.patch \ 13 file://gentoo/libatomic_ops-1.2-mips.patch \
14 file://doublefix.patch" 14 file://doublefix.patch \
15 file://libatomics-ops_fix_for_x32.patch"
15 16
16SRC_URI[md5sum] = "1b65e48271c81e3fa2d7a9a69bab7504" 17SRC_URI[md5sum] = "1b65e48271c81e3fa2d7a9a69bab7504"
17SRC_URI[sha256sum] = "a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781" 18SRC_URI[sha256sum] = "a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781"