diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index be72369adb8..388cc1ff61f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-24  Luis Machado  <lgustavo@codesourcery.com>
+
+	* exec.c (exception_print_same): Fix string comparison to use
+	statically-allocated ones.
+
 2016-10-21  Tom Tromey  <tom@tromey.com>
 
 	* dwarf2expr.h (class dwarf_expr_context)
diff --git a/gdb/exec.c b/gdb/exec.c
index d858e996a8d..67ecc636307 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -152,7 +152,7 @@ exception_print_same (struct gdb_exception e1, struct gdb_exception e2)
 
   return (e1.reason == e2.reason
 	  && e1.error == e2.error
-	  && strcmp (e1.message, e2.message) == 0);
+	  && strcmp (msg1, msg2) == 0);
 }
 
 /* See gdbcore.h.  */