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 2cfcc670fab8872dcc180e9627cfbfecded2f4d0..487c672ac8c1d2e2c8e4dea717719502afe07eae 100644 (file)
--- 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 14b46e85c8cd7ee60848a5b8a8dc642a1e224718..e1792e70a490a97c61e68ea0f54eb54da2acf195 100644 (file)
--- 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;
 }