Add patch to make it work on sh

Package-Manager: portage-2.1.7.17/cvs/Linux ia64

4 files changed, 69 insertions, 4 deletions

diff --git a/dev-libs/libatomic_ops/ChangeLog b/dev-libs/libatomic_ops/ChangeLog
index e679d2be4df8..dc10112b2798 100644
--- a/dev-libs/libatomic_ops/ChangeLog
+++ b/dev-libs/libatomic_ops/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libatomic_ops
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/ChangeLog,v 1.18 2010/01/26 18:27:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/ChangeLog,v 1.19 2010/04/05 16:32:02 armin76 Exp $
+
+  05 Apr 2010; Raúl Porcel <armin76@gentoo.org>
+  libatomic_ops-1.2-r1.ebuild, +files/libatomic_ops-1.2-sh4.patch:
+  Add patch to make it work on sh
 
   26 Jan 2010; Fabian Groffen <grobian@gentoo.org>
   libatomic_ops-1.2-r1.ebuild:
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index d83cc19d4ad4..f08fc9656f91 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,9 +1,10 @@
 AUX libatomic_ops-1.2-ppc-asm.patch 427 RMD160 89773869a9336ff64aeac2b34091f3f93abd7817 SHA1 22b5a82efaa3e59d3f2372be51894201747d21e9 SHA256 a8cdb35c08084878a10c72ddfa318586135142dbbbb346e0d727e9d170eb28bb
 AUX libatomic_ops-1.2-ppc64-load_acquire.patch 1383 RMD160 d3d368915d613b8a8f4af4806ede9e9f53d3eadc SHA1 6ca477928f48f7cc1f2515eb3d8f99af7d118807 SHA256 f061cdf1e70448a193abe316d9c4b4f6b924132a99abcea9753b1440274304f1
+AUX libatomic_ops-1.2-sh4.patch 1839 RMD160 cf6c3ed80ab23bfd20fcf76fd9586921dca76799 SHA1 b8651412ed000cdab7fb97741996d59249712421 SHA256 64c53b6c5cac37893f0e81e63a396f04ecc32933480cbb90798fe9dc558bc505
 DIST libatomic_ops-1.1.tar.gz 178581 RMD160 ccfa008ece3365390a05badcfd9580ffa96d0302 SHA1 4412ad70afbd5dd954378b94aa3e7e02ba89ecc3 SHA256 f5fb0d89b5b26a7f0bb00c92463aeb62a425c491391bc7e36660a1ac0b5a1f13
 DIST libatomic_ops-1.2.tar.gz 183780 RMD160 8c548b32033c954a61e740f9a0e76ca8f005c4f6 SHA1 8bf4134d614acb1a6234b3102e67a847ae9369b0 SHA256 a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781
 EBUILD libatomic_ops-1.1.ebuild 619 RMD160 504726b1cbd8050d8e5291aa75adaf7dcc57ab93 SHA1 aeed1ccd99a56308de8729e553633d88bd89c5b6 SHA256 822e4bf132b233c6f9be11b6411e31972a25aaec9540f15f4a71ee290e4d022d
-EBUILD libatomic_ops-1.2-r1.ebuild 875 RMD160 7ba3fdf0686b6785721db85dcaa974ff875f2690 SHA1 138f072cc7510d84b8a851ded662f70b18fa183f SHA256 63ca36023168456fea5828fb281ab7dbc70bc3cc2e91f2a6597811636d1c421e
+EBUILD libatomic_ops-1.2-r1.ebuild 912 RMD160 b541542aa9f7a73c1d0bbfc545e4353b3491337c SHA1 51cd9900eac440b4216ad95b3a0c61da04ffafa9 SHA256 d0610f5ac56ff6aaea7da8243866185164ffdbb0c0f946cdbb2c50e20b109890
 EBUILD libatomic_ops-1.2.ebuild 779 RMD160 ace6b11c94d75ef6ce3ba1b3bec89389cce8bceb SHA1 59616687d2624f1c5354b3a289767084d345c679 SHA256 750a492175e5325b1c37d83c5398d99ffb7fd2bdd4077ff2b8dc95338bb56407
-MISC ChangeLog 2597 RMD160 d93e41b8a5751770b6552336ef8c1e40089668e8 SHA1 b851bb3c678d81e19a48159caa4c7c3eec2a343e SHA256 16962789b4747a964e391c8a844f4bab0042ede7f80f9f688bcb00aa87b2455d
+MISC ChangeLog 2748 RMD160 b7cbab4f07d8637adc78705e1a89893d2b3264dd SHA1 18e46455279c8f9830a83b76a04abaefee832111 SHA256 0414e26f50ccf432d40f4f0dd56919870f7df08808d5c072c8329016b6c4a745
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch
new file mode 100644
index 000000000000..4e8dd66a3554
--- /dev/null
+++ b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch
@@ -0,0 +1,59 @@
+--- libatomic_ops/src/atomic_ops.h
++++ libatomic_ops/src/atomic_ops.h
+@@ -228,6 +228,10 @@
+ # if defined(__cris__) || defined(CRIS)
+ #   include "atomic_ops/sysdeps/gcc/cris.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)
+only in patch2:
+unchanged:
+--- libatomic_ops/src/atomic_ops/sysdeps/Makefile.am
++++ libatomic_ops/src/atomic_ops/sysdeps/Makefile.am
+@@ -29,6 +29,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/sh.h \
+ 	\
+ 	  icc/ia64.h \
+ 	\
+--- libatomic_ops/src/atomic_ops/sysdeps/gcc/sh.h
++++ libatomic_ops/src/atomic_ops/sysdeps/gcc/sh.h
+@@ -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/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
index f85b1b2f8d7b..f3aa47bcd8b5 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild,v 1.11 2010/01/26 18:27:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild,v 1.12 2010/04/05 16:32:02 armin76 Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ src_unpack(){
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-ppc64-load_acquire.patch
 	epatch "${FILESDIR}"/${P}-ppc-asm.patch
+	epatch "${FILESDIR}"/${P}-sh4.patch
 }
 
 src_install() {