diff --git a/ChangeLog b/ChangeLog
index 7e1a6fd5c7..b9d78c8cd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 17 11:58:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_CHECK_BUILTIN_SETJMP): declare t as NORETURN
+	  to suppress warnings by -Wsuggest-attribute=noreturn.
+	  [ruby-core:75510] [Bug #12383]
+
 Tue May 17 10:40:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_CHECK_SETJMP): needs the header and proper
diff --git a/configure.in b/configure.in
index 30187626cf..872532a240 100644
--- a/configure.in
+++ b/configure.in
@@ -2603,6 +2603,9 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
 	[AC_TRY_LINK([@%:@include <setjmp.h>
 	    @%:@include <stdio.h>
 	    jmp_buf jb;
+	    @%:@ifdef NORETURN
+	    NORETURN(void t(void));
+	    @%:@endif
 	    void t(void) {__builtin_longjmp($cast jb, 1);}
 	    int jump(void) {(void)(__builtin_setjmp($cast jb) ? 1 : 0); return 0;}],
 	    [