Replace jdk_client patch to just update jvm.cfg

server and client builds are done with different sets of patches.
The server build has no patches applied, so jvm.cfg can be
unconditionally patched to run the client VM.

2 files changed, 11 insertions, 71 deletions

diff --git a/jdk/jdk_client.patch b/jdk/jdk_client.patch
deleted file mode 100644
index f1a3ff5..0000000
--- a/jdk/jdk_client.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -r ebcbf5b820e8 src/share/bin/java.c
---- a/src/share/bin/java.c	Wed Mar 23 17:20:09 2016 +0000
-+++ b/src/share/bin/java.c	Wed May 11 13:34:15 2016 +0000
-@@ -699,6 +699,22 @@
-     }
- }
- 
-+/*
-+ * This is called if the jvmtype returned by CheckJvmType above
-+ * didn't exist. In this case if it was the default VM and we
-+ * selected the server vm we will allow it to use the client vm
-+ * instead.
-+ */
-+char *
-+GetAltJvmType(char *jvmtype)
-+{
-+    if ((knownVMs[0].flag == VM_IF_SERVER_CLASS) &&
-+        (jvmtype == knownVMs[0].server_class+1)) {
-+      return knownVMs[0].name+1;
-+    }
-+    return NULL;
-+}
-+
- /* copied from HotSpot function "atomll()" */
- static int
- parse_size(const char *s, jlong *result) {
-diff -r ebcbf5b820e8 src/share/bin/java.h
---- a/src/share/bin/java.h	Wed Mar 23 17:20:09 2016 +0000
-+++ b/src/share/bin/java.h	Wed May 11 13:34:15 2016 +0000
-@@ -164,6 +164,7 @@
-  */
- jint ReadKnownVMs(const char *jvmcfg, jboolean speculative);
- char *CheckJvmType(int *argc, char ***argv, jboolean speculative);
-+char *GetAltJvmType(char *jvmtype);
- void AddOption(char *str, void *info);
- 
- enum ergo_policy {
-diff -r ebcbf5b820e8 src/solaris/bin/aarch64/jvm.cfg
---- a/src/solaris/bin/aarch64/jvm.cfg	Wed Mar 23 17:20:09 2016 +0000
-+++ b/src/solaris/bin/aarch64/jvm.cfg	Wed May 11 13:34:15 2016 +0000
-@@ -31,5 +31,6 @@
- # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
- # and may not be available in a future release.
- #
-+-client IF_SERVER_CLASS -server
- -server KNOWN
---client IGNORE
-+-minimal KNOWN
-diff -r ebcbf5b820e8 src/solaris/bin/java_md_solinux.c
---- a/src/solaris/bin/java_md_solinux.c	Wed Mar 23 17:20:09 2016 +0000
-+++ b/src/solaris/bin/java_md_solinux.c	Wed May 11 13:34:15 2016 +0000
-@@ -474,8 +474,17 @@
-         }
- 
-         if (!GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, arch, 0 )) {
--          JLI_ReportErrorMessage(CFG_ERROR8, jvmtype, jvmpath);
--          exit(4);
-+          char *altjvmtype = GetAltJvmType(jvmtype);
-+          jboolean found = JNI_FALSE;
-+          if (altjvmtype) {
-+            jvmtype = altjvmtype;
-+            jvmpath[0] = '\0';
-+            found = GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, arch, 0) != NULL;
-+          }
-+          if (!found) {
-+	    JLI_ReportErrorMessage(CFG_ERROR8, jvmtype, jvmpath);
-+	    exit(4);
-+          }
-         }
-         /*
-          * we seem to have everything we need, so without further ado
diff --git a/jdk/jdk_jvmcfg.patch b/jdk/jdk_jvmcfg.patch
new file mode 100644
index 0000000..c4e98f5
--- /dev/null
+++ b/jdk/jdk_jvmcfg.patch
@@ -0,0 +1,11 @@
+diff -r 0e757f8bf24c src/solaris/bin/aarch64/jvm.cfg
+--- a/src/solaris/bin/aarch64/jvm.cfg	Sun Apr 10 22:47:29 2016 +0100
++++ b/src/solaris/bin/aarch64/jvm.cfg	Wed May 18 18:20:54 2016 +0100
+@@ -31,5 +31,5 @@
+ # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
+ # and may not be available in a future release.
+ #
+--server KNOWN
+--client IGNORE
++-server IGNORE
++-client UNKNOWN