From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcgVE-0006rQ-0M for qemu-devel@nongnu.org; Wed, 24 Aug 2016 18:18:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcgUy-0004Js-U4 for qemu-devel@nongnu.org; Wed, 24 Aug 2016 18:18:31 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:53995) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcgUw-0004FE-5K for qemu-devel@nongnu.org; Wed, 24 Aug 2016 18:18:16 -0400 From: "Emilio G. Cota" Date: Wed, 24 Aug 2016 18:17:59 -0400 Message-Id: <1472077083-15022-4-git-send-email-cota@braap.org> In-Reply-To: <1472077083-15022-1-git-send-email-cota@braap.org> References: <20160824211240.GA26546@flamenco> <1472077083-15022-1-git-send-email-cota@braap.org> Subject: [Qemu-devel] [PATCH 4/8] target-arm: helper fixup for paired atomics List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson Cc: alex.bennee@linaro.org, mttcg@greensocs.com, qemu-devel@nongnu.org, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, bobby.prani@gmail.com, nikunj@linux.vnet.ibm.com, mark.burton@greensocs.com, pbonzini@redhat.com, jan.kiszka@siemens.com, serge.fdrv@gmail.com, peter.maydell@linaro.org, claudio.fontana@huawei.com, dgilbert@redhat.com, crosthwaite.peter@gmail.com Signed-off-by: Emilio G. Cota --- target-arm/helper-a64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index 8ce518b..6f3fd17 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -453,7 +453,7 @@ uint64_t HELPER(crc32c_64)(uint64_t acc, uint64_t val, uint32_t bytes) uint64_t HELPER(paired_cmpxchg64_le)(CPUARMState *env, uint64_t addr, uint64_t new_lo, uint64_t new_hi) { -#ifndef CONFIG_USER_ONLY +#if !defined(CONFIG_USER_ONLY) || !defined(CONFIG_ATOMIC128) uintptr_t ra = GETPC(); #endif Int128 oldv, cmpv, newv; @@ -518,7 +518,7 @@ uint64_t HELPER(paired_cmpxchg64_le)(CPUARMState *env, uint64_t addr, uint64_t HELPER(paired_cmpxchg64_be)(CPUARMState *env, uint64_t addr, uint64_t new_lo, uint64_t new_hi) { -#ifndef CONFIG_USER_ONLY +#if !defined(CONFIG_USER_ONLY) || !defined(CONFIG_ATOMIC128) uintptr_t ra = GETPC(); #endif Int128 oldv, cmpv, newv; -- 2.5.0