445a625
diff -up diffutils-3.3/gnulib-tests/test-xvasprintf.c.format-security diffutils-3.3/gnulib-tests/test-xvasprintf.c
445a625
--- diffutils-3.3/gnulib-tests/test-xvasprintf.c.format-security	2013-03-22 04:20:50.000000000 +0000
445a625
+++ diffutils-3.3/gnulib-tests/test-xvasprintf.c	2013-12-04 13:43:09.927443499 +0000
445a625
@@ -16,6 +16,13 @@
445a625
 
445a625
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
445a625
 
445a625
+/* Tell GCC not to warn about the specific edge cases tested here.  */
445a625
+#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
445a625
+# pragma GCC diagnostic ignored "-Wformat-zero-length"
445a625
+# pragma GCC diagnostic ignored "-Wformat-nonliteral"
445a625
+# pragma GCC diagnostic ignored "-Wformat-security"
445a625
+#endif
445a625
+
445a625
 #include <config.h>
445a625
 
445a625
 #include "xvasprintf.h"