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 82d1dbf264d4830544b96462754732a8c23d9fa5..7b510f15310da31f334133e6718a4f9b7920d5ad 100644 (file)
--- 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 1eb72697a28fdfc5eaac556324b305a61cee2d63..4f44fee175aa117fab27efc2d70745aca9d544ad 100644 (file)
--- 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);
   }