c7048023e9
Remove patches included upstream
- JDK-8197429/PR3546/RH153662{2,3}
- JDK-8184309/PR3596
- JDK-8210647/RH1632174
- JDK-8029661/PR3642/RH1477159
- JDK-8145096/PR3693
Re-generate patches
- JDK-8203030
Add casts to resolve s390 ambiguity in calls to log2_intptr
Move JDK-8219772 to correct section as not yet upstreamed
Add new clhsdb and hsdb binaries.
Resolves: rhbz#1680640
38 lines
1.9 KiB
Diff
38 lines
1.9 KiB
Diff
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_intptr((uintptr_t) mapping_granularity_in_bytes));
|
|
}
|
|
|
|
size_t bias() const { return _bias; }
|
|
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_intptr((uintptr_t) 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
|
|
diff --git openjdk.orig/hotspot/src/share/vm/utilities/numberSeq.cpp openjdk/hotspot/src/share/vm/utilities/numberSeq.cpp
|
|
--- openjdk.orig/hotspot/src/share/vm/utilities/numberSeq.cpp
|
|
+++ openjdk/hotspot/src/share/vm/utilities/numberSeq.cpp
|
|
@@ -369,7 +369,7 @@
|
|
void BinaryMagnitudeSeq::add(size_t val) {
|
|
Atomic::add(val, &_sum);
|
|
|
|
- int mag = log2_intptr(val) + 1;
|
|
+ int mag = log2_intptr((uintptr_t) val) + 1;
|
|
|
|
// Defensively saturate for product bits:
|
|
if (mag < 0) {
|