From 56f75c03fc85f2ce65c85793eba9a7cef1666f3c Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Thu, 19 Aug 2010 00:02:18 +0000
Subject: [PATCH] 	* incremental.cc 
 (Output_section_incremental_inputs::write_input_files): Add cast 	to
 avoid signed/unsigned comparison warning. 
 (Output_section_incremental_inputs::write_info_blocks): Likewise.

---
 gold/ChangeLog      |  7 +++++++
 gold/incremental.cc | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 6e04f6e1a7..8b600b2a2d 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-18  Ian Lance Taylor  <iant@google.com>
+
+	* incremental.cc
+	(Output_section_incremental_inputs::write_input_files): Add cast
+	to avoid signed/unsigned comparison warning.
+	(Output_section_incremental_inputs::write_info_blocks): Likewise.
+
 2010-08-12  Cary Coutant  <ccoutant@google.com>
 
 	* common.cc (Sort_commons::operator()): Remove unnecessary code.
diff --git a/gold/incremental.cc b/gold/incremental.cc
index b2ec781d89..5a1d3d9006 100644
--- a/gold/incremental.cc
+++ b/gold/incremental.cc
@@ -784,7 +784,7 @@ Output_section_incremental_inputs<size, big_endian>::write_input_files(
        p != inputs->input_files().end();
        ++p)
     {
-      gold_assert(pov - oview == (*p)->get_offset());
+      gold_assert(static_cast<unsigned int>(pov - oview) == (*p)->get_offset());
       section_offset_type filename_offset =
           strtab->get_offset_from_key((*p)->get_filename_key());
       const Timespec& mtime = (*p)->get_mtime();
@@ -827,7 +827,8 @@ Output_section_incremental_inputs<size, big_endian>::write_info_blocks(
 	case INCREMENTAL_INPUT_OBJECT:
 	case INCREMENTAL_INPUT_ARCHIVE_MEMBER:
 	  {
-	    gold_assert(pov - oview == (*p)->get_info_offset());
+	    gold_assert(static_cast<unsigned int>(pov - oview)
+			== (*p)->get_info_offset());
 	    Incremental_object_entry* entry = (*p)->object_entry();
 	    gold_assert(entry != NULL);
 	    const Object* obj = entry->object();
@@ -897,7 +898,8 @@ Output_section_incremental_inputs<size, big_endian>::write_info_blocks(
 
 	case INCREMENTAL_INPUT_SHARED_LIBRARY:
 	  {
-	    gold_assert(pov - oview == (*p)->get_info_offset());
+	    gold_assert(static_cast<unsigned int>(pov - oview)
+			== (*p)->get_info_offset());
 	    Incremental_object_entry* entry = (*p)->object_entry();
 	    gold_assert(entry != NULL);
 	    const Object* obj = entry->object();
@@ -920,7 +922,8 @@ Output_section_incremental_inputs<size, big_endian>::write_info_blocks(
 
 	case INCREMENTAL_INPUT_ARCHIVE:
 	  {
-	    gold_assert(pov - oview == (*p)->get_info_offset());
+	    gold_assert(static_cast<unsigned int>(pov - oview)
+			== (*p)->get_info_offset());
 	    Incremental_archive_entry* entry = (*p)->archive_entry();
 	    gold_assert(entry != NULL);