[binutils-gdb] MIPS/BFD: Fold the handling of input MIPS ABI flags together

[Maciej W.Rozycki <macro at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=28d45e28be904a53fef4310b3d41e41b045885b0

commit 28d45e28be904a53fef4310b3d41e41b045885b0
Author: Maciej W. Rozycki <macro@imgtec.com>
Date:   Mon Jan 4 23:13:10 2016 +0000

    MIPS/BFD: Fold the handling of input MIPS ABI flags together
    
    Fold the handling of input MIPS ABI flags in private BFD data merging
    together, moving the attribute check afterwards, and consequently making
    input vs output compatibility checks only start once all input ABI flag
    data has been gathered, checked for inconsistencies and put in order.
    
    Consequently also address the issue of input ABI flag inconsistencies
    being masked by a failing attribute check, which currently makes
    `_bfd_mips_elf_merge_private_bfd_data' exit prematurely and therefore
    prevent input ABI flag inconsistencies from being reported.  Such
    inconsistencies need to be reported as they may be the very cause of an
    attribute check failure.
    
    	bfd/
    	* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Fold the
    	handling of input MIPS ABI flags together.

Diff:
---
 bfd/ChangeLog    |  5 +++++
 bfd/elfxx-mips.c | 30 ++++++++++++++----------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 06dc3b3..cd9e1b1 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
 2016-01-04  Maciej W. Rozycki  <macro@imgtec.com>
 
+	* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Fold the
+	handling of input MIPS ABI flags together.
+
+2016-01-04  Maciej W. Rozycki  <macro@imgtec.com>
+
 	* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Suppress
 	attribute checks for null input.
 
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index e502f73..89d4409 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -15080,28 +15080,18 @@ _bfd_mips_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
   if (null_input_bfd)
     return TRUE;
 
-  /* Set up the FP ABI attribute from the abiflags if it is not already
-     set.  */
+  /* Populate abiflags using existing information.  */
   if (in_tdata->abiflags_valid)
     {
       obj_attribute *in_attr = elf_known_obj_attributes (ibfd)[OBJ_ATTR_GNU];
+      Elf_Internal_ABIFlags_v0 in_abiflags;
+      Elf_Internal_ABIFlags_v0 abiflags;
+
+      /* Set up the FP ABI attribute from the abiflags if it is not already
+         set.  */
       if (in_attr[Tag_GNU_MIPS_ABI_FP].i == Val_GNU_MIPS_ABI_FP_ANY)
         in_attr[Tag_GNU_MIPS_ABI_FP].i = in_tdata->abiflags.fp_abi;
-    }
 
-  if (!mips_elf_merge_obj_attributes (ibfd, obfd))
-    return FALSE;
-
-  /* Populate abiflags using existing information.  */
-  if (!in_tdata->abiflags_valid)
-    {
-      infer_mips_abiflags (ibfd, &in_tdata->abiflags);
-      in_tdata->abiflags_valid = TRUE;
-    }
-  else
-    {
-      Elf_Internal_ABIFlags_v0 abiflags;
-      Elf_Internal_ABIFlags_v0 in_abiflags;
       infer_mips_abiflags (ibfd, &abiflags);
       in_abiflags = in_tdata->abiflags;
 
@@ -15137,6 +15127,14 @@ _bfd_mips_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
 	     ".MIPS.abiflags (0x%lx)"), ibfd,
 	   (unsigned long) in_abiflags.flags2);
     }
+  else
+    {
+      infer_mips_abiflags (ibfd, &in_tdata->abiflags);
+      in_tdata->abiflags_valid = TRUE;
+    }
+
+  if (!mips_elf_merge_obj_attributes (ibfd, obfd))
+    return FALSE;
 
   if (!out_tdata->abiflags_valid)
     {