Merge from origin/emacs-26

79108894db Port to IBM xlc 12.01
d14956099d Simplify by removing HAVE_STRUCT_ATTRIBUTE_ALIGNED
b1573a97e1 Use alignas to fix GCALIGN-related bugs
5d68dc9a2f Change vectorlike from struct to union
6aa0a26b46 Don't enable cursor-sensor-mode in mhtml-mode
2b8ef8dddf * lisp/files.el (abbreviate-file-name): Doc fix.  (Bug#29267)
fe85ce1e16 Unbreak interactive run of a flymake test (bug#29267)
48ad00390d Fix Bug#29225
42daf83f08 CC Mode: Fix defun-open being recognized as brace-list-ope...
7775c47298 Merge from Gnulib
e470d16448 Pacify GCC when configured --with-x-toolkit=no
49450d0951 * lisp/find-dired.el (find-grep-dired): Doc fix.  (Bug#29262)
e286b3381f Fix more flymake-diag-region eob corner cases and add test...

# Conflicts:
#	src/lisp.h

diff --cc admin/CPP-DEFINES
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lib/gnulib.mk.in
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/progmodes/flymake.el
Simple merge

diff --cc m4/gnulib-comp.m4
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/cmds.c
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
index e3262ad40f365a09b45734e6b2fe0f2d822faec2,e9aec4c597945f34b0d094c1f804dad5b0cf7d79..a25a673a9aaec90595644337d14618805cc98731
--- 1/src/lisp.h
--- 2/src/lisp.h
+++ b/src/lisp.h
@@@ -2944,8 -2960,18 +2959,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 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 GCALIGNED Lisp_Subr sname =                          \
+    static struct Lisp_Subr sname =                            \
       { { PVEC_SUBR << PSEUDOVECTOR_AREA_BITS },                               \
         { .a ## maxargs = fnname },                                    \
         minargs, maxargs, lname, intspec, 0};                          \

diff --cc src/lread.c
Simple merge