--- src/allocation-tracker.cc.orig	2014-06-03 10:52:11.000000000 +0200

+++ src/allocation-tracker.cc	2015-08-20 23:11:25.591304000 +0200

@@ -152,8 +152,8 @@ void AddressToTraceMap::Clear() {

 void AddressToTraceMap::Print() {

   PrintF("[AddressToTraceMap (%" V8PRIuPTR "): \n", ranges_.size());

   for (RangeMap::iterator it = ranges_.begin(); it != ranges_.end(); ++it) {

-    PrintF("[%p - %p] => %u\n", it->second.start, it->first,

-        it->second.trace_node_id);

+    PrintF("[%p - %p] => %u\n", reinterpret_cast<void*>(it->second.start),

+        reinterpret_cast<void*>(it->first), it->second.trace_node_id);

   }

   PrintF("]\n");

 }

--- src/deoptimizer.cc.orig	2014-06-03 10:52:11.000000000 +0200

+++ src/deoptimizer.cc	2015-08-20 23:13:27.601778000 +0200

@@ -1920,7 +1920,7 @@ void Deoptimizer::MaterializeHeapObjects

              "Materialized a new heap number %p [%e] in slot %p\n",

              reinterpret_cast<void*>(*num),

              d.value(),

-             d.destination());

+             reinterpret_cast<void*>(d.destination()));

     }

     Memory::Object_at(d.destination()) = *num;

   }

@@ -2017,7 +2017,7 @@ void Deoptimizer::MaterializeHeapNumbers

                "for parameter slot #%d\n",

                reinterpret_cast<void*>(*num),

                d.value(),

-               d.destination(),

+               reinterpret_cast<void*>(d.destination()),

                index);

       }

@@ -2034,7 +2034,7 @@ void Deoptimizer::MaterializeHeapNumbers

                "for expression slot #%d\n",

                reinterpret_cast<void*>(*num),

                d.value(),

-               d.destination(),

+               reinterpret_cast<void*>(d.destination()),

                index);

       }

--- src/heap-snapshot-generator.cc.orig	2014-06-03 10:52:11.000000000 +0200

+++ src/heap-snapshot-generator.cc	2015-08-20 23:15:47.676226000 +0200

@@ -410,8 +410,8 @@ bool HeapObjectsMap::MoveObject(Address 

     // object is migrated.

     if (FLAG_heap_profiler_trace_objects) {

       PrintF("Move object from %p to %p old size %6d new size %6d\n",

-             from,

-             to,

+             reinterpret_cast<void*>(from),

+             reinterpret_cast<void*>(to),

              entries_.at(from_entry_info_index).size,

              object_size);

     }

@@ -451,7 +451,7 @@ SnapshotObjectId HeapObjectsMap::FindOrA

     entry_info.accessed = accessed;

     if (FLAG_heap_profiler_trace_objects) {

       PrintF("Update object size : %p with old size %d and new size %d\n",

-             addr,

+             reinterpret_cast<void*>(addr),

              entry_info.size,

              size);

     }

@@ -486,9 +486,9 @@ void HeapObjectsMap::UpdateHeapObjectsMa

     FindOrAddEntry(obj->address(), obj->Size());

     if (FLAG_heap_profiler_trace_objects) {

       PrintF("Update object      : %p %6d. Next address is %p\n",

-             obj->address(),

+             reinterpret_cast<void*>(obj->address()),

              obj->Size(),

-             obj->address() + obj->Size());

+             reinterpret_cast<void*>(obj->address() + obj->Size()));

     }

   }

   RemoveDeadEntries();

