src/hotspot/share/utilities/vmError.cpp

rev 59103 : imported patch hotspot

*** 81,91 ****
  const char *env_list[] = {
    // All platforms
    "JAVA_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
    "PATH", "USERNAME",
  
!   // Env variables that are defined on Solaris/Linux/BSD
    "LD_LIBRARY_PATH", "LD_PRELOAD", "SHELL", "DISPLAY",
    "HOSTTYPE", "OSTYPE", "ARCH", "MACHTYPE",
    "LANG", "LC_ALL", "LC_CTYPE", "TZ",
  
    // defined on AIX
--- 81,91 ----
  const char *env_list[] = {
    // All platforms
    "JAVA_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
    "PATH", "USERNAME",
  
!   // Env variables that are defined on Linux/BSD
    "LD_LIBRARY_PATH", "LD_PRELOAD", "SHELL", "DISPLAY",
    "HOSTTYPE", "OSTYPE", "ARCH", "MACHTYPE",
    "LANG", "LC_ALL", "LC_CTYPE", "TZ",
  
    // defined on AIX
*** 1592,1603 ****
      const char* ptr = OnError;
      while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
        out.print_raw   ("#   Executing ");
  #if defined(LINUX) || defined(_ALLBSD_SOURCE)
        out.print_raw   ("/bin/sh -c ");
- #elif defined(SOLARIS)
-       out.print_raw   ("/usr/bin/sh -c ");
  #elif defined(_WINDOWS)
        out.print_raw   ("cmd /C ");
  #endif
        out.print_raw   ("\"");
        out.print_raw   (cmd);
--- 1592,1601 ----
*** 1655,1666 ****
    const char* ptr = OnOutOfMemoryError;
    while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
      tty->print("#   Executing ");
  #if defined(LINUX)
      tty->print  ("/bin/sh -c ");
- #elif defined(SOLARIS)
-     tty->print  ("/usr/bin/sh -c ");
  #endif
      tty->print_cr("\"%s\"...", cmd);
  
      if (os::fork_and_exec(cmd, true) < 0) {
        tty->print_cr("os::fork_and_exec failed: %s (%s=%d)",
--- 1653,1662 ----