From cad056969f9b926b065c014d496ec57cb6810534 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 9 Feb 2012 17:41:33 -0500 Subject: Remove dev-libs/libatomic_ops mips support is available in version 7.2_alpha4 which is available in portage. Signed-off-by: Matt Turner --- dev-libs/libatomic_ops/ChangeLog | 39 ------- dev-libs/libatomic_ops/Manifest | 8 -- .../files/libatomic_ops-1.2-mips.patch | 121 --------------------- .../files/libatomic_ops-1.2-ppc-asm.patch | 11 -- .../libatomic_ops-1.2-ppc64-load_acquire.patch | 46 -------- dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild | 29 ----- dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild | 29 ----- dev-libs/libatomic_ops/metadata.xml | 5 - 8 files changed, 288 deletions(-) delete mode 100644 dev-libs/libatomic_ops/ChangeLog delete mode 100644 dev-libs/libatomic_ops/Manifest delete mode 100644 dev-libs/libatomic_ops/files/libatomic_ops-1.2-mips.patch delete mode 100644 dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch delete mode 100644 dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch delete mode 100644 dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild delete mode 100644 dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild delete mode 100644 dev-libs/libatomic_ops/metadata.xml diff --git a/dev-libs/libatomic_ops/ChangeLog b/dev-libs/libatomic_ops/ChangeLog deleted file mode 100644 index 48c2649..0000000 --- a/dev-libs/libatomic_ops/ChangeLog +++ /dev/null @@ -1,39 +0,0 @@ -# ChangeLog for dev-libs/libatomic_ops -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/ChangeLog,v 1.8 2007/06/08 23:23:07 lu_zero Exp $ - - 08 Jun 2007; Luca Barbato - files/libatomic_ops-1.2-ppc64-load_acquire.patch: - Minor fix - - 08 Jun 2007; Luca Barbato - +files/libatomic_ops-1.2-ppc64-load_acquire.patch, - libatomic_ops-1.2.ebuild: - Marked ~ppc ~ppc64 - - 02 Jun 2007; Raúl Porcel libatomic_ops-1.2.ebuild: - Add ~alpha/~ia64 wrt #180117 - - 31 May 2007; Jeroen Roovers libatomic_ops-1.2.ebuild: - Marked ~hppa (bug #180117). - - 29 May 2007; Andrej Kacian libatomic_ops-1.2.ebuild: - Added ~x86, bug #180117. - - 29 May 2007; Gustavo Zacarias - libatomic_ops-1.2.ebuild: - Keyworded ~sparc wrt #180117 - -*libatomic_ops-1.2 (28 May 2007) - - 28 May 2007; Diego Pettenò - libatomic_ops-1.1.ebuild, +libatomic_ops-1.2.ebuild: - Bump libatomic_ops to version 1.2, and mark -x86 -x86-fbsd the 1.1 version - that *will* miscompile on x86-based systems. - -*libatomic_ops-1.1 (02 Sep 2006) - - 02 Sep 2006; Diego Pettenò +metadata.xml, - +libatomic_ops-1.1.ebuild: - Initial import, dependency of the current SVN PulseAudio. - diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest deleted file mode 100644 index cdbe576..0000000 --- a/dev-libs/libatomic_ops/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX libatomic_ops-1.2-mips.patch 3740 RMD160 271557840fc29d04292d2dc0326f8da948c7fcb4 SHA1 3b8a2ae72e37c67fec7df0dca1db921af5f28ecd SHA256 d4cf43ec9af1b48fb48d68dc5fab5f70a041d89bea45e4105e9c7becfd487760 -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 -DIST libatomic_ops-1.2.tar.gz 183780 RMD160 8c548b32033c954a61e740f9a0e76ca8f005c4f6 SHA1 8bf4134d614acb1a6234b3102e67a847ae9369b0 SHA256 a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781 -EBUILD libatomic_ops-1.2-r1.ebuild 892 RMD160 8404bc84b5a33c655462a1902a17ac340ce12055 SHA1 65c3870d5440c194e85c8a5016ef32d360115fc5 SHA256 e1988634db70792d89accef6d38a33e1499c8d961fdc8982f0edcb1052b88fd1 -EBUILD libatomic_ops-1.2.ebuild 846 RMD160 2f89179dd0d459068bf4048d52a02695fd470c4a SHA1 327fac6bc81234e3fa7666b0579cc44625653ffb SHA256 33980dcab992d0c1b6d452103461b643038f6b514f424c04daa849b3c5344e56 -MISC ChangeLog 1370 RMD160 e3eea2515bc19d11561fb204251963e2d69fb86f SHA1 45234a2d813e2c5a62cc89ec652e92dcca652ede SHA256 de51c4491fdb01ec01b85136380dd2156ccaa28579bf1b81869a50186662659f -MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-mips.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-mips.patch deleted file mode 100644 index 79188ce..0000000 --- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-mips.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff --git a/src/atomic_ops.h b/src/atomic_ops.h -index c23f30b..791b360 100755 ---- a/src/atomic_ops.h -+++ b/src/atomic_ops.h -@@ -220,6 +220,9 @@ - # if defined(__cris__) || defined(CRIS) - # include "atomic_ops/sysdeps/gcc/cris.h" - # endif -+# if defined(__mips__) -+# include "atomic_ops/sysdeps/gcc/mips.h" -+# endif - #endif /* __GNUC__ && !AO_USE_PTHREAD_DEFS */ - - #if defined(__INTEL_COMPILER) && !defined(AO_USE_PTHREAD_DEFS) -diff --git a/src/atomic_ops/sysdeps/Makefile.am b/src/atomic_ops/sysdeps/Makefile.am -index 74122b4..d6737c0 100644 ---- a/src/atomic_ops/sysdeps/Makefile.am -+++ b/src/atomic_ops/sysdeps/Makefile.am -@@ -29,6 +29,7 @@ nobase_sysdep_HEADERS= generic_pthread.h \ - 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 \ - \ - icc/ia64.h \ - \ -diff --git a/src/atomic_ops/sysdeps/gcc/mips.h b/src/atomic_ops/sysdeps/gcc/mips.h -new file mode 100644 -index 0000000..e7f3a5d ---- /dev/null -+++ b/src/atomic_ops/sysdeps/gcc/mips.h -@@ -0,0 +1,89 @@ -+/* -+ * Copyright (c) 2005 Thiemo Seufer -+ * Copyright (c) 2007 Zhang Le -+ * -+ * 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_aligned_atomic_load_store.h" -+#include "../test_and_set_t_is_ao_t.h" -+ -+/* Data dependence does not imply read ordering. */ -+#define AO_NO_DD_ORDERING -+ -+AO_INLINE void -+AO_nop_full() -+{ -+ __asm__ __volatile__( -+ " .set push \n" -+ " .set mips3 \n" -+ " .set noreorder \n" -+ " .set nomacro \n" -+ " sync \n" -+ " .set pop " -+ : : : "memory"); -+} -+ -+#define AO_HAVE_nop_full -+ -+AO_INLINE int -+AO_compare_and_swap(volatile AO_t *addr, AO_t old, AO_t new_val) -+{ -+ register int was_equal = 0; -+ register int temp; -+ -+ __asm__ __volatile__( -+ " .set push \n" -+ " .set mips3 \n" -+ " .set noreorder \n" -+ " .set nomacro \n" -+ "1: ll %0, %1 \n" -+ " bne %0, %4, 2f \n" -+ " move %0, %3 \n" -+ " sc %0, %1 \n" -+ " .set pop \n" -+ " beqz %0, 1b \n" -+ " li %2, 1 \n" -+ "2: " -+ : "=&r" (temp), "+R" (*addr), "+r" (was_equal) -+ : "r" (new_val), "r" (old) -+ : "memory"); -+ return was_equal; -+} -+ -+#define AO_HAVE_compare_and_swap -+ -+AO_INLINE AO_t -+AO_fetch_and_add_full (volatile AO_t *p, AO_t incr) -+{ -+ AO_t result, temp; -+ __asm__ __volatile__( -+ " .set push \n" -+ " .set mips3 \n" -+ " .set noreorder \n" -+ " .set nomacro \n" -+ "1: ll %1, %2 \n" -+ " addu %0, %1, %3 \n" -+ " sc %0, %2 \n" -+ " beqz %0, 1b \n" -+ " addu %0, %1, %3 \n" -+ " sync \n" -+ " .set pop \n" -+ : "=&r" (result), "=&r" (temp), "=m" (*p) -+ : "r" (incr), "m" (*p) -+ : "memory"); -+ return result; -+} -+ -+#define AO_HAVE_fetch_and_add_full -+ -+/* -+ * FIXME: fetch_and_add_full implemented, any others? -+ */ diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch deleted file mode 100644 index f98f83f..0000000 --- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc-asm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../libatomic-ops-1.2/src/atomic_ops/sysdeps/gcc/powerpc.h 2006-03-29 09:49:14.000000000 +1100 -+++ src/atomic_ops/sysdeps/gcc/powerpc.h 2007-08-27 10:51:00.000000000 +1000 -@@ -72,7 +72,7 @@ - /* registers. I always got "impossible constraint" when I */ - /* tried the "y" constraint. */ - __asm__ __volatile__ ( -- "lwz %0,%1\n" -+ "lwz%X1 %0,%1\n" - "cmpw cr7,%0,%0\n" - "bne- cr7,1f\n" - "1: isync\n" diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch deleted file mode 100644 index 9b6baa1..0000000 --- a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-ppc64-load_acquire.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- src/atomic_ops/sysdeps/gcc/powerpc.h.orig 2006-03-28 22:49:14.000000000 +0000 -+++ src/atomic_ops/sysdeps/gcc/powerpc.h 2007-06-08 23:10:07.000000000 +0000 -@@ -63,6 +63,8 @@ - /* seems to be that a data dependent branch followed by an isync is */ - /* cheaper. And the documentation is fairly explicit that this also */ - /* has acquire semantics. */ -+/* ppc64 uses ld not lwz */ -+#if defined(__powerpc64__) || defined(__ppc64__) || defined(__64BIT__) - AO_INLINE AO_t - AO_load_acquire(volatile AO_t *addr) - { -@@ -72,7 +74,7 @@ - /* registers. I always got "impossible constraint" when I */ - /* tried the "y" constraint. */ - __asm__ __volatile__ ( -- "lwz %0,%1\n" -+ "ld %0,%1\n" - "cmpw cr7,%0,%0\n" - "bne- cr7,1f\n" - "1: isync\n" -@@ -80,7 +82,25 @@ - : "m"(*addr) : "memory", "cc"); - return result; - } -+#else -+AO_INLINE AO_t -+AO_load_acquire(volatile AO_t *addr) -+{ -+ AO_t result; - -+ /* FIXME: We should get gcc to allocate one of the condition */ -+ /* registers. I always got "impossible constraint" when I */ -+ /* tried the "y" constraint. */ -+ __asm__ __volatile__ ( -+ "lwz %0,%1\n" -+ "cmpw cr7,%0,%0\n" -+ "bne- cr7,1f\n" -+ "1: isync\n" -+ : "=r" (result) -+ : "m"(*addr) : "memory", "cc"); -+ return result; -+} -+#endif - #define AO_HAVE_load_acquire - - /* We explicitly specify store_release, since it relies */ diff --git a/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild deleted file mode 100644 index 1b432b3..0000000 --- a/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2007 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.8 2007/12/31 16:19:37 ranger Exp $ - -inherit eutils - -DESCRIPTION="Implementation for atomic memory update operations" -HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/" -SRC_URI="http://www.hpl.hp.com/research/linux/atomic_ops/download/${P}.tar.gz" - -LICENSE="GPL-2 MIT as-is" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -RDEPEND="" - -src_unpack(){ - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-ppc64-load_acquire.patch - epatch "${FILESDIR}"/${P}-ppc-asm.patch - epatch "${FILESDIR}"/${P}-mips.patch -} - -src_install() { - emake pkgdatadir="/usr/share/doc/${PF}" DESTDIR="${D}" install || die -} diff --git a/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild deleted file mode 100644 index e6f6e83..0000000 --- a/dev-libs/libatomic_ops/libatomic_ops-1.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2007 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.ebuild,v 1.7 2007/06/24 23:39:57 vapier Exp $ - -inherit eutils autotools - -DESCRIPTION="Implementation for atomic memory update operations" -HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/" -SRC_URI="http://www.hpl.hp.com/research/linux/atomic_ops/download/${P}.tar.gz" - -LICENSE="GPL-2 MIT as-is" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -RDEPEND="" - -src_unpack(){ - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-ppc64-load_acquire.patch - epatch "${FILESDIR}"/${P}-mips.patch - eautoreconf -} - -src_install() { - emake pkgdatadir="/usr/share/doc/${PF}" DESTDIR="${D}" install || die -} diff --git a/dev-libs/libatomic_ops/metadata.xml b/dev-libs/libatomic_ops/metadata.xml deleted file mode 100644 index e1774e3..0000000 --- a/dev-libs/libatomic_ops/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -sound - -- cgit v1.2.3-65-gdbad