[PATCH] LoongArch: Set e_flags to 0x40 of ELF while using new relocations.

[PATCH] LoongArch: Set e_flags to 0x40 of ELF while using new relocations.

[liuzhensong]

---
 bfd/elfnn-loongarch.c     | 10 ++++++++++
 binutils/readelf.c        | 11 ++++++++---
 gas/config/tc-loongarch.c |  1 +
 include/elf/loongarch.h   |  7 +++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c
index 8d0f66ea7c1..ff1b25dde34 100644
--- a/bfd/elfnn-loongarch.c
+++ b/bfd/elfnn-loongarch.c
@@ -416,6 +416,16 @@ elfNN_loongarch_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
       elf_elfheader (obfd)->e_flags = in_flags;
       return true;
     }
+  else if (out_flags != in_flags)
+    {
+      /* Only check relocation version.
+	 The obj_v0 is compatible with obj_v1 in this "release cycle".  */
+      if ((EF_LOONGARCH_IS_OBJ_V0 (out_flags)
+	   && EF_LOONGARCH_IS_OBJ_V1 (in_flags))
+	  || (EF_LOONGARCH_IS_OBJ_V0 (in_flags)
+	      && EF_LOONGARCH_IS_OBJ_V1 (out_flags)))
+	elf_elfheader (obfd)->e_flags |= EF_LOONGARCH_ABI_OBJ_V1;
+    }
 
   /* Disallow linking different ABIs.  */
   if (EF_LOONGARCH_ABI(out_flags ^ in_flags) & EF_LOONGARCH_ABI_MASK)
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 1ec25239938..4aa164bc3d9 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -4346,11 +4346,16 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine)
 	    strcat (buf, ", ILP32");
 
 	  if (EF_LOONGARCH_IS_SOFT_FLOAT (e_flags))
-	    strcat (buf, ", SOFT-FLOAT");
+	    strcat (buf, "S");
 	  else if (EF_LOONGARCH_IS_SINGLE_FLOAT (e_flags))
-	    strcat (buf, ", SINGLE-FLOAT");
+	    strcat (buf, "F");
 	  else if (EF_LOONGARCH_IS_DOUBLE_FLOAT (e_flags))
-	    strcat (buf, ", DOUBLE-FLOAT");
+	    strcat (buf, "D");
+
+	  if (EF_LOONGARCH_IS_OBJ_V0 (e_flags))
+	    strcat (buf, ", ABI-v0");
+	  else if (EF_LOONGARCH_IS_OBJ_V1 (e_flags))
+	    strcat (buf, ", ABI-v1");
 
 	  break;
 	}
diff --git a/gas/config/tc-loongarch.c b/gas/config/tc-loongarch.c
index fbbaca55085..6a4d7e00ab5 100644
--- a/gas/config/tc-loongarch.c
+++ b/gas/config/tc-loongarch.c
@@ -234,6 +234,7 @@ loongarch_after_parse_args ()
 	as_bad ("unknown default architecture `%s'", default_arch);
     }
 
+  LARCH_opts.ase_abi |= EF_LOONGARCH_ABI_OBJ_V1;
   /* Set default ISA double-float.  */
   if (!LARCH_opts.ase_nf
       && !LARCH_opts.ase_sf
diff --git a/include/elf/loongarch.h b/include/elf/loongarch.h
index 74757b82ca8..f8f7adb1655 100644
--- a/include/elf/loongarch.h
+++ b/include/elf/loongarch.h
@@ -248,6 +248,9 @@ END_RELOC_NUMBERS (R_LARCH_count)
 #define EF_LOONGARCH_ABI_SINGLE_FLOAT_MASK	0x2
 #define EF_LOONGARCH_ABI_DOUBLE_FLOAT_MASK	0x3
 
+#define EF_LOONGARCH_ABI_OBJ_V1  		0x40
+#define EF_LOONGARCH_ABI_OBJ_MASK		0xC0
+
 #define EF_LOONGARCH_ABI(abi)	(EF_LOONGARCH_ABI_MASK & (abi))
 
 #define EF_LOONGARCH_IS_LP64(abi) \
@@ -264,4 +267,8 @@ END_RELOC_NUMBERS (R_LARCH_count)
 #define EF_LOONGARCH_IS_DOUBLE_FLOAT(abi) \
   (!((EF_LOONGARCH_ABI(abi) & EF_LOONGARCH_ABI_FLOAT_MASK) ^ EF_LOONGARCH_ABI_DOUBLE_FLOAT_MASK))
 
+#define EF_LOONGARCH_IS_OBJ_V0(abi) (!((abi) & EF_LOONGARCH_ABI_OBJ_MASK))
+#define EF_LOONGARCH_IS_OBJ_V1(abi) \
+      (((abi) & EF_LOONGARCH_ABI_OBJ_MASK) == EF_LOONGARCH_ABI_OBJ_V1)
+
 #endif /* _ELF_LOONGARCH_H */
-- 
2.31.1