gdb/testsuite: Add compiler options parameter to function_range helper

[deliverable/binutils-gdb.git] / gdb / target-descriptions.c

diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 06f42a1b95d05df1380af082fd2ccc7407cd60c9..4194819d9aba4e53d7044b76c14a6bb10af1ece2 100644 (file)
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -977,16 +977,13 @@ tdesc_register_in_reggroup_p (struct gdbarch *gdbarch, int regno,
 {
   struct tdesc_reg *reg = tdesc_find_register (gdbarch, regno);
 
-  if (reg != NULL)
-    {
-      if (reggroup == all_reggroup)
+  if (reg != NULL && !reg->group.empty ()
+      && (reg->group == reggroup_name (reggroup)))
        return 1;
 
-      else if (reggroup == save_reggroup || reggroup == restore_reggroup)
-       return reg->save_restore;
-      else
-       return (int) (reg->group == reggroup_name (reggroup));
-    }
+  if (reg != NULL
+      && (reggroup == save_reggroup || reggroup == restore_reggroup))
+    return reg->save_restore;
 
   return -1;
 }
@@ -1718,7 +1715,8 @@ maint_print_c_tdesc_cmd (const char *args, int from_tty)
       || startswith (filename_after_features.c_str (), "riscv/")
       || startswith (filename_after_features.c_str (), "tic6x-")
       || startswith (filename_after_features.c_str (), "aarch64")
-      || startswith (filename_after_features.c_str (), "arm/"))
+      || startswith (filename_after_features.c_str (), "arm/")
+      || startswith (filename_after_features.c_str (), "arc/"))
     {
       print_c_feature v (filename_after_features);