Sun Studio x86 implementation isn't quite good enough yet for e.g.

pulseaudio, so instead use the generic pthread implementation for now.

4 files changed, 7 insertions, 10 deletions

diff --git a/devel/libatomic_ops/Makefile b/devel/libatomic_ops/Makefile
index d0ae3b26482..1090679b641 100644
--- a/devel/libatomic_ops/Makefile
+++ b/devel/libatomic_ops/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/01/27 20:26:01 sketch Exp $
+# $NetBSD: Makefile,v 1.4 2009/01/31 20:05:57 sketch Exp $
 #
 .include "Makefile.version"
 
 DISTNAME=	libatomic_ops-${LIBATOMIC_OPS_SNAPDATE}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
diff --git a/devel/libatomic_ops/PLIST b/devel/libatomic_ops/PLIST
index aa66569a10e..cf3046a3b27 100644
--- a/devel/libatomic_ops/PLIST
+++ b/devel/libatomic_ops/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/01/27 20:26:01 sketch Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/01/31 20:05:57 sketch Exp $
 include/atomic_ops.h
 include/atomic_ops/generalize-small.h
 include/atomic_ops/generalize.h
@@ -43,7 +43,6 @@ include/atomic_ops/sysdeps/short_aligned_atomic_load_store.h
 include/atomic_ops/sysdeps/short_atomic_load_store.h
 include/atomic_ops/sysdeps/standard_ao_double_t.h
 include/atomic_ops/sysdeps/sunc/sparc.h
-include/atomic_ops/sysdeps/sunc/x86.h
 include/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h
 include/atomic_ops/sysdeps/test_and_set_t_is_char.h
 include/atomic_ops_malloc.h
diff --git a/devel/libatomic_ops/distinfo b/devel/libatomic_ops/distinfo
index e8ee8f0a5a5..843dbd3330b 100644
--- a/devel/libatomic_ops/distinfo
+++ b/devel/libatomic_ops/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2009/01/27 20:26:01 sketch Exp $
+$NetBSD: distinfo,v 1.6 2009/01/31 20:05:57 sketch Exp $
 
 SHA1 (libatomic_ops-20081024.tar.gz) = 70dcc68c89ea8ce8b8e6c936ea337eca31f13662
 RMD160 (libatomic_ops-20081024.tar.gz) = a9194631fafc2d4ce68cea93dbc212d7212cab13
@@ -6,6 +6,4 @@ Size (libatomic_ops-20081024.tar.gz) = 193399 bytes
 SHA1 (patch-aa) = bf53ad892ba270b1d7a9bd1fa14012ca83ab5323
 SHA1 (patch-ab) = 74674124fff34faf2aae0d694566c66ffaf9df25
 SHA1 (patch-ac) = 40eeac276e322ea6f28743c183c11e92b1ab8de5
-SHA1 (patch-ad) = 5952b7a292a381b00b8e101bdf48452555a5a660
-SHA1 (patch-ae) = 5fe403a33d8b49e0ac3f21aaa65ea42d5e656251
-SHA1 (patch-af) = ffd2b0ea6f0b36efaa8872d08e3d004eb8b944aa
+SHA1 (patch-ad) = 1499b105450beba70efdd3cc6bf8dd0270734c22
diff --git a/devel/libatomic_ops/patches/patch-ad b/devel/libatomic_ops/patches/patch-ad
index 8696544a2aa..d3144e5b6ec 100644
--- a/devel/libatomic_ops/patches/patch-ad
+++ b/devel/libatomic_ops/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2009/01/26 15:01:56 sketch Exp $
+$NetBSD: patch-ad,v 1.2 2009/01/31 20:05:57 sketch Exp $
 
 --- src/atomic_ops.h.orig	Wed Oct 22 02:12:17 2008
 +++ src/atomic_ops.h	Mon Jan 26 14:48:46 2009
@@ -8,7 +8,7 @@ $NetBSD: patch-ad,v 1.1 2009/01/26 15:01:56 sketch Exp $
  
 -#if !defined(__GNUC__) && (defined(sparc) || defined(__sparc)) \
 +#if defined(__SUNPRO_C) && defined(__i386)
-+#   include "atomic_ops/sysdeps/sunc/x86.h"
++#   include "atomic_ops/sysdeps/generic_pthread.h"
 +#   define AO_CAN_EMUL_CAS
 +#elif !defined(__GNUC__) && (defined(sparc) || defined(__sparc)) \
      && !defined(AO_USE_PTHREAD_DEFS)