From: Alan Modra <amodra@gmail.com>
Date: Fri, 19 Nov 2004 11:58:02 +0000 (+0000)
Subject: 	* elf32-arm.c (elf32_arm_finish_dynamic_sections): Warning fix.
X-Git-Tag: gdb-pre-i18n-errorwarning-20050211~844
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de52dba4abb83cdac3aae1ecdaa2c5c176b168f6;p=platform%2Fupstream%2Fbinutils.git

	* elf32-arm.c (elf32_arm_finish_dynamic_sections): Warning fix.
	* elf32-iq2000.c (iq2000_reloc_type_lookup): C90 function decl.
	* nlmcode.h (nlm_write_object_contents): Warning fix.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 376926e..a65a887 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf32-arm.c (elf32_arm_finish_dynamic_sections): Warning fix.
+	* elf32-iq2000.c (iq2000_reloc_type_lookup): C90 function decl.
+	* nlmcode.h (nlm_write_object_contents): Warning fix.
+
 2004-11-18  Bob Wilson  <bob.wilson@acm.org>
 
 	* elf32-xtensa.c (ebb_propose_action): Fix argument order.
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 65c0873..b3edf6d 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -5314,8 +5314,8 @@ elf32_arm_finish_dynamic_sections (bfd * output_bfd, struct bfd_link_info * info
 			  if (dyn.d_tag == DT_RELSZ 
 			      || dyn.d_tag == DT_RELASZ)
 			    dyn.d_un.d_val += hdr->sh_size;
-			  else if (dyn.d_un.d_val == 0
-				   || hdr->sh_offset < dyn.d_un.d_val)
+			  else if ((ufile_ptr) hdr->sh_offset
+				   <= dyn.d_un.d_val - 1)
 			    dyn.d_un.d_val = hdr->sh_offset;
 			}
 		    }
diff --git a/bfd/elf32-iq2000.c b/bfd/elf32-iq2000.c
index 5dc781d..5bc51aa 100644
--- a/bfd/elf32-iq2000.c
+++ b/bfd/elf32-iq2000.c
@@ -330,9 +330,8 @@ iq2000_elf_relocate_hi16 (bfd *input_bfd,
 }
 
 static reloc_howto_type *
-iq2000_reloc_type_lookup (abfd, code)
-     bfd * abfd ATTRIBUTE_UNUSED;
-     bfd_reloc_code_real_type code;
+iq2000_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+			  bfd_reloc_code_real_type code)
 {
   /* Note that the iq2000_elf_howto_table is indxed by the R_
      constants.	 Thus, the order that the howto records appear in the
diff --git a/bfd/nlmcode.h b/bfd/nlmcode.h
index bf41f27..c3d6bca 100644
--- a/bfd/nlmcode.h
+++ b/bfd/nlmcode.h
@@ -1692,7 +1692,7 @@ nlm_write_object_contents (abfd)
 
   /* A weak check on whether the section file positions were
      reasonable.  */
-  if (bfd_tell (abfd) > (ufile_ptr) nlm_fixed_header (abfd)->codeImageOffset)
+  if (bfd_tell (abfd) > nlm_fixed_header (abfd)->codeImageOffset)
     {
       bfd_set_error (bfd_error_invalid_operation);
       goto error_return;