From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36320)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1VfQHM-00051q-Ck
	for qemu-devel@nongnu.org; Sun, 10 Nov 2013 03:22:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1VfQHD-0001We-Vv
	for qemu-devel@nongnu.org; Sun, 10 Nov 2013 03:21:56 -0500
Received: from mail-ee0-x22e.google.com ([2a00:1450:4013:c00::22e]:49661)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1VfQHD-0001WW-N4
	for qemu-devel@nongnu.org; Sun, 10 Nov 2013 03:21:47 -0500
Received: by mail-ee0-f46.google.com with SMTP id b57so1820264eek.33
	for <qemu-devel@nongnu.org>; Sun, 10 Nov 2013 00:21:46 -0800 (PST)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <527F4215.8030607@redhat.com>
Date: Sun, 10 Nov 2013 09:21:41 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1382435921-18438-1-git-send-email-peter.maydell@linaro.org>
	<CAFEAcA8PVPxP0gncrCWHtsryeQhOnL5BVqBFE_waG507=yRbGA@mail.gmail.com>
In-Reply-To: <CAFEAcA8PVPxP0gncrCWHtsryeQhOnL5BVqBFE_waG507=yRbGA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH for-1.7] atomic.h: Fix build with clang
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>, Anthony Liguori <aliguori@amazon.com>, Patch Tracking <patches@linaro.org>

Il 09/11/2013 19:09, Peter Maydell ha scritto:
> Ping! This is needed as a build-fix for MacOSX and didn't
> make it into 1.7-rc0. Paolo, can I get you to review this?

I thought I already had done that, anyway:

>> diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h
>> index 0aa8913..492bce1 100644
>> --- a/include/qemu/atomic.h
>> +++ b/include/qemu/atomic.h
>> @@ -168,14 +168,14 @@
>>  #endif
>>
>>  #ifndef atomic_xchg
>> -#ifdef __ATOMIC_SEQ_CST
>> +#if defined(__clang__)
>> +#define atomic_xchg(ptr, i)    __sync_swap(ptr, i)
>> +#elif defined(__ATOMIC_SEQ_CST)
>>  #define atomic_xchg(ptr, i)    ({                           \
>>      typeof(*ptr) _new = (i), _old;                          \
>>      __atomic_exchange(ptr, &_new, &_old, __ATOMIC_SEQ_CST); \
>>      _old;                                                   \
>>  })
>> -#elif defined __clang__
>> -#define atomic_xchg(ptr, i)    __sync_exchange(ptr, i)
>>  #else
>>  /* __sync_lock_test_and_set() is documented to be an acquire barrier only.  */
>>  #define atomic_xchg(ptr, i)    (smp_mb(), __sync_lock_test_and_set(ptr, i))

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>