[patch] rebase JDK11 patches

Author: JakubVanek

scripts/jdk11.patch

@@ -1,8 +1,8 @@
 diff --git a/make/autoconf/flags-other.m4 b/make/autoconf/flags-other.m4
-index ffd093ee1..0bb8172bc 100644
+index dbbeaf11c..985b06cbd 100644
 --- a/make/autoconf/flags-other.m4
 +++ b/make/autoconf/flags-other.m4
-@@ -121,6 +121,10 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS_CPU_DEP],
+@@ -119,6 +119,10 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS_CPU_DEP],
    # Misuse EXTRA_CFLAGS to mimic old behavior
    $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS ${$2EXTRA_CFLAGS}"
 
@@ -14,7 +14,7 @@ index ffd093ee1..0bb8172bc 100644
  ])
 
 diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
-index 472e7a638..a7a7b8467 100644
+index 1ffc43726..159a329b8 100644
 --- a/make/autoconf/flags.m4
 +++ b/make/autoconf/flags.m4
 @@ -34,7 +34,7 @@ m4_include([flags-other.m4])
@@ -37,7 +37,7 @@ index 472e7a638..a7a7b8467 100644
        ARM_FLOAT_TYPE=vfp-sflt
        ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
 diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
-index 53d6d17de..f52495086 100644
+index 53d6d17de..00abcbaf7 100644
 --- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
 +++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
 @@ -498,7 +498,7 @@ class Assembler : public AbstractAssembler  {

scripts/jdk11_cds.patch

@@ -1,8 +1,8 @@
 diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
-index 3a577827f..062fc5dd4 100644
+index 40c5f7be1..e43428a23 100644
 --- a/src/hotspot/share/memory/metaspaceShared.cpp
 +++ b/src/hotspot/share/memory/metaspaceShared.cpp
-@@ -132,7 +132,7 @@ private:
+@@ -133,7 +133,7 @@ private:
  public:
    DumpRegion(const char* name) : _name(name), _base(NULL), _top(NULL), _end(NULL), _is_packed(false) {}
 
@@ -11,7 +11,7 @@ index 3a577827f..062fc5dd4 100644
      char* p = (char*)align_up(_top, alignment);
      char* newtop = p + align_up(num_bytes, alignment);
      expand_top_to(newtop);
-@@ -1124,7 +1124,7 @@ public:
+@@ -1130,7 +1130,7 @@ public:
      address obj = ref->obj();
      int bytes = ref->size() * BytesPerWord;
      char* p;

scripts/jdk11_lib.patch

@@ -15,10 +15,10 @@ index a4b67f09f..15f6f94db 100644
    ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
      RC_DESC := 64-Bit$(SPACE)
 diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
-index 4a7986e46..ea530bbce 100644
+index 2cccc9767..35a62ca1b 100644
 --- a/src/hotspot/os/linux/os_linux.cpp
 +++ b/src/hotspot/os/linux/os_linux.cpp
-@@ -406,10 +406,10 @@ void os::init_system_properties_values() {
+@@ -408,10 +408,10 @@ void os::init_system_properties_values() {
    //        1: ...
    //        ...
    //        7: The default directories, normally /lib and /usr/lib.

scripts/jdk11_new.patch

@@ -73,10 +73,10 @@ index 342c1c347..ac86ecfbd 100644
    }
  #endif // !AARCH64
 diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
-index 2b82d1305..3a577827f 100644
+index f20f5305c..40c5f7be1 100644
 --- a/src/hotspot/share/memory/metaspaceShared.cpp
 +++ b/src/hotspot/share/memory/metaspaceShared.cpp
-@@ -62,6 +62,7 @@
+@@ -63,6 +63,7 @@
  #include "utilities/align.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/hashtable.inline.hpp"
@@ -85,7 +85,7 @@ index 2b82d1305..3a577827f 100644
  #include "gc/g1/g1Allocator.inline.hpp"
  #include "gc/g1/g1CollectedHeap.hpp"
 diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
-index e531669ee..ced9bd611 100644
+index 6ebf9513b..543fff64b 100644
 --- a/src/hotspot/share/oops/constantPool.cpp
 +++ b/src/hotspot/share/oops/constantPool.cpp
 @@ -400,8 +400,12 @@ void ConstantPool::remove_unshareable_info() {

scripts/jdk11_nosflt.patch

@@ -1,5 +1,5 @@
 diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
-index 53d6d17de..f52495086 100644
+index 00abcbaf7..f52495086 100644
 --- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
 +++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
 @@ -1239,10 +1239,11 @@ extern int  __aeabi_dcmpgt(double, double);