From db38d44e5e6a7c22ffe59759d33c97b807c93324 Mon Sep 17 00:00:00 2001
From: Jinyang He <hejinyang@loongson.cn>
Date: Wed, 19 Jul 2023 14:49:37 +0800
Subject: [PATCH 2/2] Some testsuite fix

Change-Id: I3cf75379f4035541f40b8d0b5f722085530c9353
---
 bfd/elfxx-loongarch.c     |  4 ++--
 gas/config/tc-loongarch.c | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bfd/elfxx-loongarch.c b/bfd/elfxx-loongarch.c
index 3f8534bf..dc7a62b4 100644
--- a/bfd/elfxx-loongarch.c
+++ b/bfd/elfxx-loongarch.c
@@ -14,8 +14,8 @@ static reloc_howto_type howto_table[] =
 {
 #define LOONGARCH_HOWTO(r_name) HOWTO (R_LARCH_##r_name,0,3,32,FALSE,0,complain_overflow_signed,bfd_elf_generic_reloc,"R_LARCH_"#r_name,FALSE,0,0,FALSE)
 LOONGARCH_HOWTO (NONE),
-LOONGARCH_HOWTO (32),
-LOONGARCH_HOWTO (64),
+HOWTO (R_LARCH_32,0,2,32,FALSE,0,complain_overflow_signed,bfd_elf_generic_reloc,"R_LARCH_32",FALSE,0,0xffffffff,FALSE),
+HOWTO (R_LARCH_64,0,4,64,FALSE,0,complain_overflow_signed,bfd_elf_generic_reloc,"R_LARCH_64",FALSE,0,0xffffffffffffffff,FALSE),
 LOONGARCH_HOWTO (RELATIVE),
 LOONGARCH_HOWTO (COPY),
 LOONGARCH_HOWTO (JUMP_SLOT),
diff --git a/gas/config/tc-loongarch.c b/gas/config/tc-loongarch.c
index b8bf3510..9b9cb827 100644
--- a/gas/config/tc-loongarch.c
+++ b/gas/config/tc-loongarch.c
@@ -137,6 +137,9 @@ md_parse_option (int c, const char *arg)
       break;
     case OPTION_IGNORE:
       break;
+    default:
+      ret = 0;
+      break;
     }
   return ret;
 }
@@ -936,8 +939,12 @@ loongarch_assemble_INSNs (char *str)
       get_loongarch_opcode (&the_one);
 
       if (!the_one.all_match)
-	as_fatal (_("no match insn: %s\t%s"),
-	  the_one.name, loongarch_cat_splited_strs (the_one.arg_strs));
+	{
+	  char *ss = loongarch_cat_splited_strs (the_one.arg_strs);
+	  as_bad (_("no match insn: %s\t%s"), the_one.name, ss ? ss : "");
+	  free(ss);
+	  return;
+	}
 
       if (check_this_insn_before_appending (&the_one) != 0)
 	break;
-- 
2.39.3