[ld/testsuite/ChangeLog]

[deliverable/binutils-gdb.git] / bfd / elfxx-mips.c

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 470bed9e37ab2f23915b193c21dd28f0529f13b8..f674e1374f4692c547107c569a8c107bc6dc01ff 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -11325,11 +11325,11 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
        out_attr[Tag_GNU_MIPS_ABI_FP].i = in_attr[Tag_GNU_MIPS_ABI_FP].i;
       else if (in_attr[Tag_GNU_MIPS_ABI_FP].i == 0)
        ;
-      else if (in_attr[Tag_GNU_MIPS_ABI_FP].i > 3)
+      else if (in_attr[Tag_GNU_MIPS_ABI_FP].i > 4)
        _bfd_error_handler
          (_("Warning: %B uses unknown floating point ABI %d"), ibfd,
           in_attr[Tag_GNU_MIPS_ABI_FP].i);
-      else if (out_attr[Tag_GNU_MIPS_ABI_FP].i > 3)
+      else if (out_attr[Tag_GNU_MIPS_ABI_FP].i > 4)
        _bfd_error_handler
          (_("Warning: %B uses unknown floating point ABI %d"), obfd,
           out_attr[Tag_GNU_MIPS_ABI_FP].i);
@@ -11351,6 +11351,12 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
                   obfd, ibfd);
                break;
 
+             case 4:
+               _bfd_error_handler
+                 (_("Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"),
+                  obfd, ibfd);
+               break;
+
              default:
                abort ();
              }
@@ -11371,6 +11377,12 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
                   obfd, ibfd);
                break;
 
+             case 4:
+               _bfd_error_handler
+                 (_("Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"),
+                  obfd, ibfd);
+               break;
+
              default:
                abort ();
              }
@@ -11381,6 +11393,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
              {
              case 1:
              case 2:
+             case 4:
                _bfd_error_handler
                  (_("Warning: %B uses hard float, %B uses soft float"),
                   ibfd, obfd);
@@ -11391,6 +11404,32 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd)
              }
            break;
 
+         case 4:
+           switch (in_attr[Tag_GNU_MIPS_ABI_FP].i)
+             {
+             case 1:
+               _bfd_error_handler
+                 (_("Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"),
+                  ibfd, obfd);
+               break;
+
+             case 2:
+               _bfd_error_handler
+                 (_("Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"),
+                  ibfd, obfd);
+               break;
+
+             case 3:
+               _bfd_error_handler
+                 (_("Warning: %B uses hard float, %B uses soft float"),
+                  obfd, ibfd);
+               break;
+
+             default:
+               abort ();
+             }
+           break;
+
          default:
            abort ();
          }