diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5ac983f647..9c8ae4c7fc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-22  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* rs6000-tdep.c (variants): Add (enum bfd_architecture) cast.
+
 2015-10-22  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* mips-linux-tdep.c (mips64_linux_get_longjmp_target): Change type of
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index baf6b67d09..589b996072 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -3144,7 +3144,7 @@ static struct variant variants[] =
   {"rs2", "IBM POWER RS2", bfd_arch_rs6000,
    bfd_mach_rs6k_rs2, &tdesc_rs6000},
 
-  {0, 0, 0, 0, 0}
+  {0, 0, (enum bfd_architecture) 0, 0, 0}
 };
 
 /* Return the variant corresponding to architecture ARCH and machine number