mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-03 08:30:09 +00:00
68a256c892
Make the following changes by hand, and run 'admin/merge-gnulib'. * .gitignore: Add lib/malloc/*.gl.h. * admin/merge-gnulib: Copy lib/af_alg.h and lib/save-cwd.h directly from Gnulib, without worrying about Gnulib modules, as these files are special cases. (AVOIDED_MODULES): Remove malloc-posix. * lib/malloc.c, lib/realloc.c, m4/malloc.m4, m4/realloc.m4: * m4/year2038.m4: New files, copied from Gnulib. * lib/malloca.c, lib/malloca.h: * m4/close-stream.m4, m4/glibc21.m4, m4/malloca.m4: Remove. These are either no longer present in Gnulib, or are no longer needed by modules that Emacs uses. * oldXMenu/AddPane.c, oldXmenu/Addsel.c: Include XmenuInt.h first; needed for new Gnulib. * src/xmenu.c: Call emacs_abort, not abort.
60 lines
2.4 KiB
Plaintext
60 lines
2.4 KiB
Plaintext
# Check for stdalign.h that conforms to C11.
|
|
|
|
dnl Copyright 2011-2021 Free Software Foundation, Inc.
|
|
dnl This file is free software; the Free Software Foundation
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
# Prepare for substituting <stdalign.h> if it is not supported.
|
|
|
|
AC_DEFUN([gl_STDALIGN_H],
|
|
[
|
|
AC_CACHE_CHECK([for working stdalign.h],
|
|
[gl_cv_header_working_stdalign_h],
|
|
[AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <stdint.h>
|
|
#include <stdalign.h>
|
|
#include <stddef.h>
|
|
|
|
/* Test that alignof yields a result consistent with offsetof.
|
|
This catches GCC bug 52023
|
|
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. */
|
|
#ifdef __cplusplus
|
|
template <class t> struct alignof_helper { char a; t b; };
|
|
# define ao(type) offsetof (alignof_helper<type>, b)
|
|
#else
|
|
# define ao(type) offsetof (struct { char a; type b; }, b)
|
|
#endif
|
|
char test_double[ao (double) % _Alignof (double) == 0 ? 1 : -1];
|
|
char test_long[ao (long int) % _Alignof (long int) == 0 ? 1 : -1];
|
|
char test_alignof[alignof (double) == _Alignof (double) ? 1 : -1];
|
|
|
|
/* Test _Alignas only on platforms where gnulib can help. */
|
|
#if \
|
|
((defined __cplusplus && 201103 <= __cplusplus) \
|
|
|| (__TINYC__ && defined __attribute__) \
|
|
|| (defined __APPLE__ && defined __MACH__ \
|
|
? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
|
|
: __GNUC__) \
|
|
|| (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \
|
|
|| __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \
|
|
|| 1300 <= _MSC_VER)
|
|
struct alignas_test { char c; char alignas (8) alignas_8; };
|
|
char test_alignas[offsetof (struct alignas_test, alignas_8) == 8
|
|
? 1 : -1];
|
|
#endif
|
|
]])],
|
|
[gl_cv_header_working_stdalign_h=yes],
|
|
[gl_cv_header_working_stdalign_h=no])])
|
|
|
|
if test $gl_cv_header_working_stdalign_h = yes; then
|
|
STDALIGN_H=''
|
|
else
|
|
STDALIGN_H='stdalign.h'
|
|
fi
|
|
|
|
AC_SUBST([STDALIGN_H])
|
|
AM_CONDITIONAL([GL_GENERATE_STDALIGN_H], [test -n "$STDALIGN_H"])
|
|
])
|