diff options
author | Marius Bakke <[email protected]> | 2022-09-13 00:57:31 +0200 |
---|---|---|
committer | Marius Bakke <[email protected]> | 2022-09-13 14:53:08 +0200 |
commit | 389b5b5359e82be5e0417fd3505661b1800fca40 (patch) | |
tree | 60d06dbbded034aa4519ef44b0e0b689efe22cdc /gnu/packages/patches/openjdk-9-hotspot-pointer-comparison.patch | |
parent | 321e866b1cea4916e3568efb84a248e5bb91200a (diff) |
gnu: OpenJDK@9: Fix build with newer toolchain.
* gnu/packages/java.scm (openjdk9)[source](patches): New field.
* gnu/packages/patches/openjdk-9-hotspot-pointer-comparison.patch,
gnu/packages/patches/openjdk-9-hotspot-stack-size.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/patches/openjdk-9-hotspot-pointer-comparison.patch')
-rw-r--r-- | gnu/packages/patches/openjdk-9-hotspot-pointer-comparison.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/gnu/packages/patches/openjdk-9-hotspot-pointer-comparison.patch b/gnu/packages/patches/openjdk-9-hotspot-pointer-comparison.patch new file mode 100644 index 0000000000..b90d736211 --- /dev/null +++ b/gnu/packages/patches/openjdk-9-hotspot-pointer-comparison.patch @@ -0,0 +1,27 @@ +Avoid ordered comparison of pointer with integer to prevent compile error +with GCC 11. + +diff --git a/hotspot/src/share/vm/memory/virtualspace.cpp b/hotspot/src/share/vm/memory/virtualspace.cpp +--- a/hotspot/src/share/vm/memory/virtualspace.cpp ++++ b/hotspot/src/share/vm/memory/virtualspace.cpp +@@ -581,7 +581,7 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment, bool large) + assert(markOopDesc::encode_pointer_as_mark(&_base[size])->decode_pointer() == &_base[size], + "area must be distinguishable from marks for mark-sweep"); + +- if (base() > 0) { ++ if (base() != NULL) { + MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); + } + } +diff --git a/hotspot/src/share/vm/opto/lcm.cpp b/hotspot/src/share/vm/opto/lcm.cpp +--- a/hotspot/src/share/vm/opto/lcm.cpp ++++ b/hotspot/src/share/vm/opto/lcm.cpp +@@ -39,7 +39,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 |