diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray.hpp openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray.hpp

--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray.hpp

+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray.hpp

@@ -78,7 +78,8 @@

     size_t num_target_elems = pointer_delta(end, bottom, mapping_granularity_in_bytes);

     idx_t bias = (uintptr_t)bottom / mapping_granularity_in_bytes;

     address base = create_new_base_array(num_target_elems, target_elem_size_in_bytes);

-    initialize_base(base, num_target_elems, bias, target_elem_size_in_bytes, log2_intptr(mapping_granularity_in_bytes));

+    initialize_base(base, num_target_elems, bias, target_elem_size_in_bytes,

+                    log2_long(mapping_granularity_in_bytes));

   }

   size_t bias() const { return _bias; }

diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp

--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp

+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp

@@ -135,7 +135,7 @@

 void BinaryMagnitudeSeq::add(size_t val) {

   Atomic::add(val, &_sum);

-  int mag = log2_intptr(val) + 1;

+  int mag = log2_long(val) + 1;

   // Defensively saturate for product bits:

   if (mag < 0) {

diff --git openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp

--- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp

+++ openjdk/hotspot/src/share/vm/runtime/os.cpp

@@ -1284,7 +1284,7 @@

 }

 void os::set_memory_serialize_page(address page) {

-  int count = log2_intptr(sizeof(class JavaThread)) - log2_int(64);

+  int count = log2_long(sizeof(class JavaThread)) - log2_int(64);

   _mem_serialize_page = (volatile int32_t *)page;

   // We initialize the serialization page shift count here

   // We assume a cache line size of 64 bytes