8353458: Don't pass -Wno-format-nonliteral to CFLAGS

Reviewed-by: erikj

Author: magicus

make/modules/jdk.jpackage/Lib.gmk

@@ -61,7 +61,6 @@ $(eval $(call SetupJdkExecutable, BUILD_JPACKAGEAPPLAUNCHER, \
     DISABLED_WARNINGS_clang_Log.cpp := unused-const-variable, \
     CFLAGS_FILTER_OUT := -MD, \
     CXXFLAGS_FILTER_OUT := -MD, \
-    CFLAGS_macosx := -Wno-format-nonliteral, \
     CFLAGS_windows := -MT $(JPACKAGE_CFLAGS_windows), \
     CXXFLAGS_windows := -MT $(JPACKAGE_CXXFLAGS_windows), \
     LD_SET_ORIGIN := false, \

src/jdk.jpackage/share/native/common/tstrings.cpp

@@ -52,13 +52,13 @@ tstring unsafe_format(tstring::const_pointer format, ...) {
 #ifdef _MSC_VER
         ret = _vsntprintf_s(&*fmtout.begin(), fmtout.size(), _TRUNCATE, format, args);
 #else
-#if defined(__GNUC__) && __GNUC__ >= 5
+#if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 #endif
         // With g++ this compiles only with '-std=gnu++0x' option
         ret = vsnprintf(&*fmtout.begin(), fmtout.size(), format, args);
-#if defined(__GNUC__) && __GNUC__ >= 5
+#if defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif
 #endif