--- old/test/lib/jdk/test/lib/Platform.java	2020-05-01 02:28:24.526900287 -0700
+++ new/test/lib/jdk/test/lib/Platform.java	2020-05-01 02:28:24.146892978 -0700
@@ -113,10 +113,6 @@
         return isOs("mac");
     }
 
-    public static boolean isSolaris() {
-        return isOs("sunos");
-    }
-
     public static boolean isWindows() {
         return isOs("win");
     }
@@ -149,14 +145,14 @@
     }
 
     // Returns major version number from os.version system property.
-    // E.g. 5 on Solaris 10 and 3 on SLES 11.3 (for the linux kernel version).
+    // E.g. 3 on SLES 11.3 (for the linux kernel version).
     public static int getOsVersionMajor() {
         if (osVersionMajor == -1) init_version();
         return osVersionMajor;
     }
 
     // Returns minor version number from os.version system property.
-    // E.g. 10 on Solaris 10 and 0 on SLES 11.3 (for the linux kernel version).
+    // E.g. 0 on SLES 11.3 (for the linux kernel version).
     public static int getOsVersionMinor() {
         if (osVersionMinor == -1) init_version();
         return osVersionMinor;
@@ -195,13 +191,8 @@
         return isArch("s390.*") || isArch("s/390.*") || isArch("zArch_64");
     }
 
-    // Returns true for sparc and sparcv9.
-    public static boolean isSparc() {
-        return isArch("sparc.*");
-    }
-
     public static boolean isX64() {
-        // On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64'
+        // On OSX it's 'x86_64' and on other (Linux and Windows) platforms it's 'amd64'
         return isArch("(amd64)|(x86_64)");
     }
 
@@ -225,8 +216,6 @@
     public static boolean hasSA() {
         if (isAix()) {
             return false; // SA not implemented.
-        } else if (isSolaris()) {
-            return false; // Testing disabled due to JDK-8193639.
         } else if (isLinux()) {
             if (isS390x() || isARM()) {
                 return false; // SA not implemented.
@@ -361,7 +350,6 @@
                 isServer() &&
                 (isLinux()   ||
                  isOSX()     ||
-                 isSolaris() ||
                  isWindows()) &&
                 !isZero()    &&
                 !isMinimal() &&
@@ -373,6 +361,6 @@
      * This should match the #if condition in ClassListParser::load_class_from_source().
      */
     public static boolean areCustomLoadersSupportedForCDS() {
-        return (is64bit() && (isLinux() || isSolaris() || isOSX()));
+        return (is64bit() && (isLinux() || isOSX()));
     }
 }