@@ -516,20 +516,20 @@ struct HeapObjectInfo {

   void Print() const {

     if (expected_size == 0) {

       PrintF("Untracked object   : %p %6d. Next address is %p\n",

-             obj->address(),

+             reinterpret_cast<void*>(obj->address()),

              obj->Size(),

-             obj->address() + obj->Size());

+             reinterpret_cast<void*>(obj->address() + obj->Size()));

     } else if (obj->Size() != expected_size) {

       PrintF("Wrong size %6d: %p %6d. Next address is %p\n",

              expected_size,

-             obj->address(),

+             reinterpret_cast<void*>(obj->address()),

              obj->Size(),

-             obj->address() + obj->Size());

+             reinterpret_cast<void*>(obj->address() + obj->Size()));

     } else {

       PrintF("Good object      : %p %6d. Next address is %p\n",

-             obj->address(),

+             reinterpret_cast<void*>(obj->address()),

              expected_size,

-             obj->address() + obj->Size());

+             reinterpret_cast<void*>(obj->address() + obj->Size()));

     }

   }

 };

--- src/ia32/code-stubs-ia32.cc.orig	2014-06-03 10:52:11.000000000 +0200

+++ src/ia32/code-stubs-ia32.cc	2015-08-20 23:19:17.568999000 +0200

@@ -3143,7 +3143,7 @@ void StringCharFromCodeGenerator::Genera

   ASSERT(IsPowerOf2(String::kMaxOneByteCharCode + 1));

   __ test(code_,

           Immediate(kSmiTagMask |

-                    ((~String::kMaxOneByteCharCode) << kSmiTagSize)));

+                    ((~String::kMaxOneByteCharCodeU) << kSmiTagSize)));

   __ j(not_zero, &slow_case_);

   Factory* factory = masm->isolate()->factory();

--- src/ia32/disasm-ia32.cc.orig	2014-06-03 10:52:11.000000000 +0200

+++ src/ia32/disasm-ia32.cc	2015-08-20 23:19:34.908416000 +0200

@@ -1743,7 +1743,7 @@ int Disassembler::ConstantPoolSizeAt(byt

     buffer[0] = '\0';

     byte* prev_pc = pc;

     pc += d.InstructionDecode(buffer, pc);

-    fprintf(f, "%p", prev_pc);

+    fprintf(f, "%p", reinterpret_cast<void*>(prev_pc));

     fprintf(f, "    ");

     for (byte* bp = prev_pc; bp < pc; bp++) {

--- src/ia32/ic-ia32.cc.orig	2014-06-03 10:52:11.000000000 +0200

+++ src/ia32/ic-ia32.cc	2015-08-20 23:20:22.370410000 +0200

@@ -1262,7 +1262,8 @@ void PatchInlinedSmiCode(Address address

   uint8_t delta = *reinterpret_cast<uint8_t*>(delta_address);

   if (FLAG_trace_ic) {

     PrintF("[  patching ic at %p, test=%p, delta=%d\n",

-           address, test_instruction_address, delta);

+           reinterpret_cast<void*>(address),

+           reinterpret_cast<void*>(test_instruction_address), delta);

   }

   // Patch with a short conditional jump. Enabling means switching from a short

--- src/liveedit.cc.orig	2014-06-03 10:52:11.000000000 +0200

+++ src/liveedit.cc	2015-08-20 23:16:49.084087000 +0200

@@ -174,7 +174,7 @@ class Differencer {

   static const int kDirectionSizeBits = 2;

   static const int kDirectionMask = (1 << kDirectionSizeBits) - 1;

-  static const int kEmptyCellValue = -1 << kDirectionSizeBits;

+  static const int kEmptyCellValue = -(1 << kDirectionSizeBits);

   // This method only holds static assert statement (unfortunately you cannot

   // place one in class scope).

--- src/objects.h.orig	2014-06-03 10:52:11.000000000 +0200

+++ src/objects.h	2015-08-20 23:09:45.566923000 +0200

@@ -8824,8 +8824,8 @@ class Name: public HeapObject {

   STATIC_ASSERT(IS_POWER_OF_TWO(kMaxCachedArrayIndexLength + 1));

   static const unsigned int kContainsCachedArrayIndexMask =

-      (~kMaxCachedArrayIndexLength << ArrayIndexLengthBits::kShift) |

-      kIsNotArrayIndexMask;

+      (~static_cast<unsigned>(kMaxCachedArrayIndexLength)

+      << ArrayIndexLengthBits::kShift) | kIsNotArrayIndexMask;

   // Value of empty hash field indicating that the hash is not computed.

   static const int kEmptyHashField =