=== modified file 'lib-src/make-docfile.c'
--- lib-src/make-docfile.c	2014-01-01 07:43:34 +0000
+++ lib-src/make-docfile.c	2014-06-17 07:23:41 +0000
@@ -672,7 +672,17 @@
 	    fprintf (outfile, "UNEVALLED");
 	  else
 	    fprintf (outfile, "%d", globals[i].value);
-	  fprintf (outfile, ");\n");
+	  fprintf (outfile, ")");
+	  /* Likewise for gcc-style attributes.  */
+	  if (strcmp (globals[i].name, "Fbyteorder") == 0
+#if defined USE_GTK || defined HAVE_NS
+	      || strcmp (globals[i].name, "Ftool_bar_height") == 0
+#endif
+	      || strcmp (globals[i].name, "Fmax_char") == 0
+	      || strcmp (globals[i].name, "Fidentity") == 0)
+	    fprintf (outfile, " ATTRIBUTE_CONST;\n");
+	  else
+	    fprintf (outfile, ";\n");
 	}
 
       while (i + 1 < num_globals

=== modified file 'src/keyboard.c'
--- src/keyboard.c	2014-06-08 18:27:22 +0000
+++ src/keyboard.c	2014-06-17 07:26:44 +0000
@@ -1216,7 +1216,7 @@
   xsignal1 (Quser_error, build_string (msg));
 }
 
-_Noreturn
+/* _Noreturn will be added to prototype by make-docfile.  */
 DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0, "",
        doc: /* Exit from the innermost recursive edit or minibuffer.  */)
   (void)
@@ -1227,7 +1227,7 @@
   user_error ("No recursive edit is in progress");
 }
 
-_Noreturn
+/* _Noreturn will be added to prototype by make-docfile.  */
 DEFUN ("abort-recursive-edit", Fabort_recursive_edit, Sabort_recursive_edit, 0, 0, "",
        doc: /* Abort the command that requested this recursive edit or minibuffer input.  */)
   (void)

=== modified file 'src/lisp.h'
--- src/lisp.h	2014-06-17 03:14:00 +0000
+++ src/lisp.h	2014-06-17 07:24:32 +0000
@@ -2687,7 +2687,6 @@
    Lisp_Object fnname
 #else  /* not _MSC_VER */
 #define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc)	\
-   Lisp_Object fnname DEFUN_ARGS_ ## maxargs ;				\
    static struct Lisp_Subr alignas (GCALIGNMENT) sname =		\
      { { PVEC_SUBR << PSEUDOVECTOR_AREA_BITS },			\
        { .a ## maxargs = fnname },					\
@@ -3379,8 +3378,6 @@
 
 extern Lisp_Object Qfont_spec, Qfont_entity, Qfont_object;
 
-EXFUN (Fbyteorder, 0) ATTRIBUTE_CONST;
-
 /* Defined in data.c.  */
 extern Lisp_Object indirect_function (Lisp_Object);
 extern Lisp_Object find_symbol_value (Lisp_Object);
@@ -3446,7 +3443,6 @@
 extern void syms_of_coding (void);
 
 /* Defined in character.c.  */
-EXFUN (Fmax_char, 0) ATTRIBUTE_CONST;
 extern ptrdiff_t chars_in_text (const unsigned char *, ptrdiff_t);
 extern ptrdiff_t multibyte_chars_in_text (const unsigned char *, ptrdiff_t);
 extern int multibyte_char_to_unibyte (int) ATTRIBUTE_CONST;
@@ -3470,7 +3466,6 @@
 /* Defined in fns.c.  */
 extern Lisp_Object QCrehash_size, QCrehash_threshold;
 enum { NEXT_ALMOST_PRIME_LIMIT = 11 };
-EXFUN (Fidentity, 1) ATTRIBUTE_CONST;
 extern EMACS_INT next_almost_prime (EMACS_INT) ATTRIBUTE_CONST;
 extern Lisp_Object larger_vector (Lisp_Object, ptrdiff_t, ptrdiff_t);
 extern void sweep_weak_hash_tables (void);

=== modified file 'src/xdisp.c'
--- src/xdisp.c	2014-06-15 00:06:30 +0000
+++ src/xdisp.c	2014-06-17 07:19:12 +0000
@@ -12279,11 +12279,6 @@
 
 #endif /* !USE_GTK && !HAVE_NS */
 
-#if defined USE_GTK || defined HAVE_NS
-EXFUN (Ftool_bar_height, 2) ATTRIBUTE_CONST;
-EXFUN (Ftool_bar_lines_needed, 1) ATTRIBUTE_CONST;
-#endif
-
 DEFUN ("tool-bar-height", Ftool_bar_height, Stool_bar_height,
        0, 2, 0,
        doc: /* Return the number of lines occupied by the tool bar of FRAME.