From c11b00c04ea9f31c7ead8e9f9c11ac1acc8a22be Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@google.com>
Date: Sat, 20 Oct 2007 04:35:43 +0000
Subject: [PATCH] From Craig Silverstein: add cast to avoid warning.

---
 gold/merge.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gold/merge.cc b/gold/merge.cc
index 80d2d1ae1a..13bfc17784 100644
--- a/gold/merge.cc
+++ b/gold/merge.cc
@@ -269,7 +269,7 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
 	{
           // The length PLEN is in characters, not bytes.
 	  ++plen;
-	  if (i + plen * sizeof(Char_type) >= len)
+	  if (i + plen * static_cast<off_t>(sizeof(Char_type)) >= len)
 	    {
 	      object->error(_("entry in mergeable string section "
 			      "not null terminated"));
-- 
2.11.0