aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorPaul Eggert2017-09-17 12:56:00 -0700
committerPaul Eggert2017-09-17 13:06:54 -0700
commit6bbbc38b3421723521f7cdd4fd617a4fc889aceb (patch)
tree9cc9d4cd249578118ae6b22da617935a760cc891 /m4
parent57249fb297237bb942ead1f7a0af0ac20811a9cf (diff)
downloademacs-6bbbc38b3421723521f7cdd4fd617a4fc889aceb.tar.gz
emacs-6bbbc38b3421723521f7cdd4fd617a4fc889aceb.zip
Merge from Gnulib
This incorporates: 2017-09-16 manywarnings: port to GCC on 64-bit MS-Windows 2017-09-13 all: Replace many more http URLs by https URLs * build-aux/config.guess, build-aux/config.sub: * build-aux/gitlog-to-changelog, doc/misc/texinfo.tex: * lib/allocator.h, lib/count-leading-zeros.h: * lib/count-trailing-zeros.h, lib/dup2.c, lib/filevercmp.c: * lib/fstatat.c, lib/fsync.c, lib/ftoastr.c, lib/ftoastr.h: * lib/intprops.h, lib/signal.in.h, lib/stdio-impl.h, lib/stdio.in.h: * lib/unistd.in.h, lib/utimens.c, m4/alloca.m4, m4/extern-inline.m4: * m4/fstatat.m4, m4/gnulib-common.m4, m4/manywarnings.m4: * m4/std-gnu11.m4, m4/sys_types_h.m4, m4/vararrays.m4: Copy from Gnulib. * lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'm4')
-rw-r--r--m4/alloca.m44
-rw-r--r--m4/extern-inline.m48
-rw-r--r--m4/fstatat.m42
-rw-r--r--m4/gnulib-common.m46
-rw-r--r--m4/manywarnings.m417
-rw-r--r--m4/std-gnu11.m44
-rw-r--r--m4/sys_types_h.m42
-rw-r--r--m4/vararrays.m42
8 files changed, 25 insertions, 20 deletions
diff --git a/m4/alloca.m4 b/m4/alloca.m4
index 7f0604cbdac..d1224316498 100644
--- a/m4/alloca.m4
+++ b/m4/alloca.m4
@@ -44,12 +44,12 @@ AC_DEFUN([gl_FUNC_ALLOCA],
44AC_DEFUN([gl_PREREQ_ALLOCA], [:]) 44AC_DEFUN([gl_PREREQ_ALLOCA], [:])
45 45
46# This works around a bug in autoconf <= 2.68. 46# This works around a bug in autoconf <= 2.68.
47# See <http://lists.gnu.org/archive/html/bug-gnulib/2011-06/msg00277.html>. 47# See <https://lists.gnu.org/archive/html/bug-gnulib/2011-06/msg00277.html>.
48 48
49m4_version_prereq([2.69], [] ,[ 49m4_version_prereq([2.69], [] ,[
50 50
51# This is taken from the following Autoconf patch: 51# This is taken from the following Autoconf patch:
52# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=6cd9f12520b0d6f76d3230d7565feba1ecf29497 52# https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=6cd9f12520b0d6f76d3230d7565feba1ecf29497
53 53
54# _AC_LIBOBJ_ALLOCA 54# _AC_LIBOBJ_ALLOCA
55# ----------------- 55# -----------------
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index 00f960968b0..c08af18af68 100644
--- a/m4/extern-inline.m4
+++ b/m4/extern-inline.m4
@@ -11,7 +11,7 @@ AC_DEFUN([gl_EXTERN_INLINE],
11[/* Please see the Gnulib manual for how to use these macros. 11[/* Please see the Gnulib manual for how to use these macros.
12 12
13 Suppress extern inline with HP-UX cc, as it appears to be broken; see 13 Suppress extern inline with HP-UX cc, as it appears to be broken; see
14 <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>. 14 <https://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
15 15
16 Suppress extern inline with Sun C in standards-conformance mode, as it 16 Suppress extern inline with Sun C in standards-conformance mode, as it
17 mishandles inline functions that call each other. E.g., for 'inline void f 17 mishandles inline functions that call each other. E.g., for 'inline void f
@@ -28,16 +28,16 @@ AC_DEFUN([gl_EXTERN_INLINE],
28 from calling static functions. This bug is known to occur on: 28 from calling static functions. This bug is known to occur on:
29 29
30 OS X 10.8 and earlier; see: 30 OS X 10.8 and earlier; see:
31 http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html 31 https://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
32 32
33 DragonFly; see 33 DragonFly; see
34 http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log 34 http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
35 35
36 FreeBSD; see: 36 FreeBSD; see:
37 http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html 37 https://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
38 38
39 OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and 39 OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
40 for clang but remains for g++; see <http://trac.macports.org/ticket/41033>. 40 for clang but remains for g++; see <https://trac.macports.org/ticket/41033>.
41 Assume DragonFly and FreeBSD will be similar. */ 41 Assume DragonFly and FreeBSD will be similar. */
42#if (((defined __APPLE__ && defined __MACH__) \ 42#if (((defined __APPLE__ && defined __MACH__) \
43 || defined __DragonFly__ || defined __FreeBSD__) \ 43 || defined __DragonFly__ || defined __FreeBSD__) \
diff --git a/m4/fstatat.m4 b/m4/fstatat.m4
index 75cf0110401..b29ec9258e9 100644
--- a/m4/fstatat.m4
+++ b/m4/fstatat.m4
@@ -20,7 +20,7 @@ AC_DEFUN([gl_FUNC_FSTATAT],
20 HAVE_FSTATAT=0 20 HAVE_FSTATAT=0
21 else 21 else
22 dnl Test for an AIX 7.1 bug; see 22 dnl Test for an AIX 7.1 bug; see
23 dnl <http://lists.gnu.org/archive/html/bug-tar/2011-09/msg00015.html>. 23 dnl <https://lists.gnu.org/archive/html/bug-tar/2011-09/msg00015.html>.
24 AC_CACHE_CHECK([whether fstatat (..., 0) works], 24 AC_CACHE_CHECK([whether fstatat (..., 0) works],
25 [gl_cv_func_fstatat_zero_flag], 25 [gl_cv_func_fstatat_zero_flag],
26 [AC_RUN_IFELSE( 26 [AC_RUN_IFELSE(
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index 36f2acc5539..36da841287d 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -228,13 +228,13 @@ m4_ifndef([AS_VAR_IF],
228# This is like AC_PROG_CC_C99, except that 228# This is like AC_PROG_CC_C99, except that
229# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60, 229# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60,
230# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC 230# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC
231# <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00367.html>, 231# <https://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00367.html>,
232# but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99 232# but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99
233# <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00441.html>. 233# <https://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00441.html>.
234# Remaining problems: 234# Remaining problems:
235# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options 235# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options
236# to CC twice 236# to CC twice
237# <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00431.html>. 237# <https://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00431.html>.
238# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard. 238# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard.
239AC_DEFUN([gl_PROG_CC_C99], 239AC_DEFUN([gl_PROG_CC_C99],
240[ 240[
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
index eb89325519c..d10bcd08a0e 100644
--- a/m4/manywarnings.m4
+++ b/m4/manywarnings.m4
@@ -1,4 +1,4 @@
1# manywarnings.m4 serial 12 1# manywarnings.m4 serial 13
2dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. 2dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -267,18 +267,23 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
267 267
268 # gcc --help=warnings outputs an unusual form for these options; list 268 # gcc --help=warnings outputs an unusual form for these options; list
269 # them here so that the above 'comm' command doesn't report a false match. 269 # them here so that the above 'comm' command doesn't report a false match.
270 # Would prefer "min (PTRDIFF_MAX, SIZE_MAX)", but it must be a literal 270 # Would prefer "min (PTRDIFF_MAX, SIZE_MAX)", but it must be a literal.
271 # and AC_COMPUTE_INT requires it to fit in a long: 271 # Also, AC_COMPUTE_INT requires it to fit in a long; it is 2**63 on
272 # the only platforms where it does not fit in a long, so make that
273 # a special case.
272 AC_MSG_CHECKING([max safe object size]) 274 AC_MSG_CHECKING([max safe object size])
273 AC_COMPUTE_INT([gl_alloc_max], 275 AC_COMPUTE_INT([gl_alloc_max],
274 [(LONG_MAX < PTRDIFF_MAX ? LONG_MAX : PTRDIFF_MAX) < (size_t) -1 276 [LONG_MAX < (PTRDIFF_MAX < (size_t) -1 ? PTRDIFF_MAX : (size_t) -1)
275 ? (LONG_MAX < PTRDIFF_MAX ? LONG_MAX : PTRDIFF_MAX) 277 ? -1
276 : (size_t) -1], 278 : PTRDIFF_MAX < (size_t) -1 ? (long) PTRDIFF_MAX : (long) (size_t) -1],
277 [[#include <limits.h> 279 [[#include <limits.h>
278 #include <stddef.h> 280 #include <stddef.h>
279 #include <stdint.h> 281 #include <stdint.h>
280 ]], 282 ]],
281 [gl_alloc_max=2147483647]) 283 [gl_alloc_max=2147483647])
284 case $gl_alloc_max in
285 -1) gl_alloc_max=9223372036854775807;;
286 esac
282 AC_MSG_RESULT([$gl_alloc_max]) 287 AC_MSG_RESULT([$gl_alloc_max])
283 gl_manywarn_set="$gl_manywarn_set -Walloc-size-larger-than=$gl_alloc_max" 288 gl_manywarn_set="$gl_manywarn_set -Walloc-size-larger-than=$gl_alloc_max"
284 gl_manywarn_set="$gl_manywarn_set -Warray-bounds=2" 289 gl_manywarn_set="$gl_manywarn_set -Warray-bounds=2"
diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4
index bd34aa1a268..3c2f26f4666 100644
--- a/m4/std-gnu11.m4
+++ b/m4/std-gnu11.m4
@@ -369,7 +369,7 @@ dnl just the module. Instead, define the (private) symbol
369dnl _STDC_C99, which suppresses a bogus failure in <stdbool.h>. 369dnl _STDC_C99, which suppresses a bogus failure in <stdbool.h>.
370dnl The resulting compiler passes the test case here, and that's 370dnl The resulting compiler passes the test case here, and that's
371dnl good enough. For more, please see the thread starting at: 371dnl good enough. For more, please see the thread starting at:
372dnl http://lists.gnu.org/archive/html/autoconf/2010-12/msg00059.html 372dnl https://lists.gnu.org/archive/html/autoconf/2010-12/msg00059.html
373dnl Tru64 -c99 373dnl Tru64 -c99
374dnl with extended modes being tried first. 374dnl with extended modes being tried first.
375[[-std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99]], [$1], [$2])[]dnl 375[[-std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99]], [$1], [$2])[]dnl
@@ -458,7 +458,7 @@ dnl preferably extc11.
458# -------------- 458# --------------
459# Do not use AU_ALIAS here and in AC_PROG_CC_C99 and AC_PROG_CC_STDC, 459# Do not use AU_ALIAS here and in AC_PROG_CC_C99 and AC_PROG_CC_STDC,
460# as that'd be incompatible with how Automake redefines AC_PROG_CC. See 460# as that'd be incompatible with how Automake redefines AC_PROG_CC. See
461# <http://lists.gnu.org/archive/html/autoconf/2012-10/msg00048.html>. 461# <https://lists.gnu.org/archive/html/autoconf/2012-10/msg00048.html>.
462AU_DEFUN([AC_PROG_CC_C89], 462AU_DEFUN([AC_PROG_CC_C89],
463 [AC_REQUIRE([AC_PROG_CC])], 463 [AC_REQUIRE([AC_PROG_CC])],
464 [$0 is obsolete; use AC_PROG_CC] 464 [$0 is obsolete; use AC_PROG_CC]
diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4
index 34224d7705d..06268cfb2db 100644
--- a/m4/sys_types_h.m4
+++ b/m4/sys_types_h.m4
@@ -40,7 +40,7 @@ AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
40m4_version_prereq([2.70], [], [ 40m4_version_prereq([2.70], [], [
41 41
42# This is taken from the following Autoconf patch: 42# This is taken from the following Autoconf patch:
43# https://git.sv.gnu.org/cgit/autoconf.git/commit/?id=e17a30e98 43# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=e17a30e987d7ee695fb4294a82d987ec3dc9b974
44 44
45m4_undefine([AC_HEADER_MAJOR]) 45m4_undefine([AC_HEADER_MAJOR])
46AC_DEFUN([AC_HEADER_MAJOR], 46AC_DEFUN([AC_HEADER_MAJOR],
diff --git a/m4/vararrays.m4 b/m4/vararrays.m4
index 8391121ad3f..38a3ed23542 100644
--- a/m4/vararrays.m4
+++ b/m4/vararrays.m4
@@ -27,7 +27,7 @@ AC_DEFUN([AC_C_VARARRAYS],
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 http://lists.gnu.org/archive/html/bug-gnulib/2014-08/msg00014.html 30 https://lists.gnu.org/archive/html/bug-gnulib/2014-08/msg00014.html
31 */ 31 */
32 #ifdef __STDC_NO_VLA__ 32 #ifdef __STDC_NO_VLA__
33 syntax error; 33 syntax error;