From f2cd37dcacd46d8d51dbab4048d7c556486cccb0 Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 2 Aug 2012 12:52:33 +0000 Subject: Use __asm__ and __volatile__. Fixes build on at least Solaris. --- audio/alsa-lib/distinfo | 3 ++- audio/alsa-lib/patches/patch-include_iatomic.h | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 audio/alsa-lib/patches/patch-include_iatomic.h (limited to 'audio/alsa-lib') diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo index a8b98984834..4c003c1fe5b 100644 --- a/audio/alsa-lib/distinfo +++ b/audio/alsa-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2012/03/08 04:04:19 sbd Exp $ +$NetBSD: distinfo,v 1.12 2012/08/02 12:52:33 jperkin Exp $ SHA1 (alsa-lib-1.0.22.tar.bz2) = d3b6c740c23b8d113a8d02da2a9fd61f5d1a8a44 RMD160 (alsa-lib-1.0.22.tar.bz2) = 4dbc3f9550f8ba01535ad3cfd8f0a8140f897e81 @@ -40,5 +40,6 @@ SHA1 (patch-bh) = f207843f4ce2b20b7e680d4b6e9aebb28c55323e SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7 SHA1 (patch-bk) = 7740eea6a0d4a8ce3db3b93b2af5faacdb9424b1 +SHA1 (patch-include_iatomic.h) = 30099667b490c0e960a7e8883da52c39f4396b9d SHA1 (patch-include_pcm.h) = 1c458cd7d078356f4a970b0b3592aad139ac0918 SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865 diff --git a/audio/alsa-lib/patches/patch-include_iatomic.h b/audio/alsa-lib/patches/patch-include_iatomic.h new file mode 100644 index 00000000000..85bebf055f7 --- /dev/null +++ b/audio/alsa-lib/patches/patch-include_iatomic.h @@ -0,0 +1,19 @@ +$NetBSD: patch-include_iatomic.h,v 1.1 2012/08/02 12:52:33 jperkin Exp $ + +Use __asm__ and __volatile__ + +--- include/iatomic.h.orig Thu Aug 2 12:47:59 2012 ++++ include/iatomic.h Thu Aug 2 12:49:53 2012 +@@ -211,9 +211,9 @@ + #define rmb() mb() + #define wmb() __asm__ __volatile__ ("": : :"memory") + #else +-#define mb() asm volatile("mfence":::"memory") +-#define rmb() asm volatile("lfence":::"memory") +-#define wmb() asm volatile("sfence":::"memory") ++#define mb() __asm__ __volatile__ ("mfence":::"memory") ++#define rmb() __asm__ __volatile__ ("lfence":::"memory") ++#define wmb() __asm__ __volatile__ ("sfence":::"memory") + #endif + + #undef ATOMIC_SMP_LOCK -- cgit v1.2.3