From d13d89fafafda1464982126425040e68730f152f Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Wed, 17 Mar 2004 12:27:05 +0000 Subject: [PATCH] * elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Correct logic for null_input_bfd detection. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-mips.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cf6fe15..fdf1eed 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2004-03-17 Nathan Sidwell + + * elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Correct + logic for null_input_bfd detection. + 2004-03-17 Ralf Corsepius * config.bfd: Switch sh-*-rtems* to ELF. Add sh-*-rtemscoff*. diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 17d5b02..ff943d6 100644 --- 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; -- 2.7.4