Fix build on HEAD.

PR:		244803
Submitted by:	Yasuhiro KIMURA <yasu_AT_utahime__dot__org>

3 files changed, 39 insertions, 0 deletions

diff --git a/java/openjdk11/files/patch-src_hotspot_share_runtime_arguments.cpp b/java/openjdk11/files/patch-src_hotspot_share_runtime_arguments.cpp
new file mode 100644
index 000000000000..911e81c13552
--- /dev/null
+++ b/java/openjdk11/files/patch-src_hotspot_share_runtime_arguments.cpp
@@ -0,0 +1,11 @@
+--- src/hotspot/share/runtime/arguments.cpp.orig	2020-01-15 18:29:57 UTC
++++ src/hotspot/share/runtime/arguments.cpp
+@@ -1458,7 +1458,7 @@ bool Arguments::add_property(const char* prop, Propert
+       // save it in _java_vendor_url_bug, so JVM fatal error handler can access
+       // its value without going through the property list or making a Java call.
+       _java_vendor_url_bug = os::strdup_check_oom(value, mtArguments);
+-      if (old_java_vendor_url_bug != DEFAULT_VENDOR_URL_BUG) {
++      if (strcmp(old_java_vendor_url_bug, DEFAULT_VENDOR_URL_BUG) != 0) {
+         assert(old_java_vendor_url_bug != NULL, "_java_vendor_url_bug is NULL");
+         os::free((void *)old_java_vendor_url_bug);
+       }
diff --git a/java/openjdk11/files/patch-src_hotspot_share_runtime_sharedRuntime.cpp b/java/openjdk11/files/patch-src_hotspot_share_runtime_sharedRuntime.cpp
new file mode 100644
index 000000000000..08caf44ad7c5
--- /dev/null
+++ b/java/openjdk11/files/patch-src_hotspot_share_runtime_sharedRuntime.cpp
@@ -0,0 +1,11 @@
+--- src/hotspot/share/runtime/sharedRuntime.cpp.orig	2020-01-15 18:29:57 UTC
++++ src/hotspot/share/runtime/sharedRuntime.cpp
+@@ -2806,7 +2806,7 @@ void AdapterHandlerLibrary::create_native_wrapper(cons
+     if (buf != NULL) {
+       CodeBuffer buffer(buf);
+       double locs_buf[20];
+-      buffer.insts()->initialize_shared_locs((relocInfo*)locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
++      buffer.insts()->initialize_shared_locs((relocInfo*)locs_buf, (sizeof(locs_buf)) / (sizeof(relocInfo)));
+       MacroAssembler _masm(&buffer);
+ 
+       // Fill in the signature array, for the calling-convention call.
diff --git a/java/openjdk11/files/patch-src_java.base_share_native_libfdlibm_e__asin.c b/java/openjdk11/files/patch-src_java.base_share_native_libfdlibm_e__asin.c
new file mode 100644
index 000000000000..6ce203879bc2
--- /dev/null
+++ b/java/openjdk11/files/patch-src_java.base_share_native_libfdlibm_e__asin.c
@@ -0,0 +1,17 @@
+--- src/java.base/share/native/libfdlibm/e_asin.c.orig	2020-01-15 18:29:57 UTC
++++ src/java.base/share/native/libfdlibm/e_asin.c
+@@ -97,12 +97,13 @@ qS4 =  7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB1
+         } else if (ix<0x3fe00000) {     /* |x|<0.5 */
+             if(ix<0x3e400000) {         /* if |x| < 2**-27 */
+                 if(huge+x>one) return x;/* return x with inexact if x!=0*/
+-            } else
++            } else {
+                 t = x*x;
+                 p = t*(pS0+t*(pS1+t*(pS2+t*(pS3+t*(pS4+t*pS5)))));
+                 q = one+t*(qS1+t*(qS2+t*(qS3+t*qS4)));
+                 w = p/q;
+                 return x+x*w;
++            }
+         }
+         /* 1> |x|>= 0.5 */
+         w = one-fabs(x);