diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0a730c88f9..c38ff5b14a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-30  Pedro Alves  <palves@redhat.com>
+
+	* common/common-exceptions.h (exception_rethrow): Use
+	ATTRIBUTE_NORETURN.
+
 2018-05-29  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* breakpoint.c (print_solib_event, check_status_catch_solib):
diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h
index 15c85e28ab..e873f9d061 100644
--- a/gdb/common/common-exceptions.h
+++ b/gdb/common/common-exceptions.h
@@ -146,7 +146,7 @@ extern int exceptions_state_mc_catch (struct gdb_exception *, int);
 #if GDB_XCPT != GDB_XCPT_SJMP
 extern void *exception_try_scope_entry (void);
 extern void exception_try_scope_exit (void *saved_state);
-extern void exception_rethrow (void);
+extern void exception_rethrow (void) ATTRIBUTE_NORETURN;
 #endif
 
 /* Macro to wrap up standard try/catch behavior.