diff options
| author | Paul Eggert | 2018-06-29 17:31:04 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-06-29 17:32:35 -0700 |
| commit | 35e9dcab5141bf9cae67abe740933fe627ecc371 (patch) | |
| tree | 2813d1f6340df34a97695874e5546e4b2454d555 /m4 | |
| parent | 2e2811865f0adb6658a87d3581a2dc3a9022f451 (diff) | |
| download | emacs-35e9dcab5141bf9cae67abe740933fe627ecc371.tar.gz emacs-35e9dcab5141bf9cae67abe740933fe627ecc371.zip | |
Update from Gnulib
This incorporates:
2018-06-29 regex: glibc does not use intprops.h
2018-06-28 regex: port to recently proposed glibc regex merge
2018-06-25 Continue to use spaces for indentation, not tabs
2018-06-25 manywarnings: Don't enable -Wjump-misses-init by default
2018-06-25 acl-internal.h: remove _GL_ATTRIBUTE_CONST on void function
2018-06-24 manywarnings: accommodate GCC 9: remove -Wchkp and -Wabi
2018-06-24 maint: clarify comments about sticky EOF
2018-06-24 af_alg: avoid hangs when reading from streams
2018-06-17 crypto: use byteswap
2018-06-17 getloadavg: Return 0 on MS-Windows without Cygwi
2018-06-17 getloadavg: Allow building on MS-Windows without Cygwin
* build-aux/config.guess, build-aux/config.sub, doc/misc/texinfo.tex:
* lib/acl-internal.c, lib/acl-internal.h, lib/get-permissions.c:
* lib/getloadavg.c, lib/gettimeofday.c, lib/md5.c, lib/pselect.c:
* lib/set-permissions.c, lib/sha1.c, lib/sha256.c, lib/sha512.c:
* lib/time.in.h, m4/getloadavg.m4, m4/gnulib-common.m4:
* m4/manywarnings.m4, m4/pthread_sigmask.m4, m4/vararrays.m4:
Copy from Gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/getloadavg.m4 | 2 | ||||
| -rw-r--r-- | m4/gnulib-common.m4 | 20 | ||||
| -rw-r--r-- | m4/manywarnings.m4 | 7 | ||||
| -rw-r--r-- | m4/pthread_sigmask.m4 | 70 | ||||
| -rw-r--r-- | m4/vararrays.m4 | 66 |
5 files changed, 81 insertions, 84 deletions
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index d3a8910ecfc..c9f5a6da5df 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 | |||
| @@ -108,7 +108,7 @@ AC_DEFUN([gl_PREREQ_GETLOADAVG], | |||
| 108 | [ | 108 | [ |
| 109 | # Figure out what our getloadavg.c needs. | 109 | # Figure out what our getloadavg.c needs. |
| 110 | 110 | ||
| 111 | AC_CHECK_HEADERS_ONCE([sys/param.h]) | 111 | AC_CHECK_HEADERS_ONCE([sys/param.h unistd.h]) |
| 112 | 112 | ||
| 113 | # On HPUX9, an unprivileged user can get load averages this way. | 113 | # On HPUX9, an unprivileged user can get load averages this way. |
| 114 | if test $gl_func_getloadavg_done = no; then | 114 | if test $gl_func_getloadavg_done = no; then |
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 736e421016c..5f07855acf1 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 | |||
| @@ -354,16 +354,16 @@ AC_DEFUN([AC_C_RESTRICT], | |||
| 354 | for ac_kw in __restrict __restrict__ _Restrict restrict; do | 354 | for ac_kw in __restrict __restrict__ _Restrict restrict; do |
| 355 | AC_COMPILE_IFELSE( | 355 | AC_COMPILE_IFELSE( |
| 356 | [AC_LANG_PROGRAM( | 356 | [AC_LANG_PROGRAM( |
| 357 | [[typedef int *int_ptr; | 357 | [[typedef int *int_ptr; |
| 358 | int foo (int_ptr $ac_kw ip) { return ip[0]; } | 358 | int foo (int_ptr $ac_kw ip) { return ip[0]; } |
| 359 | int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ | 359 | int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ |
| 360 | int bar (int ip[$ac_kw]) { return ip[0]; } | 360 | int bar (int ip[$ac_kw]) { return ip[0]; } |
| 361 | ]], | 361 | ]], |
| 362 | [[int s[1]; | 362 | [[int s[1]; |
| 363 | int *$ac_kw t = s; | 363 | int *$ac_kw t = s; |
| 364 | t[0] = 0; | 364 | t[0] = 0; |
| 365 | return foo (t) + bar (t); | 365 | return foo (t) + bar (t); |
| 366 | ]])], | 366 | ]])], |
| 367 | [ac_cv_c_restrict=$ac_kw]) | 367 | [ac_cv_c_restrict=$ac_kw]) |
| 368 | test "$ac_cv_c_restrict" != no && break | 368 | test "$ac_cv_c_restrict" != no && break |
| 369 | done | 369 | done |
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4 index 60c0e4051cb..925c40e139a 100644 --- a/m4/manywarnings.m4 +++ b/m4/manywarnings.m4 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # manywarnings.m4 serial 14 | 1 | # manywarnings.m4 serial 15 |
| 2 | dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. |
| 3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
| 4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
| @@ -108,12 +108,11 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)], | |||
| 108 | # comm -3 \ | 108 | # comm -3 \ |
| 109 | # <((sed -n 's/^ *\(-[^ 0-9][^ ]*\) .*/\1/p' manywarnings.m4; \ | 109 | # <((sed -n 's/^ *\(-[^ 0-9][^ ]*\) .*/\1/p' manywarnings.m4; \ |
| 110 | # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec) | sort) \ | 110 | # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec) | sort) \ |
| 111 | # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort) | 111 | # <(LC_ALL=C gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort) |
| 112 | 112 | ||
| 113 | gl_manywarn_set= | 113 | gl_manywarn_set= |
| 114 | for gl_manywarn_item in -fno-common \ | 114 | for gl_manywarn_item in -fno-common \ |
| 115 | -W \ | 115 | -W \ |
| 116 | -Wabi \ | ||
| 117 | -Waddress \ | 116 | -Waddress \ |
| 118 | -Waggressive-loop-optimizations \ | 117 | -Waggressive-loop-optimizations \ |
| 119 | -Wall \ | 118 | -Wall \ |
| @@ -128,7 +127,6 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)], | |||
| 128 | -Wcast-align=strict \ | 127 | -Wcast-align=strict \ |
| 129 | -Wcast-function-type \ | 128 | -Wcast-function-type \ |
| 130 | -Wchar-subscripts \ | 129 | -Wchar-subscripts \ |
| 131 | -Wchkp \ | ||
| 132 | -Wclobbered \ | 130 | -Wclobbered \ |
| 133 | -Wcomment \ | 131 | -Wcomment \ |
| 134 | -Wcomments \ | 132 | -Wcomments \ |
| @@ -176,7 +174,6 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)], | |||
| 176 | -Wint-to-pointer-cast \ | 174 | -Wint-to-pointer-cast \ |
| 177 | -Winvalid-memory-model \ | 175 | -Winvalid-memory-model \ |
| 178 | -Winvalid-pch \ | 176 | -Winvalid-pch \ |
| 179 | -Wjump-misses-init \ | ||
| 180 | -Wlogical-not-parentheses \ | 177 | -Wlogical-not-parentheses \ |
| 181 | -Wlogical-op \ | 178 | -Wlogical-op \ |
| 182 | -Wmain \ | 179 | -Wmain \ |
diff --git a/m4/pthread_sigmask.m4 b/m4/pthread_sigmask.m4 index a33b433c0ef..585b80a40ff 100644 --- a/m4/pthread_sigmask.m4 +++ b/m4/pthread_sigmask.m4 | |||
| @@ -124,41 +124,41 @@ AC_DEFUN([gl_FUNC_PTHREAD_SIGMASK], | |||
| 124 | case " $LIBS " in | 124 | case " $LIBS " in |
| 125 | *' -pthread '*) ;; | 125 | *' -pthread '*) ;; |
| 126 | *' -lpthread '*) ;; | 126 | *' -lpthread '*) ;; |
| 127 | *) | 127 | *) |
| 128 | AC_CACHE_CHECK([whether pthread_sigmask works without -lpthread], | 128 | AC_CACHE_CHECK([whether pthread_sigmask works without -lpthread], |
| 129 | [gl_cv_func_pthread_sigmask_in_libc_works], | 129 | [gl_cv_func_pthread_sigmask_in_libc_works], |
| 130 | [ | 130 | [ |
| 131 | AC_RUN_IFELSE( | 131 | AC_RUN_IFELSE( |
| 132 | [AC_LANG_SOURCE([[ | 132 | [AC_LANG_SOURCE([[ |
| 133 | #include <pthread.h> | 133 | #include <pthread.h> |
| 134 | #include <signal.h> | 134 | #include <signal.h> |
| 135 | #include <stddef.h> | 135 | #include <stddef.h> |
| 136 | int main () | 136 | int main () |
| 137 | { | 137 | { |
| 138 | sigset_t set; | 138 | sigset_t set; |
| 139 | sigemptyset (&set); | 139 | sigemptyset (&set); |
| 140 | return pthread_sigmask (1729, &set, NULL) != 0; | 140 | return pthread_sigmask (1729, &set, NULL) != 0; |
| 141 | }]])], | 141 | }]])], |
| 142 | [gl_cv_func_pthread_sigmask_in_libc_works=no], | 142 | [gl_cv_func_pthread_sigmask_in_libc_works=no], |
| 143 | [gl_cv_func_pthread_sigmask_in_libc_works=yes], | 143 | [gl_cv_func_pthread_sigmask_in_libc_works=yes], |
| 144 | [ | 144 | [ |
| 145 | changequote(,)dnl | 145 | changequote(,)dnl |
| 146 | case "$host_os" in | 146 | case "$host_os" in |
| 147 | freebsd* | hpux* | solaris | solaris2.[2-9]*) | 147 | freebsd* | hpux* | solaris | solaris2.[2-9]*) |
| 148 | gl_cv_func_pthread_sigmask_in_libc_works="guessing no";; | 148 | gl_cv_func_pthread_sigmask_in_libc_works="guessing no";; |
| 149 | *) | 149 | *) |
| 150 | gl_cv_func_pthread_sigmask_in_libc_works="guessing yes";; | 150 | gl_cv_func_pthread_sigmask_in_libc_works="guessing yes";; |
| 151 | esac | 151 | esac |
| 152 | changequote([,])dnl | 152 | changequote([,])dnl |
| 153 | ]) | 153 | ]) |
| 154 | ]) | 154 | ]) |
| 155 | case "$gl_cv_func_pthread_sigmask_in_libc_works" in | 155 | case "$gl_cv_func_pthread_sigmask_in_libc_works" in |
| 156 | *no) | 156 | *no) |
| 157 | REPLACE_PTHREAD_SIGMASK=1 | 157 | REPLACE_PTHREAD_SIGMASK=1 |
| 158 | AC_DEFINE([PTHREAD_SIGMASK_INEFFECTIVE], [1], | 158 | AC_DEFINE([PTHREAD_SIGMASK_INEFFECTIVE], [1], |
| 159 | [Define to 1 if pthread_sigmask may return 0 and have no effect.]) | 159 | [Define to 1 if pthread_sigmask may return 0 and have no effect.]) |
| 160 | ;; | 160 | ;; |
| 161 | esac;; | 161 | esac;; |
| 162 | esac | 162 | esac |
| 163 | fi | 163 | fi |
| 164 | 164 | ||
diff --git a/m4/vararrays.m4 b/m4/vararrays.m4 index 329eb490c3c..17563b519b0 100644 --- a/m4/vararrays.m4 +++ b/m4/vararrays.m4 | |||
| @@ -18,44 +18,44 @@ AC_DEFUN([AC_C_VARARRAYS], | |||
| 18 | ac_cv_c_vararrays, | 18 | ac_cv_c_vararrays, |
| 19 | [AC_EGREP_CPP([defined], | 19 | [AC_EGREP_CPP([defined], |
| 20 | [#ifdef __STDC_NO_VLA__ | 20 | [#ifdef __STDC_NO_VLA__ |
| 21 | defined | 21 | defined |
| 22 | #endif | 22 | #endif |
| 23 | ], | 23 | ], |
| 24 | [ac_cv_c_vararrays='no: __STDC_NO_VLA__ is defined'], | 24 | [ac_cv_c_vararrays='no: __STDC_NO_VLA__ is defined'], |
| 25 | [AC_COMPILE_IFELSE( | 25 | [AC_COMPILE_IFELSE( |
| 26 | [AC_LANG_PROGRAM( | 26 | [AC_LANG_PROGRAM( |
| 27 | [[/* Test for VLA support. This test is partly inspired | 27 | [[/* Test for VLA support. This test is partly inspired |
| 28 | from examples in the C standard. Use at least two VLA | 28 | from examples in the C standard. Use at least two VLA |
| 29 | functions to detect the GCC 3.4.3 bug described in: | 29 | functions to detect the GCC 3.4.3 bug described in: |
| 30 | https://lists.gnu.org/r/bug-gnulib/2014-08/msg00014.html | 30 | https://lists.gnu.org/r/bug-gnulib/2014-08/msg00014.html |
| 31 | */ | 31 | */ |
| 32 | #ifdef __STDC_NO_VLA__ | 32 | #ifdef __STDC_NO_VLA__ |
| 33 | syntax error; | 33 | syntax error; |
| 34 | #else | 34 | #else |
| 35 | extern int n; | 35 | extern int n; |
| 36 | int B[100]; | 36 | int B[100]; |
| 37 | int fvla (int m, int C[m][m]); | 37 | int fvla (int m, int C[m][m]); |
| 38 | 38 | ||
| 39 | int | 39 | int |
| 40 | simple (int count, int all[static count]) | 40 | simple (int count, int all[static count]) |
| 41 | { | 41 | { |
| 42 | return all[count - 1]; | 42 | return all[count - 1]; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | int | 45 | int |
| 46 | fvla (int m, int C[m][m]) | 46 | fvla (int m, int C[m][m]) |
| 47 | { | 47 | { |
| 48 | typedef int VLA[m][m]; | 48 | typedef int VLA[m][m]; |
| 49 | VLA x; | 49 | VLA x; |
| 50 | int D[m]; | 50 | int D[m]; |
| 51 | static int (*q)[m] = &B; | 51 | static int (*q)[m] = &B; |
| 52 | int (*s)[n] = q; | 52 | int (*s)[n] = q; |
| 53 | return C && &x[0][0] == &D[0] && &D[0] == s[0]; | 53 | return C && &x[0][0] == &D[0] && &D[0] == s[0]; |
| 54 | } | 54 | } |
| 55 | #endif | 55 | #endif |
| 56 | ]])], | 56 | ]])], |
| 57 | [ac_cv_c_vararrays=yes], | 57 | [ac_cv_c_vararrays=yes], |
| 58 | [ac_cv_c_vararrays=no])])]) | 58 | [ac_cv_c_vararrays=no])])]) |
| 59 | if test "$ac_cv_c_vararrays" = yes; then | 59 | if test "$ac_cv_c_vararrays" = yes; then |
| 60 | dnl This is for compatibility with Autoconf 2.61-2.69. | 60 | dnl This is for compatibility with Autoconf 2.61-2.69. |
| 61 | AC_DEFINE([HAVE_C_VARARRAYS], 1, | 61 | AC_DEFINE([HAVE_C_VARARRAYS], 1, |