From 8d32f93595f28c70f21566384ca1dc8a441297b9 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@google.com>
Date: Fri, 21 Dec 2007 23:08:25 +0000
Subject: Correct handling of non-section symbol in merged section.  Avoid some
 64-bit signed/unsigned warnings.

---
 gold/reloc.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gold/reloc.cc')

diff --git a/gold/reloc.cc b/gold/reloc.cc
index e9c1326..f88151f 100644
--- a/gold/reloc.cc
+++ b/gold/reloc.cc
@@ -459,7 +459,8 @@ Sized_relobj<size, big_endian>::write_sections(const unsigned char* pshdrs,
 
       gold_assert(output_offset == -1
 		  || (output_offset >= 0
-		      && output_offset + view_size <= output_section_size));
+		      && (output_offset + static_cast<off_t>(view_size)
+                          <= output_section_size)));
 
       unsigned char* view;
       if (os->requires_postprocessing())
-- 
cgit v1.1