src/os/aix/vm/os_aix.cpp

*** 4968,4985 ****
    return 0;
  }
  
  // is_headless_jre()
  //
! // Test for the existence of libmawt in motif21 or xawt directories
  // in order to report if we are running in a headless jre
  bool os::is_headless_jre() {
    struct stat statbuf;
    char buf[MAXPATHLEN];
    char libmawtpath[MAXPATHLEN];
    const char *xawtstr  = "/xawt/libmawt.so";
!   const char *motifstr = "/motif21/libmawt.so";
    char *p;
  
    // Get path to libjvm.so
    os::jvm_path(buf, sizeof(buf));
  
--- 4968,4989 ----
    return 0;
  }
  
  // is_headless_jre()
  //
! // Test for the existence of xawt/libmawt.so or libawt_xawt.so
  // in order to report if we are running in a headless jre
+ //
+ // Since JDK8 xawt/libmawt.so was moved into the same directory
+ // as libawt.so, and renamed libawt_xawt.so
+ //
  bool os::is_headless_jre() {
    struct stat statbuf;
    char buf[MAXPATHLEN];
    char libmawtpath[MAXPATHLEN];
    const char *xawtstr  = "/xawt/libmawt.so";
!   const char *new_xawtstr = "/libawt_xawt.so";
    char *p;
  
    // Get path to libjvm.so
    os::jvm_path(buf, sizeof(buf));
  
*** 4996,5008 ****
    // check xawt/libmawt.so
    strcpy(libmawtpath, buf);
    strcat(libmawtpath, xawtstr);
    if (::stat(libmawtpath, &statbuf) == 0) return false;
  
!   // check motif21/libmawt.so
    strcpy(libmawtpath, buf);
!   strcat(libmawtpath, motifstr);
    if (::stat(libmawtpath, &statbuf) == 0) return false;
  
    return true;
  }
  
--- 5000,5012 ----
    // check xawt/libmawt.so
    strcpy(libmawtpath, buf);
    strcat(libmawtpath, xawtstr);
    if (::stat(libmawtpath, &statbuf) == 0) return false;
  
!   // check libawt_xawt.so
    strcpy(libmawtpath, buf);
!   strcat(libmawtpath, new_xawtstr);
    if (::stat(libmawtpath, &statbuf) == 0) return false;
  
    return true;
  }