2 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index af0fc3a8e38..d7ae52ac01e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-10  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * bytecode.c (targets): Suppress -Woverride-init warnings.
+
         Simplify by avoiding confusing use of strncpy etc.
         * doc.c (Fsnarf_documentation):
         * fileio.c (Ffile_name_directory, Fsubstitute_in_file_name):
diff --git a/src/bytecode.c b/src/bytecode.c
index 4d3a35ee24d..acdf809971f 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -660,6 +660,11 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
          the table clearer.  */
 #define LABEL(OP) [OP] = &&insn_ ## OP
 
+#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Woverride-init"
+#endif
+
       /* This is the dispatch table for the threaded interpreter.  */
       static const void *const targets[256] =
         {
@@ -670,6 +675,11 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
           BYTE_CODES
 #undef DEFINE
         };
+
+#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
 #endif