Merge from origin/emacs-26

9e59de9449 Use GCALIGNED properly for GCC
b9d7c90260 In f90.el, set fill-paragraph-function to a useful value

# Conflicts:
#	src/lisp.h

diff --cc src/lisp.h
index 1ce32f334204c48d826c984771576c0ccef1a915,015346858b5dc333f93ee9b242dbb8240d098908..e3262ad40f365a09b45734e6b2fe0f2d822faec2
--- 1/src/lisp.h
--- 2/src/lisp.h
+++ b/src/lisp.h
@@@ -2940,8 -2945,18 +2944,8 @@@ CHECK_NUMBER_CDR (Lisp_Object x
  
  /* This version of DEFUN declares a function prototype with the right
     arguments, so we can catch errors with maxargs at compile-time.  */
 -#ifdef _MSC_VER
 -#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc)   \
 -   Lisp_Object fnname DEFUN_ARGS_ ## maxargs ;                                \
 -   static struct GCALIGNED Lisp_Subr sname =                          \
 -   { { (PVEC_SUBR << PSEUDOVECTOR_AREA_BITS)                          \
 -       | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)) },          \
 -      { (Lisp_Object (__cdecl *)(void))fnname },                        \
 -       minargs, maxargs, lname, intspec, 0};                          \
 -   Lisp_Object fnname
 -#else  /* not _MSC_VER */
  #define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc)   \
-    static struct Lisp_Subr GCALIGNED sname =                          \
+    static struct GCALIGNED Lisp_Subr sname =                          \
       { { PVEC_SUBR << PSEUDOVECTOR_AREA_BITS },                               \
         { .a ## maxargs = fnname },                                    \
         minargs, maxargs, lname, intspec, 0};                          \