[patch] fix: rebase jdk15 patches

Author: JakubVanek

scripts/jdk15_cds.patch

@@ -1,8 +1,8 @@
 diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
-index 20d7f53d3..4f6130b62 100644
+index 57a97b5c2..448156667 100644
 --- a/src/hotspot/share/memory/metaspaceShared.cpp
 +++ b/src/hotspot/share/memory/metaspaceShared.cpp
-@@ -1221,7 +1221,7 @@ public:
+@@ -1311,7 +1311,7 @@ public:
      address obj = ref->obj();
      int bytes = ref->size() * BytesPerWord;
      char* p;
@@ -11,7 +11,7 @@ index 20d7f53d3..4f6130b62 100644
      char* oldtop;
      char* newtop;
 
-@@ -1239,7 +1239,7 @@ public:
+@@ -1329,7 +1329,7 @@ public:
          Klass* klass = (Klass*)obj;
          if (klass->is_instance_klass()) {
            SystemDictionaryShared::validate_before_archiving(InstanceKlass::cast(klass));
@@ -21,10 +21,10 @@ index 20d7f53d3..4f6130b62 100644
        }
        p = _rw_region.allocate(bytes, alignment);
 diff --git a/src/hotspot/share/memory/metaspaceShared.hpp b/src/hotspot/share/memory/metaspaceShared.hpp
-index 4a4ee709f..57af38f19 100644
+index 326522c4a..4c5e54b4d 100644
 --- a/src/hotspot/share/memory/metaspaceShared.hpp
 +++ b/src/hotspot/share/memory/metaspaceShared.hpp
-@@ -70,7 +70,7 @@ public:
+@@ -71,7 +71,7 @@ public:
    DumpRegion(const char* name) : _name(name), _base(NULL), _top(NULL), _end(NULL), _is_packed(false) {}
 
    char* expand_top_to(char* newtop);

scripts/jdk15_new.patch

@@ -1,8 +1,8 @@
 diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
-index 0e4f4c283..647f41158 100644
+index 43653c115..4c5f960a8 100644
 --- a/make/autoconf/hotspot.m4
 +++ b/make/autoconf/hotspot.m4
-@@ -172,6 +172,11 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_MISC],
+@@ -138,6 +138,11 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_MISC],
      HOTSPOT_TARGET_CPU_DEFINE="ARM32"
    fi
 
@@ -13,24 +13,24 @@ index 0e4f4c283..647f41158 100644
 +
    # --with-cpu-port is no longer supported
    UTIL_DEPRECATED_ARG_WITH(with-cpu-port)
- ])
+ 
 diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
-index 5bc8df595..20d7f53d3 100644
+index 28742febe..57a97b5c2 100644
 --- a/src/hotspot/share/memory/metaspaceShared.cpp
 +++ b/src/hotspot/share/memory/metaspaceShared.cpp
-@@ -71,6 +71,7 @@
- #include "utilities/bitMap.inline.hpp"
+@@ -72,6 +72,7 @@
+ #include "utilities/ostream.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/hashtable.inline.hpp"
 +#include "gc/shared/softRefPolicy.hpp"
  #if INCLUDE_G1GC
  #include "gc/g1/g1CollectedHeap.hpp"
  #endif
 diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
-index b325f9f16..da47aff73 100644
+index d27bf3474..35bc24c7b 100644
 --- a/src/hotspot/share/oops/constantPool.cpp
 +++ b/src/hotspot/share/oops/constantPool.cpp
-@@ -429,8 +429,12 @@ void ConstantPool::remove_unshareable_info() {
+@@ -437,8 +437,12 @@ void ConstantPool::remove_unshareable_info() {
  }
 
  int ConstantPool::cp_to_object_index(int cp_index) {