diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7689e0e1ab4..edb3cd452fc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-30  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* common/diagnostics.h
+	(DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES): Only
+	define if the compiler knows about -Wenum-compare-switch.
+
 2017-12-30  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* dwarf2read.c (dwarf_decode_macro_bytes): Ignore
diff --git a/gdb/common/diagnostics.h b/gdb/common/diagnostics.h
index 30c0fd6172a..c9ef6b645f9 100644
--- a/gdb/common/diagnostics.h
+++ b/gdb/common/diagnostics.h
@@ -38,9 +38,12 @@
   DIAGNOSTIC_IGNORE ("-Wdeprecated-register")
 # define DIAGNOSTIC_IGNORE_UNUSED_FUNCTION \
   DIAGNOSTIC_IGNORE ("-Wunused-function")
-# define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES \
-  DIAGNOSTIC_IGNORE ("-Wenum-compare-switch")
-
+# if __has_warning ("-Wenum-compare-switch")
+#  define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES \
+   DIAGNOSTIC_IGNORE ("-Wenum-compare-switch")
+# else
+#  define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES
+# endif
 #elif defined (__GNUC__) /* GCC */
 
 # define DIAGNOSTIC_IGNORE_SELF_MOVE