321e866b1c
* gnu/packages/java.scm (icedtea-7)[arguments]: Add substitution to prevent ldd segfault and disable optimizations of dump.cpp instead of patching. [native-inputs]: Patch the "hotspot" drop. * gnu/packages/patches/icedtea-7-hotspot-pointer-comparison.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
Avoid ordered comparison of pointer with integer to prevent compile error
|
|
with GCC 11.
|
|
|
|
diff --git a/src/share/vm/opto/lcm.cpp b/src/share/vm/opto/lcm.cpp
|
|
--- a/src/share/vm/opto/lcm.cpp
|
|
+++ b/src/share/vm/opto/lcm.cpp
|
|
@@ -60,7 +60,7 @@
|
|
// Check whether val is not-null-decoded compressed oop,
|
|
// i.e. will grab into the base of the heap if it represents NULL.
|
|
static bool accesses_heap_base_zone(Node *val) {
|
|
- if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
|
|
+ if (Universe::narrow_oop_base() != NULL) { // Implies UseCompressedOops.
|
|
if (val && val->is_Mach()) {
|
|
if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
|
|
// This assumes all Decodes with TypePtr::NotNull are matched to nodes that
|
|
diff --git a/src/share/vm/runtime/virtualspace.cpp b/src/share/vm/runtime/virtualspace.cpp
|
|
--- a/src/share/vm/runtime/virtualspace.cpp
|
|
+++ b/src/share/vm/runtime/virtualspace.cpp
|
|
@@ -527,7 +527,7 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment,
|
|
(UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
|
|
Universe::narrow_oop_use_implicit_null_checks()) ?
|
|
lcm(os::vm_page_size(), alignment) : 0) {
|
|
- if (base() > 0) {
|
|
+ if (base() != NULL) {
|
|
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
|
|
}
|
|
|
|
@@ -546,7 +546,7 @@ ReservedHeapSpace::ReservedHeapSpace(const size_t prefix_size,
|
|
(UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
|
|
Universe::narrow_oop_use_implicit_null_checks()) ?
|
|
lcm(os::vm_page_size(), prefix_align) : 0) {
|
|
- if (base() > 0) {
|
|
+ if (base() != NULL) {
|
|
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
|
|
}
|
|
|