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

1 files changed, 1 insertions, 1 deletions

diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 0ea3f7b6b6a..ff84df94a69 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -668,7 +668,7 @@ close_emacs_globals (ptrdiff_t num_symbols)
            "extern\n"
            "#endif\n"
            "struct {\n"
-           "  struct Lisp_Symbol GCALIGNED s;\n"
+           "  struct GCALIGNED Lisp_Symbol s;\n"
            "} lispsym[%td];\n"),
           num_symbols);
 }