-#define N(BITS_WORD, BITS_ADDR, NUMBER, PRINT, DEFAULT, NEXT) \
+/* Return TRUE if STRING matches the architecture described by INFO. */
+
+static bfd_boolean
+riscv_scan (const struct bfd_arch_info *info, const char *string)
+{
+ if (bfd_default_scan (info, string))
+ return TRUE;
+
+ /* The string might have extra characters for supported subsets. So allow
+ a match that ignores trailing characters in string. */
+ if (strncasecmp (string, info->printable_name,
+ strlen (info->printable_name)) == 0)
+ return TRUE;
+
+ return FALSE;
+}
+
+#define N(BITS, NUMBER, PRINT, DEFAULT, NEXT) \