From patchwork Tue Jun 5 22:05:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Durigan Junior X-Patchwork-Id: 27652 Received: (qmail 45163 invoked by alias); 5 Jun 2018 22:06:21 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 45149 invoked by uid 89); 5 Jun 2018 22:06:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=consolidate, unbreak X-HELO: mx1.redhat.com Received: from mx3-rdu2.redhat.com (HELO mx1.redhat.com) (66.187.233.73) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 05 Jun 2018 22:06:19 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8B6B640200A0; Tue, 5 Jun 2018 22:06:17 +0000 (UTC) Received: from psique.yyz.redhat.com (unused-10-15-17-196.yyz.redhat.com [10.15.17.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27BE12166BB2; Tue, 5 Jun 2018 22:06:17 +0000 (UTC) From: Sergio Durigan Junior To: GDB Patches Cc: Alan Hayward , nd@arm.com, Sergio Durigan Junior Subject: [PATCH] Guard declarations of 'sve_*_from_*' macros on Aarch64 (and unbreak build) Date: Tue, 5 Jun 2018 18:05:56 -0400 Message-Id: <20180605220556.7418-1-sergiodj@redhat.com> In-Reply-To: <87zi09vw7m.fsf@redhat.com> References: <87zi09vw7m.fsf@redhat.com> X-IsSubscribed: yes Commit 122394f1476b1c925a281b15399119500c8231c1 ("Function for reading the Aarch64 SVE vector length") has added macros to manipulate SVE vector sizes based on Linux kernel sources, but did not guard them with #ifndef's, which breaks the build when the system headers already have these macros: CXX aarch64-linux-nat.o In file included from ../../gdb/aarch64-tdep.h:25, from ../../gdb/aarch64-linux-nat.c:30: ../../gdb/arch/aarch64.h:79: error: "sve_vq_from_vl" redefined [-Werror] #define sve_vq_from_vl(vl) ((vl) / 0x10) In file included from /usr/include/bits/sigcontext.h:30, from /usr/include/signal.h:291, from build-gnulib/import/signal.h:52, from ../../gdb/linux-nat.h:23, from ../../gdb/aarch64-linux-nat.c:26: /usr/include/asm/sigcontext.h:154: note: this is the location of the previous definition #define sve_vq_from_vl(vl) ((vl) / SVE_VQ_BYTES) In file included from ../../gdb/aarch64-tdep.h:25, from ../../gdb/aarch64-linux-nat.c:30: ../../gdb/arch/aarch64.h:80: error: "sve_vl_from_vq" redefined [-Werror] #define sve_vl_from_vq(vq) ((vq) * 0x10) In file included from /usr/include/bits/sigcontext.h:30, from /usr/include/signal.h:291, from build-gnulib/import/signal.h:52, from ../../gdb/linux-nat.h:23, from ../../gdb/aarch64-linux-nat.c:26: /usr/include/asm/sigcontext.h:155: note: this is the location of the previous definition #define sve_vl_from_vq(vq) ((vq) * SVE_VQ_BYTES) In order to fix this breakage, this commit guards the declaration of the macros using #ifndef's. It is important to mention that the system headers use a value to multiply/divide the vector length (SVE_VQ_BYTES, defined as 16 on the system I'm using) which is different than the values being used by the macros defined in GDB. I wasn't sure how to consolidate that, so I chose to ignore this discrepancy. Tested by making sure GDB compiles fine again. Since the system I'm using doesn't have support for SVE, there's no way I can really test these changes. gdb/ChangeLog: 2018-06-05 Sergio Durigan Junior * arch/aarch64.h (sve_vg_from_vl): Guard with #ifndef. (sve_vl_from_vg): Likewise. (sve_vq_from_vl): Likewise. (sve_vl_from_vq): Likewise. (sve_vq_from_vg): Likewise. (sve_vg_from_vq): Likewise. --- gdb/arch/aarch64.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h index 9040d8d4c8..c378a4b239 100644 --- a/gdb/arch/aarch64.h +++ b/gdb/arch/aarch64.h @@ -74,12 +74,24 @@ enum aarch64_regnum VG : Vector Gradient. The number of 64bit chunks in an SVE Z register. */ +#ifndef sve_vg_from_vl #define sve_vg_from_vl(vl) ((vl) / 8) +#endif +#ifndef sve_vl_from_vg #define sve_vl_from_vg(vg) ((vg) * 8) +#endif +#ifndef sve_vq_from_vl #define sve_vq_from_vl(vl) ((vl) / 0x10) +#endif +#ifndef sve_vl_from_vq #define sve_vl_from_vq(vq) ((vq) * 0x10) +#endif +#ifndef sve_vq_from_vg #define sve_vq_from_vg(vg) (sve_vq_from_vl (sve_vl_from_vg (vg))) +#endif +#ifndef sve_vg_from_vq #define sve_vg_from_vq(vq) (sve_vg_from_vl (sve_vl_from_vq (vq))) +#endif /* Maximum supported VQ value. Increase if required. */