--- old/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ArgumentHandler.java	2020-05-20 18:05:17.684173551 -0700
+++ new/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ArgumentHandler.java	2020-05-20 18:05:17.344167022 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -520,17 +520,10 @@
          *  available only on the Microsoft Windows platform.
          *  "
          */
-        {"solaris-sparc",   "com.sun.jdi.SharedMemoryAttach"},
-        {"solaris-sparcv9", "com.sun.jdi.SharedMemoryAttach"},
-        {"solaris-i586",    "com.sun.jdi.SharedMemoryAttach"},
-        {"solaris-amd64",   "com.sun.jdi.SharedMemoryAttach"},
-        {"solaris-x64",     "com.sun.jdi.SharedMemoryAttach"},
         {"linux-i586",      "com.sun.jdi.SharedMemoryAttach"},
         {"linux-ia64",      "com.sun.jdi.SharedMemoryAttach"},
         {"linux-amd64",     "com.sun.jdi.SharedMemoryAttach"},
         {"linux-x64",       "com.sun.jdi.SharedMemoryAttach"},
-        {"linux-sparc",     "com.sun.jdi.SharedMemoryAttach"},
-        {"linux-sparcv9",   "com.sun.jdi.SharedMemoryAttach"},
         {"linux-aarch64",   "com.sun.jdi.SharedMemoryAttach"},
         {"linux-arm",       "com.sun.jdi.SharedMemoryAttach"},
         {"linux-ppc64",     "com.sun.jdi.SharedMemoryAttach"},
@@ -550,17 +543,10 @@
          *  It is available only on the Microsoft Windows platform.
          *  "
          */
-        {"solaris-sparc",   "com.sun.jdi.SharedMemoryListen"},
-        {"solaris-sparcv9", "com.sun.jdi.SharedMemoryListen"},
-        {"solaris-i586",    "com.sun.jdi.SharedMemoryListen"},
-        {"solaris-amd64",   "com.sun.jdi.SharedMemoryListen"},
-        {"solaris-x64",     "com.sun.jdi.SharedMemoryListen"},
         {"linux-i586",      "com.sun.jdi.SharedMemoryListen"},
         {"linux-ia64",      "com.sun.jdi.SharedMemoryListen"},
         {"linux-amd64",     "com.sun.jdi.SharedMemoryListen"},
         {"linux-x64",       "com.sun.jdi.SharedMemoryListen"},
-        {"linux-sparc",     "com.sun.jdi.SharedMemoryListen"},
-        {"linux-sparcv9",   "com.sun.jdi.SharedMemoryListen"},
         {"linux-aarch64",   "com.sun.jdi.SharedMemoryListen"},
         {"linux-arm",       "com.sun.jdi.SharedMemoryListen"},
         {"linux-ppc64",     "com.sun.jdi.SharedMemoryListen"},
@@ -580,25 +566,9 @@
          *  respect to debugging. The details of launching the VM and specifying the
          *  necessary debug options are handled by the connector. The underlying
          *  transport used by this connector depends on the platform. On Microsoft
-         *  Windows, the shared memory transport is used. On Solaris and Linux the
-         *  socket transport is used.
+         *  Windows, the shared memory transport is used. On Linux the socket transport is used.
          * "
          */
-        {"solaris-sparc",   "com.sun.jdi.CommandLineLaunch", "dt_shmem"},
-        {"solaris-sparc",   "com.sun.jdi.RawCommandLineLaunch", "dt_shmem"},
-
-        {"solaris-sparcv9", "com.sun.jdi.CommandLineLaunch", "dt_shmem"},
-        {"solaris-sparcv9", "com.sun.jdi.RawCommandLineLaunch", "dt_shmem"},
-
-        {"solaris-i586",    "com.sun.jdi.CommandLineLaunch", "dt_shmem"},
-        {"solaris-i586",    "com.sun.jdi.RawCommandLineLaunch", "dt_shmem"},
-
-        {"solaris-amd64",   "com.sun.jdi.CommandLineLaunch", "dt_shmem"},
-        {"solaris-amd64",   "com.sun.jdi.RawCommandLineLaunch", "dt_shmem"},
-
-        {"solaris-x64",     "com.sun.jdi.CommandLineLaunch", "dt_shmem"},
-        {"solaris-x64",     "com.sun.jdi.RawCommandLineLaunch", "dt_shmem"},
-
         {"linux-i586",      "com.sun.jdi.CommandLineLaunch", "dt_shmem"},
         {"linux-i586",      "com.sun.jdi.RawCommandLineLaunch", "dt_shmem"},
 
@@ -611,12 +581,6 @@
         {"linux-x64",       "com.sun.jdi.CommandLineLaunch", "dt_shmem"},
         {"linux-x64",       "com.sun.jdi.RawCommandLineLaunch", "dt_shmem"},
 
-        {"linux-sparc",     "com.sun.jdi.CommandLineLaunch", "dt_shmem"},
-        {"linux-sparc",     "com.sun.jdi.RawCommandLineLaunch", "dt_shmem"},
-
-        {"linux-sparcv9",   "com.sun.jdi.CommandLineLaunch", "dt_shmem"},
-        {"linux-sparcv9",   "com.sun.jdi.RawCommandLineLaunch", "dt_shmem"},
-
         {"linux-aarch64",   "com.sun.jdi.CommandLineLaunch", "dt_shmem"},
         {"linux-aarch64",   "com.sun.jdi.RawCommandLineLaunch", "dt_shmem"},
 
@@ -654,17 +618,10 @@
         {"aix-ppc64",       "com.sun.jdi.RawCommandLineLaunch", "dt_shmem"},
 
         // shared memory transport is implemented only on windows platform
-        {"solaris-sparc",   "dt_shmem"},
-        {"solaris-sparcv9", "dt_shmem"},
-        {"solaris-i586",    "dt_shmem"},
-        {"solaris-amd64",   "dt_shmem"},
-        {"solaris-x64",     "dt_shmem"},
         {"linux-i586",      "dt_shmem"},
         {"linux-ia64",      "dt_shmem"},
         {"linux-amd64",     "dt_shmem"},
         {"linux-x64",       "dt_shmem"},
-        {"linux-sparc",     "dt_shmem"},
-        {"linux-sparcv9",   "dt_shmem"},
         {"linux-aarch64",   "dt_shmem"},
         {"linux-arm",       "dt_shmem"},
         {"linux-ppc64",     "dt_shmem"},