*** old/src/share/vm/runtime/safepoint.cpp	Tue Apr 29 16:56:25 2014
--- new/src/share/vm/runtime/safepoint.cpp	Tue Apr 29 16:56:24 2014

*** 79,88 ****
--- 79,90 ----
  #endif // INCLUDE_ALL_GCS
  #ifdef COMPILER1
  #include "c1/c1_globals.hpp"
  #endif
  
+ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
+ 
  // --------------------------------------------------------------------------------------------------
  // Implementation of Safepoint begin/end
  
  SafepointSynchronize::SynchronizeState volatile SafepointSynchronize::_state = SafepointSynchronize::_not_synchronized;
  volatile int  SafepointSynchronize::_waiting_to_block = 0;

*** 784,794 ****
--- 786,796 ----
    tty->print_cr("--Float-|"PTR_FORMAT,new_sp);
    tty->print_cr("---FP---|");
    old_sp += incr*32;  new_sp += incr*32;  was_oops += incr*32;
    for( int i2=0; i2<16; i2++ ) {
      tty->print("call %c%d |"PTR_FORMAT" ","LI"[i2>>3],i2&7,new_sp); print_ptrs(*old_sp++,*new_sp++,*was_oops++); }
!   tty->print_cr("");
  }
  #endif  // SPARC
  #endif  // PRODUCT
  
  

*** 826,836 ****
--- 828,838 ----
  void SafepointSynchronize::print_safepoint_timeout(SafepointTimeoutReason reason) {
    if (!timeout_error_printed) {
      timeout_error_printed = true;
      // Print out the thread info which didn't reach the safepoint for debugging
      // purposes (useful when there are lots of threads in the debugger).
!     tty->print_cr("");
      tty->print_cr("# SafepointSynchronize::begin: Timeout detected:");
      if (reason ==  _spinning_timeout) {
        tty->print_cr("# SafepointSynchronize::begin: Timed out while spinning to reach a safepoint.");
      } else if (reason == _blocking_timeout) {
        tty->print_cr("# SafepointSynchronize::begin: Timed out while waiting for threads to stop.");

*** 846,856 ****
--- 848,858 ----
        if (cur_thread->thread_state() != _thread_blocked &&
            ((reason == _spinning_timeout && cur_state->is_running()) ||
             (reason == _blocking_timeout && !cur_state->has_called_back()))) {
          tty->print("# ");
          cur_thread->print();
!         tty->print_cr("");
        }
      }
      tty->print_cr("# SafepointSynchronize::begin: (End of list)");
    }
  

*** 1319,1329 ****
--- 1321,1331 ----
  
    if ( PrintSafepointStatisticsTimeout < 0 ||
         spstat->_time_to_sync > PrintSafepointStatisticsTimeout * MICROUNITS) {
      print_statistics();
    }
!   tty->print_cr("");
  
    // Print out polling page sampling status.
    if (!need_to_track_page_armed_status) {
      if (UseCompilerSafepoints) {
        tty->print_cr("Polling page always armed");