public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Luis Machado <luisgpm@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] [AArch64] Fix testcase compilation failure
Date: Tue, 19 Jul 2022 13:33:13 +0000 (GMT)	[thread overview]
Message-ID: <20220719133313.9D7AF3858439@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3c539d41b48e5a70cc22b0151ee79b8bd752341d

commit 3c539d41b48e5a70cc22b0151ee79b8bd752341d
Author: Luis Machado <luis.machado@arm.com>
Date:   Tue Jun 28 14:08:46 2022 +0100

    [AArch64] Fix testcase compilation failure
    
    Newer distros carry newer headers that contains MTE definitions.  Account
    for that fact in the MTE testcases (gdb.arch/aarch64-mte.exp) and define
    constants conditionally to prevent compilation failures.

Diff:
---
 gdb/testsuite/gdb.arch/aarch64-mte.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/aarch64-mte.c b/gdb/testsuite/gdb.arch/aarch64-mte.c
index bd7f1a6cf53..fc38d58fe5e 100644
--- a/gdb/testsuite/gdb.arch/aarch64-mte.c
+++ b/gdb/testsuite/gdb.arch/aarch64-mte.c
@@ -30,22 +30,27 @@
 #include <sys/prctl.h>
 
 /* From arch/arm64/include/uapi/asm/hwcap.h */
+#ifndef HWCAP2_MTE
 #define HWCAP2_MTE              (1 << 18)
+#endif
 
 /* From arch/arm64/include/uapi/asm/mman.h */
+#ifndef PROT_MTE
 #define PROT_MTE  0x20
+#endif
 
-/* From include/uapi/linux/prctl.h */
+#ifndef PR_SET_TAGGED_ADDR_CTRL
 #define PR_SET_TAGGED_ADDR_CTRL 55
-#define PR_GET_TAGGED_ADDR_CTRL 56
 #define PR_TAGGED_ADDR_ENABLE	(1UL << 0)
+#endif
+
+/* From include/uapi/linux/prctl.h */
+#ifndef PR_MTE_TCF_SHIFT
 #define PR_MTE_TCF_SHIFT	1
-#define PR_MTE_TCF_NONE		(0UL << PR_MTE_TCF_SHIFT)
 #define PR_MTE_TCF_SYNC		(1UL << PR_MTE_TCF_SHIFT)
 #define PR_MTE_TCF_ASYNC	(2UL << PR_MTE_TCF_SHIFT)
-#define PR_MTE_TCF_MASK		(3UL << PR_MTE_TCF_SHIFT)
 #define PR_MTE_TAG_SHIFT	3
-#define PR_MTE_TAG_MASK		(0xffffUL << PR_MTE_TAG_SHIFT)
+#endif
 
 void
 access_memory (unsigned char *tagged_ptr, unsigned char *untagged_ptr)


                 reply	other threads:[~2022-07-19 13:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220719133313.9D7AF3858439@sourceware.org \
    --to=luisgpm@sourceware.org \
    --cc=gdb-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).