From: Craig Silverstein <csilvers@google.com>
Date: Wed, 18 Jun 2008 22:32:37 +0000 (+0000)
Subject: 2008-06-18  Craig Silverstein  <csilvers@google.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5f494ea0d5674ea0b84a3b29d7f367333eebdd4b;p=binutils-gdb.git

2008-06-18  Craig Silverstein  <csilvers@google.com>

	* powerpc.cc (Powerpc_relocate_functions::addr16_ha): cast
	constant 0xFFFF to type Valtype.
	(Powerpc_relocate_functions::rel16_ha): Likewise.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 82d1dbf264d..7b510f15310 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-18  Craig Silverstein  <csilvers@google.com>
+
+	* powerpc.cc (Powerpc_relocate_functions::addr16_ha): cast
+	constant 0xFFFF to type Valtype.
+	(Powerpc_relocate_functions::rel16_ha): Likewise.
+
 2008-06-17  Ian Lance Taylor  <iant@google.com>
 
 	* output.h (Output_section::Input_section): Initialize p2align_ to
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index 1eb72697a28..4f44fee175a 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -605,8 +605,8 @@ public:
       reloc += 0x10000;
     reloc >>= 16;
 
-    val &= ~0xffff;
-    reloc &= 0xffff;
+    val &= ~static_cast<Valtype>(0xffff);
+    reloc &= static_cast<Valtype>(0xffff);
 
     elfcpp::Swap<16, true>::writeval(wv, val | reloc);
   }
@@ -628,8 +628,8 @@ public:
       reloc += 0x10000;
     reloc >>= 16;
 
-    val &= ~0xffff;
-    reloc &= 0xffff;
+    val &= ~static_cast<Valtype>(0xffff);
+    reloc &= static_cast<Valtype>(0xffff);
 
     elfcpp::Swap<16, true>::writeval(wv, val | reloc);
   }
@@ -684,8 +684,8 @@ public:
       reloc += 0x10000;
     reloc >>= 16;
 
-    val &= ~0xffff;
-    reloc &= 0xffff;
+    val &= ~static_cast<Valtype>(0xffff);
+    reloc &= static_cast<Valtype>(0xffff);
 
     elfcpp::Swap<16, true>::writeval(wv, val | reloc);
   }