From: Luis Machado <luis.machado@linaro.org>
Date: Wed, 6 Jan 2021 13:16:19 +0000 (-0300)
Subject: Don't show extra __capability modifier
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=feb7ecf31caaa33b190cde008ed67c646f7dae81;p=thirdparty%2Fbinutils-gdb.git

Don't show extra __capability modifier

gdb/ChangeLog:

2021-01-15  Luis Machado  <luis.machado@arm.com>

	* aarch64-tdep.c (aarch64_address_class_type_flags_to_name): Return
	NULL.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2cfcc670fab..487c672ac8c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-15  Luis Machado  <luis.machado@arm.com>
+
+	* aarch64-tdep.c (aarch64_address_class_type_flags_to_name): Return
+	NULL.
+
 2020-12-30  Luis Machado  <luis.machado@arm.com>
 
 	* capability.cc (capability::to_str): Append strings to
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 14b46e85c8c..e1792e70a49 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -3775,9 +3775,8 @@ static const char*
 aarch64_address_class_type_flags_to_name (struct gdbarch *gdbarch,
 					  type_instance_flags type_flags)
 {
-  if (type_flags & TYPE_INSTANCE_FLAG_CAPABILITY)
-    return "__capability";
-  else
+    /* No need to display the extra __capability modifier.  GDB already takes
+       cares of this.  */
     return NULL;
 }