fix compilation failures with gcc >= 11

diff --git a/gcc11.patch b/gcc11.patch
new file mode 100644 (file)
index 0000000..8845da2
--- /dev/null
+++ b/gcc11.patch
@@ -0,0 +1,22 @@
+--- jdk9u-jdk-9.0.4+12/hotspot/src/share/vm/opto/lcm.cpp.orig  2018-01-22 16:19:02.000000000 +0100
++++ jdk9u-jdk-9.0.4+12/hotspot/src/share/vm/opto/lcm.cpp       2023-07-24 13:51:55.966369196 +0200
+@@ -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
+--- jdk9u-jdk-9.0.4+12/hotspot/src/share/vm/memory/virtualspace.cpp.orig       2018-01-22 16:19:02.000000000 +0100
++++ jdk9u-jdk-9.0.4+12/hotspot/src/share/vm/memory/virtualspace.cpp    2023-07-24 13:57:53.156354797 +0200
+@@ -581,7 +581,7 @@
+   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/openjdk9.spec b/openjdk9.spec
index 9591a0f28ab725a14d1db713fe1cb18a8b904080..53aac2f0b355df4ac01a5fbeed9e9135465561b0 100644 (file)
--- a/openjdk9.spec
+++ b/openjdk9.spec
@@ -54,6 +54,7 @@ Patch2:               x32.patch
 Patch3:                aarch64.patch
 Patch4:                default-assumemp.patch
 Patch5:                glibc-2.34.patch
+Patch6:                gcc11.patch
 URL:           http://openjdk.java.net/
 BuildRequires: /usr/bin/jar
 BuildRequires: alsa-lib-devel
@@ -409,6 +410,7 @@ done
 %endif
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.