Index: runtime/BitmapPoolAllocator/PoolAllocatorBitMask.cpp
===================================================================
--- runtime/BitmapPoolAllocator/PoolAllocatorBitMask.cpp	(revision 88965)
+++ runtime/BitmapPoolAllocator/PoolAllocatorBitMask.cpp	(working copy)
@@ -182,8 +182,8 @@
       // completely filled up.  If so, move it to the Ptr2 list.
       if (__builtin_expect(PS->isFull(), false)) {
         PS->unlinkFromList();
-	      PS->addToList((PoolSlab**)&Pool->Ptr2);
-      }     
+	PS->addToList((PoolSlab**)(void*)&Pool->Ptr2);
+      }
       return PS->getElementAddress(Element, NodeSize);
     }
 
@@ -195,7 +195,7 @@
         // completely filled up.  If so, move it to the Ptr2 list.
         if (PS->isFull()) {
           PS->unlinkFromList();
-	        PS->addToList((PoolSlab**)&Pool->Ptr2);
+	  PS->addToList((PoolSlab**)(void*)&Pool->Ptr2);
         }
         return PS->getElementAddress(Element, NodeSize);
       }
@@ -305,13 +305,13 @@
       //
       if (PS->isFull()) {
         PS->unlinkFromList();
-	      PS->addToList((PoolSlab**)&Pool->Ptr2);
+	PS->addToList((PoolSlab**)(void*)&Pool->Ptr2);
       }
-      
+
       return PS->getElementAddress(Element, Pool->NodeSize);
     }
   }
-  
+
   PoolSlab *New = PoolSlab::create(Pool);
   //  printf("new slab created %x \n", New);
   if (Pool->NumSlabs > BitmapPoolTy::AddrArrSize)
@@ -397,7 +397,7 @@
     //
 
     if (!(PS->isSingleArray)) {
-      PoolSlab **InsertPosPtr = (PoolSlab**)&Pool->Ptr1;
+      PoolSlab **InsertPosPtr = (PoolSlab**)(void*)&Pool->Ptr1;
 
       // If the partially full list has an empty node sitting at the front of
       // the list, insert right after it.
@@ -426,13 +426,13 @@
     FirstSlab->destroy();
     //  Pool->Slabs.erase((void *)FirstSlab);
     }
- 
+
     // Link our slab onto the head of the list so that allocations will find it
     // efficiently.    
-    PS->addToList((PoolSlab**)&Pool->Ptr1);
+    PS->addToList((PoolSlab**)(void*)&Pool->Ptr1);
   }
 
-  return; 
+  return;
 }
 
 
Index: runtime/BitmapPoolAllocator/PoolSlab.cpp
===================================================================
--- runtime/BitmapPoolAllocator/PoolSlab.cpp	(revision 88965)
+++ runtime/BitmapPoolAllocator/PoolSlab.cpp	(working copy)
@@ -39,7 +39,7 @@
     }
 
   // Add the slab to the list...
-	PS->addToList((PoolSlab**)&Pool->Ptr1);
+  PS->addToList((PoolSlab**)(void*)&Pool->Ptr1);
   //  printf(" creating a slab %x\n", PS);
   return PS;
 }
@@ -69,7 +69,7 @@
   }
   Pool->NumSlabs++;
 
-	PS->addToList((PoolSlab**)&Pool->LargeArrays);
+  PS->addToList((PoolSlab**)(void*)&Pool->LargeArrays);
 
   PS->allocated   = 0xffffffff;    // No bytes allocated.
   PS->isSingleArray = 1;
Index: runtime/SVA/PoolCheck.c
===================================================================
--- runtime/SVA/PoolCheck.c	(revision 88965)
+++ runtime/SVA/PoolCheck.c	(working copy)
@@ -783,7 +783,7 @@
   S = addr;
   len = 0;
   tag = 0;
-  t = adl_splay_retrieve(&MP->Objs, (void**)&S, &len, &tag);
+  t = adl_splay_retrieve(&MP->Objs, (void**)(void*)&S, &len, &tag);
   __sva_rt_unlock(&lock);
   if (t) {
     if (((addr - S) % size) == offset) {
@@ -798,7 +798,7 @@
    * Search through the set of function pointers.
    */
   __sva_rt_lock(&lock);
-  t = adl_splay_retrieve(&MP->Functions, (void**)&S, &len, &tag);
+  t = adl_splay_retrieve(&MP->Functions, (void**)(void*)&S, &len, &tag);
   __sva_rt_unlock(&lock);
 
   if (t) {
@@ -852,7 +852,7 @@
   S = addr;
   len = 0;
   tag = 0;
-  t = adl_splay_retrieve(&MP->Objs, (void**)&S, &len, &tag);
+  t = adl_splay_retrieve(&MP->Objs, (void**)(void*)&S, &len, &tag);
   __sva_rt_unlock(&lock);
 
   if (t) {
@@ -867,7 +867,7 @@
    * Search through the set of function pointers.
    */
   __sva_rt_lock(&lock);
-  t = adl_splay_retrieve(&MP->Functions, (void**)&S, &len, &tag);
+  t = adl_splay_retrieve(&MP->Functions, (void**)(void*)&S, &len, &tag);
   __sva_rt_unlock(&lock);
 
   if (t) {
Index: runtime/SVA/adl_splay.c
===================================================================
--- runtime/SVA/adl_splay.c	(revision 88965)
+++ runtime/SVA/adl_splay.c	(working copy)
@@ -277,8 +277,8 @@
   Tree* T = *(Tree**)tree;
   if (T) {
     f(T->key, (T->end - T->key) + 1, T->tag);
-    adl_splay_foreach((void**)(&T->left), f);
-    adl_splay_foreach((void**)(&T->right), f);
+    adl_splay_foreach((void**)(void*)(&T->left), f);
+    adl_splay_foreach((void**)(void*)(&T->right), f);
   }
 }
 
Index: runtime/DebugRuntime/RuntimeChecks.cpp
===================================================================
--- runtime/DebugRuntime/RuntimeChecks.cpp	(revision 88965)
+++ runtime/DebugRuntime/RuntimeChecks.cpp	(working copy)
@@ -93,7 +93,7 @@
 //
 static bool
 isRewritePtr (void * p) {
-  intptr_t ptr = (intptr_t) p;
+  uintptr_t ptr = (uintptr_t) p;
 
   if ((InvalidLower < ptr ) && (ptr < InvalidUpper))
     return true;
