Merge from trunk.

1 files changed, 3 insertions, 2 deletions

diff --git a/autogen/configure b/autogen/configure
index 126248beced..23685c523ac 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -23965,8 +23965,9 @@ else
             #if \
                 (__GNUC__ || __IBMC__ || __IBMCPP__ \
                  || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER)
-              int alignas (8) alignas_int = 1;
-              char test_alignas[_Alignof (alignas_int) == 8 ? 1 : -1];
+              struct alignas_test { char c; char alignas (8) alignas_8; };
+              char test_alignas[offsetof (struct alignas_test, alignas_8) == 8
+                                ? 1 : -1];
             #endif
 
 int