test/hotspot/jtreg/compiler/aot/AotCompiler.java

rev 59103 : imported patch hotspot

*** 146,160 ****
          System.err.println("Usage: " + AotCompiler.class.getName()
                  + " -class <class> -libname <.so name>"
                  + " [-compile <compileItems>]* [-extraopt <java option>]*");
      }
  
!     // runs ld -v (or ld -V on solaris) and check its exit code
      private static boolean checkLd(Path bin) {
          try {
!             return 0 == ProcessTools.executeCommand(bin.toString(),
!                                                     Platform.isSolaris() ? "-V" : "-v")
                                      .getExitValue();
          } catch (Throwable t) {
              // any errors mean ld doesn't work
              return false;
          }
--- 146,159 ----
          System.err.println("Usage: " + AotCompiler.class.getName()
                  + " -class <class> -libname <.so name>"
                  + " [-compile <compileItems>]* [-extraopt <java option>]*");
      }
  
!     // runs ld -v and check its exit code
      private static boolean checkLd(Path bin) {
          try {
!             return 0 == ProcessTools.executeCommand(bin.toString(), "-v")
                                      .getExitValue();
          } catch (Throwable t) {
              // any errors mean ld doesn't work
              return false;
          }
*** 218,261 ****
                                 .resolve("Toolchains")
                                 .resolve("XcodeDefault.xctoolchain")
                                 .resolve("usr")
                                 .resolve("bin")
                                 .resolve("ld");
-             } else if (Platform.isSolaris()) {
-                 if (Platform.isSparc()) {
-                     @Artifact(organization =  "jpg.infra.builddeps",
-                             name = "devkit-solaris_sparcv9",
-                             revision = "SS12u4-Solaris11u1+1.1",
-                             extension = "tar.gz")
-                     class DevkitSolarisSparc { }
- 
-                     String artifactName = "jpg.infra.builddeps."
-                             + "devkit-solaris_sparcv9-"
-                             + "SS12u4-Solaris11u1+1.1";
-                     Path devkit = ArtifactResolver.resolve(DevkitSolarisSparc.class)
-                                                   .get(artifactName);
-                     linker = devkit.resolve("SS12u4-Solaris11u1")
-                                    .resolve("gnu")
-                                    .resolve("bin")
-                                    .resolve("ld");
-                 } else if (Platform.isX64()) {
-                     @Artifact(organization =  "jpg.infra.builddeps",
-                             name = "devkit-solaris_x64",
-                             revision = "SS12u4-Solaris11u1+1.0",
-                             extension = "tar.gz")
-                     class DevkitSolarisX64 { }
- 
-                     String artifactName = "jpg.infra.builddeps."
-                             + "devkit-solaris_x64-"
-                             + "SS12u4-Solaris11u1+1.0";
-                     Path devkit = ArtifactResolver.resolve(DevkitSolarisX64.class)
-                                                   .get(artifactName);
-                     linker = devkit.resolve("SS12u4-Solaris11u1")
-                                    .resolve("bin")
-                                    .resolve("amd64")
-                                    .resolve("ld");
-                 }
              } else if (Platform.isLinux()) {
                  if (Platform.isAArch64()) {
                      @Artifact(organization = "jpg.infra.builddeps",
                              name = "devkit-linux_aarch64",
                              revision = "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0",
--- 217,226 ----