From nobody Tue May 7 23:16:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1543399190956517.6097817738644; Wed, 28 Nov 2018 01:59:50 -0800 (PST) Received: from localhost ([::1]:46875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRwdJ-0002kJ-Bb for importer@patchew.org; Wed, 28 Nov 2018 04:59:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRwbz-00023n-UT for qemu-devel@nongnu.org; Wed, 28 Nov 2018 04:58:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gRwbz-0006Vw-2z for qemu-devel@nongnu.org; Wed, 28 Nov 2018 04:58:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51598) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gRwbs-0006SI-Lq; Wed, 28 Nov 2018 04:58:20 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D407930044DF; Wed, 28 Nov 2018 09:58:19 +0000 (UTC) Received: from thuth.com (ovpn-116-167.ams2.redhat.com [10.36.116.167]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4725970123; Wed, 28 Nov 2018 09:58:18 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Wed, 28 Nov 2018 10:58:14 +0100 Message-Id: <1543399094-2260-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 28 Nov 2018 09:58:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-3.1?] target/arm/sve_helper: Fix compilation with clang 3.4 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Clang 3.4 does not know the "flatten" attribute yet. We've already introduced the QEMU_FLATTEN macro for this in commit 97ff87c0ed020c2, so use this macro now here, too, to fix this issue. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/sve_helper.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index 8cbc651..bc84725 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -4382,20 +4382,20 @@ static void sve_ld4_r(CPUARMState *env, void *vg, t= arget_ulong addr, } =20 #define DO_LDN_1(N) \ -void __attribute__((flatten)) HELPER(sve_ld##N##bb_r) \ +void QEMU_FLATTEN HELPER(sve_ld##N##bb_r) \ (CPUARMState *env, void *vg, target_ulong addr, uint32_t desc) \ { \ sve_ld##N##_r(env, vg, addr, desc, 1, GETPC(), sve_ld1bb_tlb); \ } =20 #define DO_LDN_2(N, SUFF, SIZE) \ -void __attribute__((flatten)) HELPER(sve_ld##N##SUFF##_le_r) \ +void QEMU_FLATTEN HELPER(sve_ld##N##SUFF##_le_r) \ (CPUARMState *env, void *vg, target_ulong addr, uint32_t desc) \ { \ sve_ld##N##_r(env, vg, addr, desc, SIZE, GETPC(), \ sve_ld1##SUFF##_le_tlb); \ } \ -void __attribute__((flatten)) HELPER(sve_ld##N##SUFF##_be_r) \ +void QEMU_FLATTEN HELPER(sve_ld##N##SUFF##_be_r) \ (CPUARMState *env, void *vg, target_ulong addr, uint32_t desc) \ { \ sve_ld##N##_r(env, vg, addr, desc, SIZE, GETPC(), \ @@ -4832,7 +4832,7 @@ static void sve_st4_r(CPUARMState *env, void *vg, tar= get_ulong addr, } =20 #define DO_STN_1(N, NAME, ESIZE) \ -void __attribute__((flatten)) HELPER(sve_st##N##NAME##_r) \ +void QEMU_FLATTEN HELPER(sve_st##N##NAME##_r) \ (CPUARMState *env, void *vg, target_ulong addr, uint32_t desc) \ { \ sve_st##N##_r(env, vg, addr, desc, GETPC(), ESIZE, 1, \ @@ -4840,13 +4840,13 @@ void __attribute__((flatten)) HELPER(sve_st##N##NAM= E##_r) \ } =20 #define DO_STN_2(N, NAME, ESIZE, MSIZE) \ -void __attribute__((flatten)) HELPER(sve_st##N##NAME##_le_r) \ +void QEMU_FLATTEN HELPER(sve_st##N##NAME##_le_r) \ (CPUARMState *env, void *vg, target_ulong addr, uint32_t desc) \ { \ sve_st##N##_r(env, vg, addr, desc, GETPC(), ESIZE, MSIZE, \ sve_st1##NAME##_le_tlb); \ } \ -void __attribute__((flatten)) HELPER(sve_st##N##NAME##_be_r) \ +void QEMU_FLATTEN HELPER(sve_st##N##NAME##_be_r) \ (CPUARMState *env, void *vg, target_ulong addr, uint32_t desc) \ { \ sve_st##N##_r(env, vg, addr, desc, GETPC(), ESIZE, MSIZE, \ @@ -4966,7 +4966,7 @@ static void sve_ld1_zd(CPUARMState *env, void *vd, vo= id *vg, void *vm, } =20 #define DO_LD1_ZPZ_S(MEM, OFS) \ -void __attribute__((flatten)) HELPER(sve_ld##MEM##_##OFS) \ +void QEMU_FLATTEN HELPER(sve_ld##MEM##_##OFS) \ (CPUARMState *env, void *vd, void *vg, void *vm, \ target_ulong base, uint32_t desc) \ { \ @@ -4975,7 +4975,7 @@ void __attribute__((flatten)) HELPER(sve_ld##MEM##_##= OFS) \ } =20 #define DO_LD1_ZPZ_D(MEM, OFS) \ -void __attribute__((flatten)) HELPER(sve_ld##MEM##_##OFS) \ +void QEMU_FLATTEN HELPER(sve_ld##MEM##_##OFS) \ (CPUARMState *env, void *vd, void *vg, void *vm, \ target_ulong base, uint32_t desc) \ { \ @@ -5326,7 +5326,7 @@ static void sve_st1_zd(CPUARMState *env, void *vd, vo= id *vg, void *vm, } =20 #define DO_ST1_ZPZ_S(MEM, OFS) \ -void __attribute__((flatten)) HELPER(sve_st##MEM##_##OFS) \ +void QEMU_FLATTEN HELPER(sve_st##MEM##_##OFS) \ (CPUARMState *env, void *vd, void *vg, void *vm, \ target_ulong base, uint32_t desc) \ { \ @@ -5335,7 +5335,7 @@ void __attribute__((flatten)) HELPER(sve_st##MEM##_##= OFS) \ } =20 #define DO_ST1_ZPZ_D(MEM, OFS) \ -void __attribute__((flatten)) HELPER(sve_st##MEM##_##OFS) \ +void QEMU_FLATTEN HELPER(sve_st##MEM##_##OFS) \ (CPUARMState *env, void *vd, void *vg, void *vm, \ target_ulong base, uint32_t desc) \ { \ --=20 1.8.3.1