*** old/src/share/vm/runtime/arguments.cpp	Tue Apr 29 16:56:03 2014
--- new/src/share/vm/runtime/arguments.cpp	Tue Apr 29 16:56:03 2014

*** 850,869 ****
--- 850,869 ----
  void Arguments::print_jvm_flags_on(outputStream* st) {
    if (_num_jvm_flags > 0) {
      for (int i=0; i < _num_jvm_flags; i++) {
        st->print("%s ", _jvm_flags_array[i]);
      }
!     st->print_cr("");
    }
  }
  
  void Arguments::print_jvm_args_on(outputStream* st) {
    if (_num_jvm_args > 0) {
      for (int i=0; i < _num_jvm_args; i++) {
        st->print("%s ", _jvm_args_array[i]);
      }
!     st->print_cr("");
    }
  }
  
  bool Arguments::process_argument(const char* arg,
      jboolean ignore_unrecognized, Flag::Flags origin) {

*** 1347,1358 ****
--- 1347,1358 ----
    if (!FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim) || !FLAG_IS_DEFAULT(OldPLABWeight)) {
      CFLS_LAB::modify_initialization(OldPLABSize, OldPLABWeight);
    }
    if (PrintGCDetails && Verbose) {
      tty->print_cr("MarkStackSize: %uk  MarkStackSizeMax: %uk",
!       MarkStackSize / K, MarkStackSizeMax / K);
!     tty->print_cr("ConcGCThreads: %u", ConcGCThreads);
!       (unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));
!     tty->print_cr("ConcGCThreads: %u", (uint) ConcGCThreads);
    }
  }
  #endif // INCLUDE_ALL_GCS
  
  void set_object_alignment() {

*** 1428,1438 ****
--- 1428,1438 ----
        !FLAG_IS_DEFAULT(MaxGCPauseMillis) &&
        (MaxGCPauseMillis <= AutoGCSelectPauseMillis)) {
      if (PrintGCDetails) {
        // Cannot use gclog_or_tty yet.
        tty->print_cr("Automatic selection of the low pause collector"
!        " based on pause goal of %d (ms)", (int) MaxGCPauseMillis);
      }
      return true;
    }
    return false;
  }

*** 1645,1656 ****
--- 1645,1656 ----
      FLAG_SET_DEFAULT(GCTimeRatio, 9);
    }
  
    if (PrintGCDetails && Verbose) {
      tty->print_cr("MarkStackSize: %uk  MarkStackSizeMax: %uk",
!       MarkStackSize / K, MarkStackSizeMax / K);
!     tty->print_cr("ConcGCThreads: %u", ConcGCThreads);
!       (unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));
!     tty->print_cr("ConcGCThreads: %u", (uint) ConcGCThreads);
    }
  }
  
  julong Arguments::limit_by_allocatable_memory(julong limit) {
    julong max_allocatable;

*** 1730,1740 ****
--- 1730,1740 ----
        reasonable_max = MAX2(reasonable_max, (julong)InitialHeapSize);
      }
  
      if (PrintGCDetails && Verbose) {
        // Cannot use gclog_or_tty yet.
!       tty->print_cr("  Maximum heap size " SIZE_FORMAT, (size_t) reasonable_max);
      }
      FLAG_SET_ERGO(uintx, MaxHeapSize, (uintx)reasonable_max);
    }
  
    // If the minimum or initial heap_size have not been set or requested to be set

*** 2103,2113 ****
--- 2103,2113 ----
  
    {
      // Using "else if" below to avoid printing two error messages if min > max.
      // This will also prevent us from reporting both min>100 and max>100 at the
      // same time, but that is less annoying than printing two identical errors IMHO.
!     FormatBuffer<80> err_msg("%s","");
      if (!verify_MinHeapFreeRatio(err_msg, MinHeapFreeRatio)) {
        jio_fprintf(defaultStream::error_stream(), "%s\n", err_msg.buffer());
        status = false;
      } else if (!verify_MaxHeapFreeRatio(err_msg, MaxHeapFreeRatio)) {
        jio_fprintf(defaultStream::error_stream(), "%s\n", err_msg.buffer());