aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2020-01-13 16:25:28 -0800
committerPaul Eggert2020-01-13 16:27:02 -0800
commit4fc0bc96787252b1b3e14a7f747ef556273b5979 (patch)
tree4df0bfb717a271480089be4c3ccc7d1cd35e8b47
parent0abda558bc547991cddd9667be722eaeb428dca8 (diff)
downloademacs-4fc0bc96787252b1b3e14a7f747ef556273b5979.tar.gz
emacs-4fc0bc96787252b1b3e14a7f747ef556273b5979.zip
Update from gnulib
This incorporates: 2020-01-10 fix major regression from 2020-01-04 2020-01-05 tests: avoid GCC over-optimization 2020-01-04 fix AC_CHECK_DECL so it deactivates clang's built-ins 2020-01-03 getopt-posix: fix compilation failure in testdirs 2020-01-03 doc: mention the 64-bit inode number problem 2020-01-02 wchar: make the HP-UX workaround work on HP-UX 11.31 * build-aux/config.guess, build-aux/config.sub, lib/inttypes.in.h: * lib/stdlib.in.h, lib/unistd.in.h, m4/00gnulib.m4, m4/largefile.m4: * m4/unistd_h.m4: Copy from Gnulib * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
-rwxr-xr-xbuild-aux/config.guess6
-rwxr-xr-xbuild-aux/config.sub6
-rw-r--r--lib/gnulib.mk.in2
-rw-r--r--lib/inttypes.in.h2
-rw-r--r--lib/stdlib.in.h7
-rw-r--r--lib/unistd.in.h2
-rw-r--r--m4/00gnulib.m470
-rw-r--r--m4/gnulib-comp.m41
-rw-r--r--m4/largefile.m44
-rw-r--r--m4/unistd_h.m43
10 files changed, 91 insertions, 12 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 95b16c7747a..45001cfecde 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
1#! /bin/sh 1#! /bin/sh
2# Attempt to guess a canonical system name. 2# Attempt to guess a canonical system name.
3# Copyright 1992-2019 Free Software Foundation, Inc. 3# Copyright 1992-2020 Free Software Foundation, Inc.
4 4
5timestamp='2019-12-21' 5timestamp='2020-01-01'
6 6
7# This file is free software; you can redistribute it and/or modify it 7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by 8# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
50GNU config.guess ($timestamp) 50GNU config.guess ($timestamp)
51 51
52Originally written by Per Bothner. 52Originally written by Per Bothner.
53Copyright 1992-2019 Free Software Foundation, Inc. 53Copyright 1992-2020 Free Software Foundation, Inc.
54 54
55This is free software; see the source for copying conditions. There is NO 55This is free software; see the source for copying conditions. There is NO
56warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 56warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 0f2234c174d..f02d43ad500 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,8 +1,8 @@
1#! /bin/sh 1#! /bin/sh
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
3# Copyright 1992-2019 Free Software Foundation, Inc. 3# Copyright 1992-2020 Free Software Foundation, Inc.
4 4
5timestamp='2019-06-30' 5timestamp='2020-01-01'
6 6
7# This file is free software; you can redistribute it and/or modify it 7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by 8# under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
67version="\ 67version="\
68GNU config.sub ($timestamp) 68GNU config.sub ($timestamp)
69 69
70Copyright 1992-2019 Free Software Foundation, Inc. 70Copyright 1992-2020 Free Software Foundation, Inc.
71 71
72This is free software; see the source for copying conditions. There is NO 72This is free software; see the source for copying conditions. There is NO
73warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 73warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 951e5b1a652..ed80f88a874 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -316,6 +316,7 @@ GNULIB_GETLINE = @GNULIB_GETLINE@
316GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ 316GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
317GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ 317GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
318GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ 318GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
319GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@
319GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ 320GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
320GNULIB_GETPASS = @GNULIB_GETPASS@ 321GNULIB_GETPASS = @GNULIB_GETPASS@
321GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ 322GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
@@ -3210,6 +3211,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
3210 -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ 3211 -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \
3211 -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ 3212 -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
3212 -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ 3213 -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
3214 -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \
3213 -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ 3215 -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
3214 -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ 3216 -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \
3215 -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ 3217 -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h
index 5184e266f27..d6efc7eeeef 100644
--- a/lib/inttypes.in.h
+++ b/lib/inttypes.in.h
@@ -38,6 +38,8 @@
38# endif 38# endif
39 39
40# @INCLUDE_NEXT@ @NEXT_INTTYPES_H@ 40# @INCLUDE_NEXT@ @NEXT_INTTYPES_H@
41
42# define _GL_FINISHED_INCLUDING_SYSTEM_INTTYPES_H
41# endif 43# endif
42#endif 44#endif
43 45
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index e088959b285..49bbf6fccfb 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -201,6 +201,10 @@ _GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name)
201# endif 201# endif
202_GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); 202_GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name));
203# endif 203# endif
204# ifndef GNULIB_defined_canonicalize_file_name
205# define GNULIB_defined_canonicalize_file_name \
206 (!@HAVE_CANONICALIZE_FILE_NAME@ || @REPLACE_CANONICALIZE_FILE_NAME@)
207# endif
204_GL_CXXALIASWARN (canonicalize_file_name); 208_GL_CXXALIASWARN (canonicalize_file_name);
205#elif defined GNULIB_POSIXCHECK 209#elif defined GNULIB_POSIXCHECK
206# undef canonicalize_file_name 210# undef canonicalize_file_name
@@ -516,6 +520,9 @@ _GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
516# endif 520# endif
517_GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len)); 521_GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
518# endif 522# endif
523# ifndef GNULIB_defined_ptsname_r
524# define GNULIB_defined_ptsname_r (!@HAVE_PTSNAME_R@ || @REPLACE_PTSNAME_R@)
525# endif
519_GL_CXXALIASWARN (ptsname_r); 526_GL_CXXALIASWARN (ptsname_r);
520#elif defined GNULIB_POSIXCHECK 527#elif defined GNULIB_POSIXCHECK
521# undef ptsname_r 528# undef ptsname_r
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 7909416f366..d6176adc00d 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -141,7 +141,7 @@
141 141
142 142
143/* Get getopt(), optarg, optind, opterr, optopt. */ 143/* Get getopt(), optarg, optind, opterr, optopt. */
144#if @GNULIB_UNISTD_H_GETOPT@ && !defined _GL_SYSTEM_GETOPT 144#if @GNULIB_GETOPT_POSIX@ && @GNULIB_UNISTD_H_GETOPT@ && !defined _GL_SYSTEM_GETOPT
145# include <getopt-cdefs.h> 145# include <getopt-cdefs.h>
146# include <getopt-pfx-core.h> 146# include <getopt-pfx-core.h>
147#endif 147#endif
diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4
index 1a1a1d74f7e..58bc4efb9c5 100644
--- a/m4/00gnulib.m4
+++ b/m4/00gnulib.m4
@@ -1,13 +1,14 @@
1# 00gnulib.m4 serial 3 1# 00gnulib.m4 serial 5
2dnl Copyright (C) 2009-2020 Free Software Foundation, Inc. 2dnl Copyright (C) 2009-2020 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,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
6 6
7dnl This file must be named something that sorts before all other 7dnl This file must be named something that sorts before all other
8dnl gnulib-provided .m4 files. It is needed until such time as we can 8dnl gnulib-provided .m4 files. The first part is needed until such time
9dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and 9dnl as we can assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and
10dnl m4_divert semantics. 10dnl m4_divert semantics. The second part is needed until the clang fix
11dnl has been included in Autoconf.
11 12
12# Until autoconf 2.63, handling of the diversion stack required m4_init 13# Until autoconf 2.63, handling of the diversion stack required m4_init
13# to be called first; but this does not happen with aclocal. Wrapping 14# to be called first; but this does not happen with aclocal. Wrapping
@@ -39,6 +40,67 @@ m4_version_prereq([2.63.263], [],
39 [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl 40 [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl
40[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])]) 41[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])])
41 42
43# The following definitions arrange to use a compiler option
44# -Werror=implicit-function-declaration in AC_CHECK_DECL, when the
45# compiler is clang. Without it, clang implicitly declares "known"
46# library functions in C mode, but not in C++ mode, which would cause
47# Gnulib to omit a declaration and thus later produce an error in C++
48# mode. As of clang 9.0, these "known" functions are identified through
49# LIBBUILTIN invocations in the LLVM source file
50# llvm/tools/clang/include/clang/Basic/Builtins.def.
51AC_DEFUN([gl_COMPILER_CLANG],
52[
53 AC_REQUIRE([AC_PROG_CC])
54 AC_CACHE_CHECK([whether the compiler is clang],
55 [gl_cv_compiler_clang],
56 [AC_EGREP_CPP([barfbarf],[
57#ifdef __clang__
58barfbarf
59#endif
60 ],
61 [gl_cv_compiler_clang=yes],
62 [gl_cv_compiler_clang=no])
63 ])
64])
65AC_DEFUN_ONCE([gl_COMPILER_PREPARE_CHECK_DECL],
66[
67 AC_REQUIRE([AC_PROG_CC])
68 AC_REQUIRE([gl_COMPILER_CLANG])
69 AC_CACHE_CHECK([for compiler option needed when checking for declarations],
70 [gl_cv_compiler_check_decl_option],
71 [if test $gl_cv_compiler_clang = yes; then
72 dnl Test whether the compiler supports the option
73 dnl '-Werror=implicit-function-declaration'.
74 save_ac_compile="$ac_compile"
75 ac_compile="$ac_compile -Werror=implicit-function-declaration"
76 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])],
77 [gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration'],
78 [gl_cv_compiler_check_decl_option=none])
79 ac_compile="$save_ac_compile"
80 else
81 gl_cv_compiler_check_decl_option=none
82 fi
83 ])
84 if test "x$gl_cv_compiler_check_decl_option" != xnone; then
85 ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option"
86 else
87 ac_compile_for_check_decl="$ac_compile"
88 fi
89])
90dnl Redefine _AC_CHECK_DECL_BODY so that it references ac_compile_for_check_decl
91dnl instead of ac_compile.
92m4_define([_AC_CHECK_DECL_BODY],
93[ ac_save_ac_compile="$ac_compile"
94 ac_compile="$ac_compile_for_check_decl"]
95m4_defn([_AC_CHECK_DECL_BODY])[ ac_compile="$ac_save_ac_compile"
96])
97 ])
98dnl Redefine AC_CHECK_DECL so that it starts with an invocation of
99dnl gl_COMPILER_PREPARE_CHECK_DECL.
100m4_define([AC_CHECK_DECL],
101 [gl_COMPILER_PREPARE_CHECK_DECL dnl
102]m4_defn([AC_CHECK_DECL]))
103
42# gl_00GNULIB 104# gl_00GNULIB
43# ----------- 105# -----------
44# Witness macro that this file has been included. Needed to force 106# Witness macro that this file has been included. Needed to force
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index 85a60569326..abaca719024 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -303,6 +303,7 @@ AC_DEFUN([gl_INIT],
303 GNULIB_GL_UNISTD_H_GETOPT=1 303 GNULIB_GL_UNISTD_H_GETOPT=1
304 fi 304 fi
305 AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) 305 AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
306 gl_UNISTD_MODULE_INDICATOR([getopt-posix])
306 gl_GETTIME 307 gl_GETTIME
307 gl_FUNC_GETTIMEOFDAY 308 gl_FUNC_GETTIMEOFDAY
308 if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then 309 if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
diff --git a/m4/largefile.m4 b/m4/largefile.m4
index 40b16bc0e54..e381339c40c 100644
--- a/m4/largefile.m4
+++ b/m4/largefile.m4
@@ -1,4 +1,5 @@
1# Enable large files on systems where this is not the default. 1# Enable large files on systems where this is not the default.
2# Enable support for files on Linux file systems with 64-bit inode numbers.
2 3
3# Copyright 1992-1996, 1998-2020 Free Software Foundation, Inc. 4# Copyright 1992-1996, 1998-2020 Free Software Foundation, Inc.
4# This file is free software; the Free Software Foundation 5# This file is free software; the Free Software Foundation
@@ -73,6 +74,9 @@ rm -rf conftest*[]dnl
73# one must use special compiler options to get large-file access to work. 74# one must use special compiler options to get large-file access to work.
74# For more details about this brain damage please see: 75# For more details about this brain damage please see:
75# http://www.unix.org/version2/whatsnew/lfs20mar.html 76# http://www.unix.org/version2/whatsnew/lfs20mar.html
77# Additionally, on Linux file systems with 64-bit inodes a file that happens
78# to have a 64-bit inode number cannot be accessed by 32-bit applications on
79# Linux x86/x86_64. This can occur with file systems such as XFS and NFS.
76AC_DEFUN([AC_SYS_LARGEFILE], 80AC_DEFUN([AC_SYS_LARGEFILE],
77[AC_ARG_ENABLE(largefile, 81[AC_ARG_ENABLE(largefile,
78 [ --disable-largefile omit support for large files]) 82 [ --disable-largefile omit support for large files])
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 7453866df84..ea2bb016dbb 100644
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,4 +1,4 @@
1# unistd_h.m4 serial 76 1# unistd_h.m4 serial 77
2dnl Copyright (C) 2006-2020 Free Software Foundation, Inc. 2dnl Copyright (C) 2006-2020 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,
@@ -84,6 +84,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
84 GNULIB_GETHOSTNAME=0; AC_SUBST([GNULIB_GETHOSTNAME]) 84 GNULIB_GETHOSTNAME=0; AC_SUBST([GNULIB_GETHOSTNAME])
85 GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN]) 85 GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN])
86 GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) 86 GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R])
87 GNULIB_GETOPT_POSIX=0; AC_SUBST([GNULIB_GETOPT_POSIX])
87 GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) 88 GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE])
88 GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS]) 89 GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS])
89 GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) 90 GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL])