summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Ouyang <Xin.Ouyang@windriver.com>2012-09-17 12:07:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 15:53:16 (GMT)
commit1e2d6bffc5181f65178b474a93406145578a7490 (patch)
tree2d8a1b30795d09f29b1a330feb368c0ddd0363fb
parentcb1c31939d9dbc52924cee56f93f67d8b699a02c (diff)
downloadpoky-1e2d6bffc5181f65178b474a93406145578a7490.tar.gz
libatomics-ops: update to the latest version 7.2
All old patches are droped because: Merged into 7.2 by upstream: * fedora/libatomic_ops-1.2-ppclwzfix.patch * gentoo/libatomic_ops-1.2-mips.patch * gentoo/sh4-atomic-ops.patch * libatomics-ops_fix_for_x32.patch Obsolete: * doublefix.patch (From OE-Core rev: 59afdbbddbacf5d9c668bb8f011c8f150421d498) Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch27
-rw-r--r--meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch20
-rw-r--r--meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch129
-rw-r--r--meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch70
-rw-r--r--meta/recipes-multimedia/pulseaudio/libatomics-ops/libatomics-ops_fix_for_x32.patch41
-rw-r--r--meta/recipes-multimedia/pulseaudio/libatomics-ops_7.2.bb (renamed from meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb)11
6 files changed, 3 insertions, 295 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch b/meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch
deleted file mode 100644
index 0d3b718..0000000
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Double path references breaks recent autoconf+automake
4
5RP 2/1/10
6
7Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am
8===================================================================
9--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/Makefile.am 2005-09-28 00:53:16.000000000 +0100
10+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am 2010-02-01 14:28:46.397820574 +0000
11@@ -25,7 +25,6 @@
12 README \
13 \
14 gcc/alpha.h gcc/arm.h gcc/x86.h \
15- gcc/hppa.h gcc/ia64.h \
16 gcc/powerpc.h gcc/sparc.h \
17 gcc/hppa.h gcc/m68k.h gcc/s390.h \
18 gcc/ia64.h gcc/x86_64.h gcc/cris.h \
19Index: libatomic_ops-1.2/doc/Makefile.am
20===================================================================
21--- libatomic_ops-1.2.orig/doc/Makefile.am 2010-02-01 15:20:09.207788884 +0000
22+++ libatomic_ops-1.2/doc/Makefile.am 2010-02-01 15:20:20.909049794 +0000
23@@ -1,3 +1,3 @@
24 # installed documentation
25 #
26-dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
27+dist_pkgdata_DATA=LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch b/meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
deleted file mode 100644
index 315ae91..0000000
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Inappropriate [others]
2
3The patch is imported from fedora project, and is not appropriate for us
4to upstream it.
5
6http://cvs.fedoraproject.org/viewcvs/devel/libatomic_ops/libatomic_ops-1.2-ppclwzfix.patch
7
8* add fix for bad variable handling on PPC
9
10--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/gcc/powerpc.h 2007-05-29 19:29:52.000000000 +0200
11+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/powerpc.h 2007-05-29 19:30:48.000000000 +0200
12@@ -72,7 +72,7 @@
13 /* registers. I always got "impossible constraint" when I */
14 /* tried the "y" constraint. */
15 __asm__ __volatile__ (
16- "lwz %0,%1\n"
17+ "lwz%U1%X1 %0,%1\n"
18 "cmpw cr7,%0,%0\n"
19 "bne- cr7,1f\n"
20 "1: isync\n"
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch b/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch
deleted file mode 100644
index 971379d..0000000
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch
+++ /dev/null
@@ -1,129 +0,0 @@
1Upstream-Status: Inappropriate [others]
2
3Patch from gentoo which is not appropriate for us to upstream.
4
5# Patch copied from the OpenEmbedded libatomics-ops recipe. Original
6# source was from Gentoo.
7#
8# Signed-off-by: Scott Garman <scott.a.garman@intel.com>
9diff --git a/src/atomic_ops.h b/src/atomic_ops.h
10index c23f30b..791b360 100755
11--- a/src/atomic_ops.h
12+++ b/src/atomic_ops.h
13@@ -220,6 +220,9 @@
14 # if defined(__cris__) || defined(CRIS)
15 # include "atomic_ops/sysdeps/gcc/cris.h"
16 # endif
17+# if defined(__mips__)
18+# include "atomic_ops/sysdeps/gcc/mips.h"
19+# endif
20 #endif /* __GNUC__ && !AO_USE_PTHREAD_DEFS */
21
22 #if defined(__INTEL_COMPILER) && !defined(AO_USE_PTHREAD_DEFS)
23diff --git a/src/atomic_ops/sysdeps/Makefile.am b/src/atomic_ops/sysdeps/Makefile.am
24index 74122b4..d6737c0 100644
25--- a/src/atomic_ops/sysdeps/Makefile.am
26+++ b/src/atomic_ops/sysdeps/Makefile.am
27@@ -29,6 +29,7 @@ nobase_sysdep_HEADERS= generic_pthread.h \
28 gcc/powerpc.h gcc/sparc.h \
29 gcc/hppa.h gcc/m68k.h gcc/s390.h \
30 gcc/ia64.h gcc/x86_64.h gcc/cris.h \
31+ gcc/mips.h \
32 \
33 icc/ia64.h \
34 \
35diff --git a/src/atomic_ops/sysdeps/gcc/mips.h b/src/atomic_ops/sysdeps/gcc/mips.h
36new file mode 100644
37index 0000000..e7f3a5d
38--- /dev/null
39+++ b/src/atomic_ops/sysdeps/gcc/mips.h
40@@ -0,0 +1,89 @@
41+/*
42+ * Copyright (c) 2005 Thiemo Seufer <ths@networkno.de>
43+ * Copyright (c) 2007 Zhang Le <r0bertz@gentoo.org>
44+ *
45+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
46+ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
47+ *
48+ * Permission is hereby granted to use or copy this program
49+ * for any purpose, provided the above notices are retained on all copies.
50+ * Permission to modify the code and to distribute modified code is granted,
51+ * provided the above notices are retained, and a notice that the code was
52+ * modified is included with the above copyright notice.
53+ */
54+
55+#include "../all_aligned_atomic_load_store.h"
56+#include "../test_and_set_t_is_ao_t.h"
57+
58+/* Data dependence does not imply read ordering. */
59+#define AO_NO_DD_ORDERING
60+
61+AO_INLINE void
62+AO_nop_full()
63+{
64+ __asm__ __volatile__(
65+ " .set push \n"
66+ " .set mips3 \n"
67+ " .set noreorder \n"
68+ " .set nomacro \n"
69+ " sync \n"
70+ " .set pop "
71+ : : : "memory");
72+}
73+
74+#define AO_HAVE_nop_full
75+
76+AO_INLINE int
77+AO_compare_and_swap(volatile AO_t *addr, AO_t old, AO_t new_val)
78+{
79+ register int was_equal = 0;
80+ register int temp;
81+
82+ __asm__ __volatile__(
83+ " .set push \n"
84+ " .set mips3 \n"
85+ " .set noreorder \n"
86+ " .set nomacro \n"
87+ "1: ll %0, %1 \n"
88+ " bne %0, %4, 2f \n"
89+ " move %0, %3 \n"
90+ " sc %0, %1 \n"
91+ " .set pop \n"
92+ " beqz %0, 1b \n"
93+ " li %2, 1 \n"
94+ "2: "
95+ : "=&r" (temp), "+R" (*addr), "+r" (was_equal)
96+ : "r" (new_val), "r" (old)
97+ : "memory");
98+ return was_equal;
99+}
100+
101+#define AO_HAVE_compare_and_swap
102+
103+AO_INLINE AO_t
104+AO_fetch_and_add_full (volatile AO_t *p, AO_t incr)
105+{
106+ AO_t result, temp;
107+ __asm__ __volatile__(
108+ " .set push \n"
109+ " .set mips3 \n"
110+ " .set noreorder \n"
111+ " .set nomacro \n"
112+ "1: ll %1, %2 \n"
113+ " addu %0, %1, %3 \n"
114+ " sc %0, %2 \n"
115+ " beqz %0, 1b \n"
116+ " addu %0, %1, %3 \n"
117+ " sync \n"
118+ " .set pop \n"
119+ : "=&r" (result), "=&r" (temp), "=m" (*p)
120+ : "r" (incr), "m" (*p)
121+ : "memory");
122+ return result;
123+}
124+
125+#define AO_HAVE_fetch_and_add_full
126+
127+/*
128+ * FIXME: fetch_and_add_full implemented, any others?
129+ */
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch b/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch
deleted file mode 100644
index dfdd29c..0000000
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1This patch is taken from Gentoo
2http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch?revision=1.1&view=markup
3
4Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: libatomic_ops-1.2/src/atomic_ops.h
8===================================================================
9--- libatomic_ops-1.2.orig/src/atomic_ops.h 2012-04-30 13:56:17.000000000 -0700
10+++ libatomic_ops-1.2/src/atomic_ops.h 2012-04-30 13:58:28.747602349 -0700
11@@ -223,6 +223,10 @@
12 # if defined(__mips__)
13 # include "atomic_ops/sysdeps/gcc/mips.h"
14 # endif
15+# if defined(__sh__) || defined(SH4)
16+# include "atomic_ops/sysdeps/gcc/sh.h"
17+# define AO_CAN_EMUL_CAS
18+# endif /* __sh__ */
19 #endif /* __GNUC__ && !AO_USE_PTHREAD_DEFS */
20
21 #if defined(__INTEL_COMPILER) && !defined(AO_USE_PTHREAD_DEFS)
22Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am
23===================================================================
24--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/Makefile.am 2012-04-30 10:52:18.000000000 -0700
25+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am 2012-04-30 14:00:11.511609965 -0700
26@@ -28,7 +28,7 @@
27 gcc/powerpc.h gcc/sparc.h \
28 gcc/hppa.h gcc/m68k.h gcc/s390.h \
29 gcc/ia64.h gcc/x86_64.h gcc/cris.h \
30- gcc/mips.h \
31+ gcc/mips.h gcc/sh.h \
32 \
33 icc/ia64.h \
34 \
35Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/sh.h
36===================================================================
37--- /dev/null 1970-01-01 00:00:00.000000000 +0000
38+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/sh.h 2012-04-30 13:58:28.755602350 -0700
39@@ -0,0 +1,31 @@
40+/*
41+ * Copyright (c) 2009 by Takashi YOSHII. All rights reserved.
42+ *
43+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
44+ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
45+ *
46+ * Permission is hereby granted to use or copy this program
47+ * for any purpose, provided the above notices are retained on all copies.
48+ * Permission to modify the code and to distribute modified code is granted,
49+ * provided the above notices are retained, and a notice that the code was
50+ * modified is included with the above copyright notice.
51+ */
52+
53+#include "../all_atomic_load_store.h"
54+#include "../ordered.h"
55+
56+/* sh has tas.b(byte) only */
57+#include "../test_and_set_t_is_char.h"
58+
59+AO_INLINE AO_TS_VAL_t
60+AO_test_and_set_full(volatile AO_TS_t *addr)
61+{
62+ int oldval;
63+ __asm__ __volatile__(
64+ "tas.b @%1; movt %0"
65+ : "=r" (oldval)
66+ : "r" (addr)
67+ : "t", "memory");
68+ return oldval? AO_TS_CLEAR : AO_TS_SET;
69+}
70+#define AO_HAVE_test_and_set_full
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
deleted file mode 100644
index 1768606..0000000
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops/libatomics-ops_fix_for_x32.patch
+++ /dev/null
@@ -1,41 +0,0 @@
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_7.2.bb
index eba43cd..3706656 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops_7.2.bb
@@ -6,18 +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 = "r10" 9PR = "r0"
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 \
13 file://gentoo/libatomic_ops-1.2-mips.patch \
14 file://doublefix.patch \
15 file://libatomics-ops_fix_for_x32.patch \
16 file://gentoo/sh4-atomic-ops.patch \
17 " 12 "
18 13
19SRC_URI[md5sum] = "1b65e48271c81e3fa2d7a9a69bab7504" 14SRC_URI[md5sum] = "890acdc83a7cd10e2e9536062d3741c8"
20SRC_URI[sha256sum] = "a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781" 15SRC_URI[sha256sum] = "c4ee6e0c304c6f13bcc32968453cdb54b2ec233d8bf4cfcf266ee09dc33b4eb5"
21 16
22S = "${WORKDIR}/libatomic_ops-${PV}" 17S = "${WORKDIR}/libatomic_ops-${PV}"
23 18