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

*** 43,52 ****
--- 43,54 ----
  #endif
  #ifdef SHARK
  #include "shark/shark_globals.hpp"
  #endif
  
+ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
+ 
  RUNTIME_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, \
                MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, \
                MATERIALIZE_DIAGNOSTIC_FLAG, MATERIALIZE_EXPERIMENTAL_FLAG, \
                MATERIALIZE_NOTPRODUCT_FLAG, \
                MATERIALIZE_MANAGEABLE_FLAG, MATERIALIZE_PRODUCT_RW_FLAG, \

*** 281,290 ****
--- 283,293 ----
  
  
  // Length of format string (e.g. "%.1234s") for printing ccstr below
  #define FORMAT_BUFFER_LEN 16
  
+ PRAGMA_FORMAT_NONLITERAL_IGNORED_EXTERNAL
  void Flag::print_on(outputStream* st, bool withComments) {
    // Don't print notproduct and develop flags in a product build.
    if (is_constant_in_binary()) {
      return;
    }

*** 313,323 ****
--- 316,329 ----
        while ((eol = strchr(cp, '\n')) != NULL) {
          char format_buffer[FORMAT_BUFFER_LEN];
          size_t llen = pointer_delta(eol, cp, sizeof(char));
          jio_snprintf(format_buffer, FORMAT_BUFFER_LEN,
              "%%." SIZE_FORMAT "s", llen);
+ PRAGMA_DIAG_PUSH
+ PRAGMA_FORMAT_NONLITERAL_IGNORED_INTERNAL
          st->print(format_buffer, cp);
+ PRAGMA_DIAG_POP
          st->cr();
          cp = eol+1;
          st->print("%5s %-35s += ", "", _name);
        }
        st->print("%-16s", cp);

*** 370,380 ****
--- 376,386 ----
          if (is_first) {
            is_first = false;
          } else {
            st->print(" ");
          }
!         st->print_raw(d.name);
        }
      }
  
      st->print("}");
    }