diff options
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch | 70 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb | 6 |
2 files changed, 74 insertions, 2 deletions
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 new file mode 100644 index 000000000..dfdd29cad --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch @@ -0,0 +1,70 @@ +This patch is taken from Gentoo +http://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 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: libatomic_ops-1.2/src/atomic_ops.h +=================================================================== +--- libatomic_ops-1.2.orig/src/atomic_ops.h 2012-04-30 13:56:17.000000000 -0700 ++++ libatomic_ops-1.2/src/atomic_ops.h 2012-04-30 13:58:28.747602349 -0700 +@@ -223,6 +223,10 @@ + # if defined(__mips__) + # include "atomic_ops/sysdeps/gcc/mips.h" + # endif ++# if defined(__sh__) || defined(SH4) ++# include "atomic_ops/sysdeps/gcc/sh.h" ++# define AO_CAN_EMUL_CAS ++# endif /* __sh__ */ + #endif /* __GNUC__ && !AO_USE_PTHREAD_DEFS */ + + #if defined(__INTEL_COMPILER) && !defined(AO_USE_PTHREAD_DEFS) +Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am +=================================================================== +--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/Makefile.am 2012-04-30 10:52:18.000000000 -0700 ++++ libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am 2012-04-30 14:00:11.511609965 -0700 +@@ -28,7 +28,7 @@ + gcc/powerpc.h gcc/sparc.h \ + gcc/hppa.h gcc/m68k.h gcc/s390.h \ + gcc/ia64.h gcc/x86_64.h gcc/cris.h \ +- gcc/mips.h \ ++ gcc/mips.h gcc/sh.h \ + \ + icc/ia64.h \ + \ +Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/sh.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/sh.h 2012-04-30 13:58:28.755602350 -0700 +@@ -0,0 +1,31 @@ ++/* ++ * Copyright (c) 2009 by Takashi YOSHII. All rights reserved. ++ * ++ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED ++ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. ++ * ++ * Permission is hereby granted to use or copy this program ++ * for any purpose, provided the above notices are retained on all copies. ++ * Permission to modify the code and to distribute modified code is granted, ++ * provided the above notices are retained, and a notice that the code was ++ * modified is included with the above copyright notice. ++ */ ++ ++#include "../all_atomic_load_store.h" ++#include "../ordered.h" ++ ++/* sh has tas.b(byte) only */ ++#include "../test_and_set_t_is_char.h" ++ ++AO_INLINE AO_TS_VAL_t ++AO_test_and_set_full(volatile AO_TS_t *addr) ++{ ++ int oldval; ++ __asm__ __volatile__( ++ "tas.b @%1; movt %0" ++ : "=r" (oldval) ++ : "r" (addr) ++ : "t", "memory"); ++ return oldval? AO_TS_CLEAR : AO_TS_SET; ++} ++#define AO_HAVE_test_and_set_full diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb index d0162e67b..eba43cd21 100644 --- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb +++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb @@ -6,13 +6,15 @@ LICENSE = "GPLv2 & MIT" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://doc/LICENSING.txt;md5=607073e04548eac7d1f763e480477bab \ " -PR = "r9" +PR = "r10" SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-${PV}.tar.gz \ file://fedora/libatomic_ops-1.2-ppclwzfix.patch \ file://gentoo/libatomic_ops-1.2-mips.patch \ file://doublefix.patch \ - file://libatomics-ops_fix_for_x32.patch" + file://libatomics-ops_fix_for_x32.patch \ + file://gentoo/sh4-atomic-ops.patch \ + " SRC_URI[md5sum] = "1b65e48271c81e3fa2d7a9a69bab7504" SRC_URI[sha256sum] = "a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781" |