diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 295ad96c1b..4f506e5676 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-23  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* observer.h (observer_${event}_notification_stub): Add cast.
+
 2015-10-23  Yao Qi  <yao.qi@linaro.org>
 
 	* aarch64-tdep.c (aarch64_displaced_step_copy_insn): Set
diff --git a/gdb/observer.sh b/gdb/observer.sh
index dde8056605..6fd0ada595 100755
--- a/gdb/observer.sh
+++ b/gdb/observer.sh
@@ -143,7 +143,7 @@ EOF
 
 	if test ! -z "${notify_args}"; then
 	    cat<<EOF >>${otmp}
-  const struct ${event}_args *args = args_data;
+  const struct ${event}_args *args = (const struct ${event}_args *) args_data;
 EOF
 	fi
 	cat <<EOF >>${otmp}