diff options
| author | Paul Eggert | 2017-03-19 13:07:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-03-19 13:09:31 -0700 |
| commit | fa90c5e86e2b11e89c6a1d709e25003a60656f0d (patch) | |
| tree | 278612addfeefebe9318afd6d052f54accacb108 /m4 | |
| parent | 20ccaa63dbf20c0a64e0df360800ee61423252b7 (diff) | |
| download | emacs-fa90c5e86e2b11e89c6a1d709e25003a60656f0d.tar.gz emacs-fa90c5e86e2b11e89c6a1d709e25003a60656f0d.zip | |
Merge from gnulib
This gets Emacs working again with HP-UX Itanium cc.
It incorporates:
2017-03-19 stdalign: tweak version# and test for HP-UX IA64
2017-03-18 stdalign: restore previous behavior for HP-UX IA64
2017-03-17 stat-time, timespec: Support header files in C++ mode
2017-03-17 stdalign: Make it work with HP-UX cc
2017-03-17 flexmember: try to detect HP-UX 11.31 cc bug
2017-03-16 stdint: Fix test compilation failure with HP-UX 11 cc.
2017-03-14 gnulib-tool: don't produce tests with only snippets
2017-03-14 limits-h: Make it work with HP-UX cc.
* etc/PROBLEMS: Remove now-obsolete entry for HP-UX 11.31.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/limits.in.h, lib/stat-time.h, lib/stdalign.in.h:
* lib/stdint.in.h, lib/timespec.h, m4/flexmember.m4, m4/stdalign.m4:
Copy from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/flexmember.m4 | 7 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 | 7 | ||||
| -rw-r--r-- | m4/stdalign.m4 | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/m4/flexmember.m4 b/m4/flexmember.m4 index 35580ac27c4..9d3b50d1575 100644 --- a/m4/flexmember.m4 +++ b/m4/flexmember.m4 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # serial 4 | 1 | # serial 5 |
| 2 | # Check for flexible array member support. | 2 | # Check for flexible array member support. |
| 3 | 3 | ||
| 4 | # Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. | 4 | # Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. |
| @@ -17,12 +17,15 @@ AC_DEFUN([AC_C_FLEXIBLE_ARRAY_MEMBER], | |||
| 17 | [[#include <stdlib.h> | 17 | [[#include <stdlib.h> |
| 18 | #include <stdio.h> | 18 | #include <stdio.h> |
| 19 | #include <stddef.h> | 19 | #include <stddef.h> |
| 20 | struct s { int n; double d[]; };]], | 20 | struct m { struct m *next, **list; char name[]; }; |
| 21 | struct s { struct s *p; struct m *m; int n; double d[]; };]], | ||
| 21 | [[int m = getchar (); | 22 | [[int m = getchar (); |
| 22 | size_t nbytes = offsetof (struct s, d) + m * sizeof (double); | 23 | size_t nbytes = offsetof (struct s, d) + m * sizeof (double); |
| 23 | nbytes += sizeof (struct s) - 1; | 24 | nbytes += sizeof (struct s) - 1; |
| 24 | nbytes -= nbytes % sizeof (struct s); | 25 | nbytes -= nbytes % sizeof (struct s); |
| 25 | struct s *p = malloc (nbytes); | 26 | struct s *p = malloc (nbytes); |
| 27 | p->p = p; | ||
| 28 | p->m = NULL; | ||
| 26 | p->d[0] = 0.0; | 29 | p->d[0] = 0.0; |
| 27 | return p->d != (double *) NULL;]])], | 30 | return p->d != (double *) NULL;]])], |
| 28 | [ac_cv_c_flexmember=yes], | 31 | [ac_cv_c_flexmember=yes], |
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index bf7afa51bf6..e613490f1a4 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 | |||
| @@ -787,8 +787,6 @@ changequote([, ])dnl | |||
| 787 | AC_SUBST([LIBGNU_LIBDEPS]) | 787 | AC_SUBST([LIBGNU_LIBDEPS]) |
| 788 | LIBGNU_LTLIBDEPS="$gl_ltlibdeps" | 788 | LIBGNU_LTLIBDEPS="$gl_ltlibdeps" |
| 789 | AC_SUBST([LIBGNU_LTLIBDEPS]) | 789 | AC_SUBST([LIBGNU_LTLIBDEPS]) |
| 790 | LIBTESTS_LIBDEPS="$gltests_libdeps" | ||
| 791 | AC_SUBST([LIBTESTS_LIBDEPS]) | ||
| 792 | ]) | 790 | ]) |
| 793 | 791 | ||
| 794 | # Like AC_LIBOBJ, except that the module name goes | 792 | # Like AC_LIBOBJ, except that the module name goes |
| @@ -1106,9 +1104,4 @@ AC_DEFUN([gl_FILE_LIST], [ | |||
| 1106 | m4/warnings.m4 | 1104 | m4/warnings.m4 |
| 1107 | m4/wchar_t.m4 | 1105 | m4/wchar_t.m4 |
| 1108 | m4/wint_t.m4 | 1106 | m4/wint_t.m4 |
| 1109 | tests=lib/_Noreturn.h | ||
| 1110 | tests=lib/arg-nonnull.h | ||
| 1111 | tests=lib/c++defs.h | ||
| 1112 | tests=lib/dummy.c | ||
| 1113 | tests=lib/warn-on-use.h | ||
| 1114 | ]) | 1107 | ]) |
diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 3a1265824e5..0652a1e4af5 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 | |||
| @@ -35,8 +35,8 @@ AC_DEFUN([gl_STDALIGN_H], | |||
| 35 | || (defined __APPLE__ && defined __MACH__ \ | 35 | || (defined __APPLE__ && defined __MACH__ \ |
| 36 | ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ | 36 | ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ |
| 37 | : __GNUC__) \ | 37 | : __GNUC__) \ |
| 38 | || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ | 38 | || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ |
| 39 | || __ICC || 0x5110 <= __SUNPRO_C \ | 39 | || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \ |
| 40 | || 1300 <= _MSC_VER) | 40 | || 1300 <= _MSC_VER) |
| 41 | struct alignas_test { char c; char alignas (8) alignas_8; }; | 41 | struct alignas_test { char c; char alignas (8) alignas_8; }; |
| 42 | char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 | 42 | char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 |