[patch] fix: rebase jdk tip patches

scripts/config.sh

@@ -327,7 +327,7 @@ elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
   else
     VERSION_POLICY="latest_tag"
     JAVA_REPO="https://github.com/openjdk/jdk.git"
-    PATCHVER="jdk15"
+    PATCHVER="jdk16"
   fi
   JAVA_SCM="git"
   AUTOGEN_STYLE="v2"

scripts/jdk16_new.patch

@@ -0,0 +1,46 @@
+diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
+index 43653c115..4c5f960a8 100644
+--- a/make/autoconf/hotspot.m4
++++ b/make/autoconf/hotspot.m4
+@@ -138,6 +138,11 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_MISC],
+     HOTSPOT_TARGET_CPU_DEFINE="ARM32"
+   fi
+
++  if test "x$OPENJDK_BUILD_CPU" = xarm; then
++    HOTSPOT_BUILD_CPU=arm_32
++    HOTSPOT_BUILD_CPU_DEFINE="ARM32"
++  fi
++
+   # --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 7adecd141..e895e21d1 100644
+--- a/src/hotspot/share/memory/metaspaceShared.cpp
++++ b/src/hotspot/share/memory/metaspaceShared.cpp
+@@ -71,6 +71,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.inline.hpp"
+ #endif
+diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
+index 1761efa7a..cd0602cd0 100644
+--- a/src/hotspot/share/oops/constantPool.cpp
++++ b/src/hotspot/share/oops/constantPool.cpp
+@@ -443,8 +443,12 @@ void ConstantPool::remove_unshareable_info() {
+ }
+
+ int ConstantPool::cp_to_object_index(int cp_index) {
++  Array<u2> *map = reference_map();
++  if (map == 0)
++    return _no_index_sentinel;
++
+   // this is harder don't do this so much.
+-  int i = reference_map()->find(cp_index);
++  int i = map->find(cp_index);
+   // We might not find the index for jsr292 call.
+   return (i < 0) ? _no_index_sentinel : i;
+ }

scripts/jdk16_nosflt.patch

@@ -0,0 +1,20 @@
+diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
+index dd04ad1ab..d43e29e5a 100644
+--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
++++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
+@@ -1248,10 +1248,11 @@ extern int  __aeabi_dcmpgt(double, double);
+
+ // Imported code from glibc soft-fp bundle for
+ // calculation accuracy improvement. See CR 6757269.
+-extern double __aeabi_fadd_glibc(float, float);
+-extern double __aeabi_fsub_glibc(float, float);
+-extern double __aeabi_dadd_glibc(double, double);
+-extern double __aeabi_dsub_glibc(double, double);
++#define __aeabi_fadd_glibc __aeabi_fadd
++#define __aeabi_fsub_glibc __aeabi_fsub
++#define __aeabi_dadd_glibc __aeabi_dadd
++#define __aeabi_dsub_glibc __aeabi_dsub
++
+ };
+ #endif // __SOFTFP__
+