script: rebase jdk15 patches

Author: JakubVanek

scripts/config.sh

@@ -301,7 +301,7 @@ elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
     JAVA_REPO="https://github.com/openjdk/jdk.git"
   fi
   JAVA_SCM="git"
-  PATCHVER="jdk14"
+  PATCHVER="jdk15"
   AUTOGEN_STYLE="v2"
   if [ "$BUILDER_TYPE" = "native" ]; then
     HOSTJDK="$BUILDDIR/jdk-ev3"

scripts/jdk15_bkpt.patch

@@ -0,0 +1,16 @@
+diff --git a/src/hotspot/cpu/arm/globalDefinitions_arm.hpp b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
+index 4aff72af7..0a400d008 100644
+--- a/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
++++ b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp
+@@ -55,11 +55,4 @@ const bool HaveVFP = true;
+ #define AD_MD_HPP              "adfiles/ad_arm_32.hpp"
+ #define C1_LIRGENERATOR_MD_HPP "c1_LIRGenerator_arm.hpp"
+ 
+-#ifdef TARGET_COMPILER_gcc
+-#ifdef ARM32
+-#undef BREAKPOINT
+-#define BREAKPOINT __asm__ volatile ("bkpt")
+-#endif
+-#endif
+-
+ #endif // CPU_ARM_GLOBALDEFINITIONS_ARM_HPP

scripts/jdk15_cds.patch

@@ -0,0 +1,35 @@
+diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
+index 20d7f53d3..4f6130b62 100644
+--- a/src/hotspot/share/memory/metaspaceShared.cpp
++++ b/src/hotspot/share/memory/metaspaceShared.cpp
+@@ -1221,7 +1221,7 @@ public:
+     address obj = ref->obj();
+     int bytes = ref->size() * BytesPerWord;
+     char* p;
+-    size_t alignment = BytesPerWord;
++    size_t alignment = BytesPerLong;
+     char* oldtop;
+     char* newtop;
+ 
+@@ -1239,7 +1239,7 @@ public:
+         Klass* klass = (Klass*)obj;
+         if (klass->is_instance_klass()) {
+           SystemDictionaryShared::validate_before_archiving(InstanceKlass::cast(klass));
+-          _rw_region.allocate(sizeof(address), BytesPerWord);
++          _rw_region.allocate(sizeof(u8), alignment);
+         }
+       }
+       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
+--- a/src/hotspot/share/memory/metaspaceShared.hpp
++++ b/src/hotspot/share/memory/metaspaceShared.hpp
+@@ -70,7 +70,7 @@ public:
+   DumpRegion(const char* name) : _name(name), _base(NULL), _top(NULL), _end(NULL), _is_packed(false) {}
+ 
+   char* expand_top_to(char* newtop);
+-  char* allocate(size_t num_bytes, size_t alignment=BytesPerWord);
++  char* allocate(size_t num_bytes, size_t alignment=BytesPerLong);
+ 
+   void append_intptr_t(intptr_t n, bool need_to_mark = false);
+ 

scripts/jdk15_new.patch

@@ -0,0 +1,46 @@
+diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
+index 0e4f4c283..647f41158 100644
+--- a/make/autoconf/hotspot.m4
++++ b/make/autoconf/hotspot.m4
+@@ -172,6 +172,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 5bc8df595..20d7f53d3 100644
+--- a/src/hotspot/share/memory/metaspaceShared.cpp
++++ b/src/hotspot/share/memory/metaspaceShared.cpp
+@@ -71,6 +71,7 @@
+ #include "utilities/bitMap.inline.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
+--- a/src/hotspot/share/oops/constantPool.cpp
++++ b/src/hotspot/share/oops/constantPool.cpp
+@@ -429,8 +429,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/jdk15_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 44997ddcb..5d4b91209 100644
+--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
++++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
+@@ -1252,10 +1252,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__
+