* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Correct

	logic for null_input_bfd detection.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cf6fe1504f154eed774115967722151ee0c0ca99..fdf1eed210d8e01309e4af32d9f2a3bde6e45b32 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-17  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Correct
+       logic for null_input_bfd detection.
+
 2004-03-17  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
        * config.bfd: Switch sh-*-rtems* to ELF.  Add sh-*-rtemscoff*.

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 17d5b02bc2696fc6aebfcfb6c9bac29b12d7e511..ff943d694e8e1d595b461d673a04bf5fdc612c05 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -9028,10 +9028,10 @@ _bfd_mips_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
          which are automatically generated by gas.  */
       if (strcmp (sec->name, ".reginfo")
          && strcmp (sec->name, ".mdebug")
-         && ((!strcmp (sec->name, ".text")
-              || !strcmp (sec->name, ".data")
-              || !strcmp (sec->name, ".bss"))
-             && sec->_raw_size != 0))
+         && (sec->_raw_size != 0
+             || (strcmp (sec->name, ".text")
+                 && strcmp (sec->name, ".data")
+                 && strcmp (sec->name, ".bss"))))
        {
          null_input_bfd = FALSE;
          break;