src/share/vm/runtime/arguments.cpp

*** 100,111 ****
  SystemProperty *Arguments::_sun_boot_class_path = NULL;
  
  char* Arguments::_meta_index_path = NULL;
  char* Arguments::_meta_index_dir = NULL;
  
- static bool force_client_mode = false;
- 
  // Check if head of 'option' matches 'name', and sets 'tail' remaining part of option string
  
  static bool match_option(const JavaVMOption *option, const char* name,
                           const char** tail) {
    int len = (int)strlen(name);
--- 100,109 ----
*** 1343,1353 ****
    // that they want sharing explicitly, do not set ergonomics flags.
    if (DumpSharedSpaces || RequireSharedSpaces) {
      return;
    }
  
!   if (os::is_server_class_machine() && !force_client_mode ) {
      // If no other collector is requested explicitly,
      // let the VM select the collector based on
      // machine class and automatic selection policy.
      if (!UseSerialGC &&
          !UseConcMarkSweepGC &&
--- 1341,1351 ----
    // that they want sharing explicitly, do not set ergonomics flags.
    if (DumpSharedSpaces || RequireSharedSpaces) {
      return;
    }
  
!   if (os::is_server_class_machine()) {
      // If no other collector is requested explicitly,
      // let the VM select the collector based on
      // machine class and automatic selection policy.
      if (!UseSerialGC &&
          !UseConcMarkSweepGC &&
*** 2938,2952 ****
  
    // Sharing support
    // Construct the path to the archive
    char jvm_path[JVM_MAXPATHLEN];
    os::jvm_path(jvm_path, sizeof(jvm_path));
- #ifdef TIERED
-   if (strstr(jvm_path, "client") != NULL) {
-     force_client_mode = true;
-   }
- #endif // TIERED
    char *end = strrchr(jvm_path, *os::file_separator());
    if (end != NULL) *end = '\0';
    char *shared_archive_path = NEW_C_HEAP_ARRAY(char, strlen(jvm_path) +
                                          strlen(os::file_separator()) + 20);
    if (shared_archive_path == NULL) return JNI_ENOMEM;
--- 2936,2945 ----