masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update from gnulib

Browse source 
Make the following changes by hand, and run ‘admin/merge-gnulib’.
* configure.ac (AM_CONDITIONAL): Adjust to new Gnulib convention.
This commit is contained in:
Paul Eggert 2021-12-18 16:12:38 -08:00
parent 35da3ed052
commit f05a93e823
32 changed files with 796 additions and 824 deletions
Download patch file Download diff file Expand all files Collapse all files

7
build-aux/config.guess vendored
View file

@ -4,7 +4,7 @@
# shellcheck disable=SC2006,SC2268 # see below for rationale # shellcheck disable=SC2006,SC2268 # see below for rationale
timestamp='2021-06-03' timestamp='2021-11-30'
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
@ -437,7 +437,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
# This test works for both compilers. # This test works for both compilers.
if test "$CC_FOR_BUILD" != no_compiler_found; then if test "$CC_FOR_BUILD" != no_compiler_found; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null grep IS_64BIT_ARCH >/dev/null
then then
SUN_ARCH=x86_64 SUN_ARCH=x86_64
@ -1522,6 +1522,9 @@ EOF
i*86:rdos:*:*) i*86:rdos:*:*)
GUESS=$UNAME_MACHINE-pc-rdos GUESS=$UNAME_MACHINE-pc-rdos
;; ;;
i*86:Fiwix:*:*)
GUESS=$UNAME_MACHINE-pc-fiwix
;;
*:AROS:*:*) *:AROS:*:*)
GUESS=$UNAME_MACHINE-unknown-aros GUESS=$UNAME_MACHINE-unknown-aros
;; ;;

7
build-aux/config.sub vendored
View file

@ -4,7 +4,7 @@
# shellcheck disable=SC2006,SC2268 # see below for rationale # shellcheck disable=SC2006,SC2268 # see below for rationale
timestamp='2021-08-14' timestamp='2021-10-27'
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
@ -1304,7 +1304,7 @@ esac
if test x$basic_os != x if test x$basic_os != x
then then
# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just # First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
# set os. # set os.
case $basic_os in case $basic_os in
gnu/linux*) gnu/linux*)
@ -1748,7 +1748,8 @@ case $os in
| skyos* | haiku* | rdos* | toppers* | drops* | es* \ | skyos* | haiku* | rdos* | toppers* | drops* | es* \
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
| midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
| nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*) | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
| fiwix* )
;; ;;
# This one is extra strict with allowed versions # This one is extra strict with allowed versions
sco3.2v2 | sco3.2v[4-9]* | sco5v6*) sco3.2v2 | sco3.2v[4-9]* | sco5v6*)

4
configure.ac
View file

@ -1198,8 +1198,8 @@ fi)
dnl Automake replacements. dnl Automake replacements.
AC_DEFUN([AM_CONDITIONAL], AC_DEFUN([AM_CONDITIONAL],
[$2 && $1=1 || $1= [$2 && $1_CONDITION=1 || $1_CONDITION=
AC_SUBST([$1])]) AC_SUBST([$1_CONDITION])])
dnl Prefer silent make output. For verbose output, use dnl Prefer silent make output. For verbose output, use
dnl 'configure --disable-silent-rules' or 'make V=1' . dnl 'configure --disable-silent-rules' or 'make V=1' .

14
doc/misc/texinfo.tex
View file

@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex. % Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
% %
\def\texinfoversion{2021-04-25.21} \def\texinfoversion{2021-11-01.16}
% %
% Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc. % Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
% %
@ -3614,6 +3614,9 @@
\def\quotedblbase{{\ecfont \char"12}} \def\quotedblbase{{\ecfont \char"12}}
\def\quotesinglbase{{\ecfont \char"0D}} \def\quotesinglbase{{\ecfont \char"0D}}
% %
\def\L{{\ecfont \char"8A}} % L with stroke
\def\l{{\ecfont \char"AA}} % l with stroke
%
% This positioning is not perfect (see the ogonek LaTeX package), but % This positioning is not perfect (see the ogonek LaTeX package), but
% we have the precomposed glyphs for the most common cases. We put the % we have the precomposed glyphs for the most common cases. We put the
% tests to use those glyphs in the single \ogonek macro so we have fewer % tests to use those glyphs in the single \ogonek macro so we have fewer
@ -7592,6 +7595,7 @@
% %
\def\printdefunline#1#2{% \def\printdefunline#1#2{%
\begingroup \begingroup
\plainfrenchspacing
% call \deffnheader: % call \deffnheader:
#1#2 \endheader #1#2 \endheader
% common ending: % common ending:
@ -9402,7 +9406,7 @@
\fi\fi \fi\fi
% %
\ifimagevmode \ifimagevmode
\nobreak\medskip \medskip
% Usually we'll have text after the image which will insert % Usually we'll have text after the image which will insert
% \parskip glue, so insert it here too to equalize the space % \parskip glue, so insert it here too to equalize the space
% above and below. % above and below.
@ -11599,11 +11603,9 @@
@setregularquotes @setregularquotes
@c Local variables: @c Local variables:
@c eval: (add-hook 'before-save-hook 'time-stamp) @c eval: (add-hook 'before-save-hook 'time-stamp nil t)
@c time-stamp-pattern: "texinfoversion{%Y-%02m-%02d.%02H}"
@c page-delimiter: "^\\\\message\\|emacs-page" @c page-delimiter: "^\\\\message\\|emacs-page"
@c time-stamp-start: "def\\\\texinfoversion{"
@c time-stamp-format: "%:y-%02m-%02d.%02H"
@c time-stamp-end: "}"
@c End: @c End:
@c vim:sw=2: @c vim:sw=2:

67
lib/cdefs.h
View file

@ -1,4 +1,5 @@
/* Copyright (C) 1992-2021 Free Software Foundation, Inc. /* Copyright (C) 1992-2021 Free Software Foundation, Inc.
Copyright The GNU Toolchain Authors.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -150,6 +151,53 @@
# define __glibc_objsize(__o) __bos (__o) # define __glibc_objsize(__o) __bos (__o)
#endif #endif
/* Compile time conditions to choose between the regular, _chk and _chk_warn
variants. These conditions should get evaluated to constant and optimized
away. */
#define __glibc_safe_len_cond(__l, __s, __osz) ((__l) <= (__osz) / (__s))
#define __glibc_unsigned_or_positive(__l) \
((__typeof (__l)) 0 < (__typeof (__l)) -1 \
|| (__builtin_constant_p (__l) && (__l) > 0))
/* Length is known to be safe at compile time if the __L * __S <= __OBJSZ
condition can be folded to a constant and if it is true. The -1 check is
redundant because since it implies that __glibc_safe_len_cond is true. */
#define __glibc_safe_or_unknown_len(__l, __s, __osz) \
(__glibc_unsigned_or_positive (__l) \
&& __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \
__s, __osz)) \
&& __glibc_safe_len_cond ((__SIZE_TYPE__) (__l), __s, __osz))
/* Conversely, we know at compile time that the length is unsafe if the
__L * __S <= __OBJSZ condition can be folded to a constant and if it is
false. */
#define __glibc_unsafe_len(__l, __s, __osz) \
(__glibc_unsigned_or_positive (__l) \
&& __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \
__s, __osz)) \
&& !__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), __s, __osz))
/* Fortify function f. __f_alias, __f_chk and __f_chk_warn must be
declared. */
#define __glibc_fortify(f, __l, __s, __osz, ...) \
(__glibc_safe_or_unknown_len (__l, __s, __osz) \
? __ ## f ## _alias (__VA_ARGS__) \
: (__glibc_unsafe_len (__l, __s, __osz) \
? __ ## f ## _chk_warn (__VA_ARGS__, __osz) \
: __ ## f ## _chk (__VA_ARGS__, __osz))) \
/* Fortify function f, where object size argument passed to f is the number of
elements and not total size. */
#define __glibc_fortify_n(f, __l, __s, __osz, ...) \
(__glibc_safe_or_unknown_len (__l, __s, __osz) \
? __ ## f ## _alias (__VA_ARGS__) \
: (__glibc_unsafe_len (__l, __s, __osz) \
? __ ## f ## _chk_warn (__VA_ARGS__, (__osz) / (__s)) \
: __ ## f ## _chk (__VA_ARGS__, (__osz) / (__s)))) \
#if __GNUC_PREREQ (4,3) #if __GNUC_PREREQ (4,3)
# define __warnattr(msg) __attribute__((__warning__ (msg))) # define __warnattr(msg) __attribute__((__warning__ (msg)))
# define __errordecl(name, msg) \ # define __errordecl(name, msg) \
@ -243,6 +291,15 @@
# define __attribute_alloc_size__(params) /* Ignore. */ # define __attribute_alloc_size__(params) /* Ignore. */
#endif #endif
/* Tell the compiler which argument to an allocation function
indicates the alignment of the allocation. */
#if __GNUC_PREREQ (4, 9) || __glibc_has_attribute (__alloc_align__)
# define __attribute_alloc_align__(param) \
__attribute__ ((__alloc_align__ param))
#else
# define __attribute_alloc_align__(param) /* Ignore. */
#endif
/* At some point during the gcc 2.96 development the `pure' attribute /* At some point during the gcc 2.96 development the `pure' attribute
for functions was introduced. We don't want to use it unconditionally for functions was introduced. We don't want to use it unconditionally
(although this would be possible) since it generates warnings. */ (although this would be possible) since it generates warnings. */
@ -605,12 +662,22 @@ _Static_assert (0, "IEEE 128-bits long double requires redirection on this platf
size-index is not provided: size-index is not provided:
access (access-mode, <ref-index> [, <size-index>]) */ access (access-mode, <ref-index> [, <size-index>]) */
# define __attr_access(x) __attribute__ ((__access__ x)) # define __attr_access(x) __attribute__ ((__access__ x))
/* For _FORTIFY_SOURCE == 3 we use __builtin_dynamic_object_size, which may
use the access attribute to get object sizes from function definition
arguments, so we can't use them on functions we fortify. Drop the object
size hints for such functions. */
# if __USE_FORTIFY_LEVEL == 3
# define __fortified_attr_access(a, o, s) __attribute__ ((__access__ (a, o)))
# else
# define __fortified_attr_access(a, o, s) __attr_access ((a, o, s))
# endif
# if __GNUC_PREREQ (11, 0) # if __GNUC_PREREQ (11, 0)
# define __attr_access_none(argno) __attribute__ ((__access__ (__none__, argno))) # define __attr_access_none(argno) __attribute__ ((__access__ (__none__, argno)))
# else # else
# define __attr_access_none(argno) # define __attr_access_none(argno)
# endif # endif
#else #else
# define __fortified_attr_access(a, o, s)
# define __attr_access(x) # define __attr_access(x)
# define __attr_access_none(argno) # define __attr_access_none(argno)
#endif #endif

13
lib/gettext.h
View file

@ -138,7 +138,7 @@
#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \ #define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category) npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category)
#ifdef __GNUC__ #if defined __GNUC__ || defined __clang__
__inline __inline
#else #else
#ifdef __cplusplus #ifdef __cplusplus
@ -157,7 +157,7 @@ pgettext_aux (const char *domain,
return translation; return translation;
} }
#ifdef __GNUC__ #if defined __GNUC__ || defined __clang__
__inline __inline
#else #else
#ifdef __cplusplus #ifdef __cplusplus
@ -191,9 +191,8 @@ npgettext_aux (const char *domain,
or may have security implications due to non-deterministic stack usage. */ or may have security implications due to non-deterministic stack usage. */
#if (!defined GNULIB_NO_VLA \ #if (!defined GNULIB_NO_VLA \
&& (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ && defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__ \
/* || (__STDC_VERSION__ == 199901L && !defined __HP_cc) && !defined __STDC_NO_VLA__)
|| (__STDC_VERSION__ >= 201112L && !defined __STDC_NO_VLA__) */ ))
# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1 # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
#else #else
# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0 # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
@ -208,7 +207,7 @@ npgettext_aux (const char *domain,
#define dpgettext_expr(Domainname, Msgctxt, Msgid) \ #define dpgettext_expr(Domainname, Msgctxt, Msgid) \
dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES) dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
#ifdef __GNUC__ #if defined __GNUC__ || defined __clang__
__inline __inline
#else #else
#ifdef __cplusplus #ifdef __cplusplus
@ -255,7 +254,7 @@ dcpgettext_expr (const char *domain,
#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ #define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
#ifdef __GNUC__ #if defined __GNUC__ || defined __clang__
__inline __inline
#else #else
#ifdef __cplusplus #ifdef __cplusplus

223
lib/gnulib.mk.in
View file

@ -202,6 +202,9 @@ COM_ERRLIB = @COM_ERRLIB@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CRYPTOLIB = @CRYPTOLIB@ CRYPTOLIB = @CRYPTOLIB@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXFLAGS = @CXXFLAGS@
CYGWIN_OBJ = @CYGWIN_OBJ@ CYGWIN_OBJ = @CYGWIN_OBJ@
C_SWITCH_MACHINE = @C_SWITCH_MACHINE@ C_SWITCH_MACHINE = @C_SWITCH_MACHINE@
C_SWITCH_SYSTEM = @C_SWITCH_SYSTEM@ C_SWITCH_SYSTEM = @C_SWITCH_SYSTEM@
@ -244,18 +247,22 @@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@
GETOPT_H = @GETOPT_H@ GETOPT_H = @GETOPT_H@
GFILENOTIFY_CFLAGS = @GFILENOTIFY_CFLAGS@ GFILENOTIFY_CFLAGS = @GFILENOTIFY_CFLAGS@
GFILENOTIFY_LIBS = @GFILENOTIFY_LIBS@ GFILENOTIFY_LIBS = @GFILENOTIFY_LIBS@
GL_COND_LIBTOOL = @GL_COND_LIBTOOL@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GL_GENERATE_ALLOCA_H = @GL_GENERATE_ALLOCA_H@ GL_COND_LIBTOOL_CONDITION = @GL_COND_LIBTOOL_CONDITION@
GL_GENERATE_BYTESWAP_H = @GL_GENERATE_BYTESWAP_H@ GL_GENERATE_ALLOCA_H_CONDITION = @GL_GENERATE_ALLOCA_H_CONDITION@
GL_GENERATE_ERRNO_H = @GL_GENERATE_ERRNO_H@ GL_GENERATE_BYTESWAP_H_CONDITION = @GL_GENERATE_BYTESWAP_H_CONDITION@
GL_GENERATE_EXECINFO_H = @GL_GENERATE_EXECINFO_H@ GL_GENERATE_ERRNO_H_CONDITION = @GL_GENERATE_ERRNO_H_CONDITION@
GL_GENERATE_GMP_GMP_H = @GL_GENERATE_GMP_GMP_H@ GL_GENERATE_EXECINFO_H_CONDITION = @GL_GENERATE_EXECINFO_H_CONDITION@
GL_GENERATE_IEEE754_H = @GL_GENERATE_IEEE754_H@ GL_GENERATE_GETOPT_CDEFS_H_CONDITION = @GL_GENERATE_GETOPT_CDEFS_H_CONDITION@
GL_GENERATE_LIMITS_H = @GL_GENERATE_LIMITS_H@ GL_GENERATE_GETOPT_H_CONDITION = @GL_GENERATE_GETOPT_H_CONDITION@
GL_GENERATE_MINI_GMP_H = @GL_GENERATE_MINI_GMP_H@ GL_GENERATE_GMP_GMP_H_CONDITION = @GL_GENERATE_GMP_GMP_H_CONDITION@
GL_GENERATE_STDALIGN_H = @GL_GENERATE_STDALIGN_H@ GL_GENERATE_GMP_H_CONDITION = @GL_GENERATE_GMP_H_CONDITION@
GL_GENERATE_STDDEF_H = @GL_GENERATE_STDDEF_H@ GL_GENERATE_IEEE754_H_CONDITION = @GL_GENERATE_IEEE754_H_CONDITION@
GL_GENERATE_STDINT_H = @GL_GENERATE_STDINT_H@ GL_GENERATE_LIMITS_H_CONDITION = @GL_GENERATE_LIMITS_H_CONDITION@
GL_GENERATE_MINI_GMP_H_CONDITION = @GL_GENERATE_MINI_GMP_H_CONDITION@
GL_GENERATE_STDALIGN_H_CONDITION = @GL_GENERATE_STDALIGN_H_CONDITION@
GL_GENERATE_STDDEF_H_CONDITION = @GL_GENERATE_STDDEF_H_CONDITION@
GL_GENERATE_STDINT_H_CONDITION = @GL_GENERATE_STDINT_H_CONDITION@
GL_GNULIB_ACCESS = @GL_GNULIB_ACCESS@ GL_GNULIB_ACCESS = @GL_GNULIB_ACCESS@
GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@ GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@
GL_GNULIB_ALPHASORT = @GL_GNULIB_ALPHASORT@ GL_GNULIB_ALPHASORT = @GL_GNULIB_ALPHASORT@
@ -556,17 +563,24 @@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
GOBJECT_LIBS = @GOBJECT_LIBS@ GOBJECT_LIBS = @GOBJECT_LIBS@
GREP = @GREP@ GREP = @GREP@
GSETTINGS_CFLAGS = @GSETTINGS_CFLAGS@ GSETTINGS_CFLAGS = @GSETTINGS_CFLAGS@
GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GSETTINGS_LIBS = @GSETTINGS_LIBS@ GSETTINGS_LIBS = @GSETTINGS_LIBS@
GSETTINGS_RULES = @GSETTINGS_RULES@
GTK_CFLAGS = @GTK_CFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@ GTK_LIBS = @GTK_LIBS@
GTK_OBJ = @GTK_OBJ@ GTK_OBJ = @GTK_OBJ@
GZIP_PROG = @GZIP_PROG@ GZIP_PROG = @GZIP_PROG@
HAIKU_CFLAGS = @HAIKU_CFLAGS@
HAIKU_CXX_OBJ = @HAIKU_CXX_OBJ@
HAIKU_LIBS = @HAIKU_LIBS@
HAIKU_OBJ = @HAIKU_OBJ@
HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@ HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
HARFBUZZ_LIBS = @HARFBUZZ_LIBS@ HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@ HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@ HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ALPHASORT = @HAVE_ALPHASORT@
HAVE_ATOLL = @HAVE_ATOLL@ HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BE_APP = @HAVE_BE_APP@
HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@ HAVE_CHOWN = @HAVE_CHOWN@
@ -600,6 +614,7 @@ HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
HAVE_DECL_POSIX_SPAWN_SETSID = @HAVE_DECL_POSIX_SPAWN_SETSID@
HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@ HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@ HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
@ -690,6 +705,10 @@ HAVE_POPEN = @HAVE_POPEN@
HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@ HAVE_POSIX_MEMALIGN = @HAVE_POSIX_MEMALIGN@
HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@ HAVE_POSIX_OPENPT = @HAVE_POSIX_OPENPT@
HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
HAVE_POSIX_SPAWNATTR_SETFLAGS = @HAVE_POSIX_SPAWNATTR_SETFLAGS@
HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = @HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@
HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP = @HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP@
HAVE_PREAD = @HAVE_PREAD@ HAVE_PREAD = @HAVE_PREAD@
HAVE_PSELECT = @HAVE_PSELECT@ HAVE_PSELECT = @HAVE_PSELECT@
HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
@ -726,6 +745,7 @@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
HAVE_SIGSET_T = @HAVE_SIGSET_T@ HAVE_SIGSET_T = @HAVE_SIGSET_T@
HAVE_SLEEP = @HAVE_SLEEP@ HAVE_SLEEP = @HAVE_SLEEP@
HAVE_SPAWN_H = @HAVE_SPAWN_H@
HAVE_STDINT_H = @HAVE_STDINT_H@ HAVE_STDINT_H = @HAVE_STDINT_H@
HAVE_STPCPY = @HAVE_STPCPY@ HAVE_STPCPY = @HAVE_STPCPY@
HAVE_STPNCPY = @HAVE_STPNCPY@ HAVE_STPNCPY = @HAVE_STPNCPY@
@ -923,6 +943,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PAXCTL = @PAXCTL@ PAXCTL = @PAXCTL@
PAXCTL_dumped = @PAXCTL_dumped@ PAXCTL_dumped = @PAXCTL_dumped@
PAXCTL_notdumped = @PAXCTL_notdumped@ PAXCTL_notdumped = @PAXCTL_notdumped@
PGTK_LIBS = @PGTK_LIBS@
PGTK_OBJ = @PGTK_OBJ@
PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -1104,6 +1126,7 @@ SETTINGS_LIBS = @SETTINGS_LIBS@
SHELL = @SHELL@ SHELL = @SHELL@
SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
SQLITE3_LIBS = @SQLITE3_LIBS@
STDALIGN_H = @STDALIGN_H@ STDALIGN_H = @STDALIGN_H@
STDDEF_H = @STDDEF_H@ STDDEF_H = @STDDEF_H@
STDINT_H = @STDINT_H@ STDINT_H = @STDINT_H@
@ -1132,6 +1155,8 @@ WARN_CFLAGS = @WARN_CFLAGS@
WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
WEBKIT_LIBS = @WEBKIT_LIBS@ WEBKIT_LIBS = @WEBKIT_LIBS@
WEBP_CFLAGS = @WEBP_CFLAGS@
WEBP_LIBS = @WEBP_LIBS@
WERROR_CFLAGS = @WERROR_CFLAGS@ WERROR_CFLAGS = @WERROR_CFLAGS@
WIDGET_OBJ = @WIDGET_OBJ@ WIDGET_OBJ = @WIDGET_OBJ@
WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
@ -1153,6 +1178,8 @@ XFT_LIBS = @XFT_LIBS@
XGSELOBJ = @XGSELOBJ@ XGSELOBJ = @XGSELOBJ@
XINERAMA_CFLAGS = @XINERAMA_CFLAGS@ XINERAMA_CFLAGS = @XINERAMA_CFLAGS@
XINERAMA_LIBS = @XINERAMA_LIBS@ XINERAMA_LIBS = @XINERAMA_LIBS@
XINPUT_CFLAGS = @XINPUT_CFLAGS@
XINPUT_LIBS = @XINPUT_LIBS@
XMENU_OBJ = @XMENU_OBJ@ XMENU_OBJ = @XMENU_OBJ@
XMKMF = @XMKMF@ XMKMF = @XMKMF@
XOBJ = @XOBJ@ XOBJ = @XOBJ@
@ -1162,6 +1189,7 @@ XRENDER_LIBS = @XRENDER_LIBS@
XWIDGETS_OBJ = @XWIDGETS_OBJ@ XWIDGETS_OBJ = @XWIDGETS_OBJ@
X_TOOLKIT_TYPE = @X_TOOLKIT_TYPE@ X_TOOLKIT_TYPE = @X_TOOLKIT_TYPE@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_OBJC = @ac_ct_OBJC@ ac_ct_OBJC = @ac_ct_OBJC@
archlibdir = @archlibdir@ archlibdir = @archlibdir@
bindir = @bindir@ bindir = @bindir@
@ -1188,34 +1216,35 @@ exec_prefix = @exec_prefix@
gamedir = @gamedir@ gamedir = @gamedir@
gamegroup = @gamegroup@ gamegroup = @gamegroup@
gameuser = @gameuser@ gameuser = @gameuser@
gl_GNULIB_ENABLED_03e0aaad4cb89ca757653bd367a6ccb7 = @gl_GNULIB_ENABLED_03e0aaad4cb89ca757653bd367a6ccb7@ gl_GNULIB_ENABLED_03e0aaad4cb89ca757653bd367a6ccb7_CONDITION = @gl_GNULIB_ENABLED_03e0aaad4cb89ca757653bd367a6ccb7_CONDITION@
gl_GNULIB_ENABLED_260941c0e5dc67ec9e87d1fb321c300b = @gl_GNULIB_ENABLED_260941c0e5dc67ec9e87d1fb321c300b@ gl_GNULIB_ENABLED_260941c0e5dc67ec9e87d1fb321c300b_CONDITION = @gl_GNULIB_ENABLED_260941c0e5dc67ec9e87d1fb321c300b_CONDITION@
gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31 = @gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31@ gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31_CONDITION = @gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31_CONDITION@
gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c = @gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c@ gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c_CONDITION = @gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c_CONDITION@
gl_GNULIB_ENABLED_61bcaca76b3e6f9ae55d57a1c3193bc4 = @gl_GNULIB_ENABLED_61bcaca76b3e6f9ae55d57a1c3193bc4@ gl_GNULIB_ENABLED_61bcaca76b3e6f9ae55d57a1c3193bc4_CONDITION = @gl_GNULIB_ENABLED_61bcaca76b3e6f9ae55d57a1c3193bc4_CONDITION@
gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec = @gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec@ gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec_CONDITION = @gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec_CONDITION@
gl_GNULIB_ENABLED_925677f0343de64b89a9f0c790b4104c = @gl_GNULIB_ENABLED_925677f0343de64b89a9f0c790b4104c@ gl_GNULIB_ENABLED_925677f0343de64b89a9f0c790b4104c_CONDITION = @gl_GNULIB_ENABLED_925677f0343de64b89a9f0c790b4104c_CONDITION@
gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1 = @gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1@ gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1_CONDITION = @gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1_CONDITION@
gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36 = @gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36@ gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_CONDITION = @gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_CONDITION@
gl_GNULIB_ENABLED_cloexec = @gl_GNULIB_ENABLED_cloexec@ gl_GNULIB_ENABLED_cloexec_CONDITION = @gl_GNULIB_ENABLED_cloexec_CONDITION@
gl_GNULIB_ENABLED_d3b2383720ee0e541357aa2aac598e2b = @gl_GNULIB_ENABLED_d3b2383720ee0e541357aa2aac598e2b@ gl_GNULIB_ENABLED_d3b2383720ee0e541357aa2aac598e2b_CONDITION = @gl_GNULIB_ENABLED_d3b2383720ee0e541357aa2aac598e2b_CONDITION@
gl_GNULIB_ENABLED_dirfd = @gl_GNULIB_ENABLED_dirfd@ gl_GNULIB_ENABLED_dirfd_CONDITION = @gl_GNULIB_ENABLED_dirfd_CONDITION@
gl_GNULIB_ENABLED_dynarray = @gl_GNULIB_ENABLED_dynarray@ gl_GNULIB_ENABLED_dynarray_CONDITION = @gl_GNULIB_ENABLED_dynarray_CONDITION@
gl_GNULIB_ENABLED_ef455225c00f5049c808c2eda3e76866 = @gl_GNULIB_ENABLED_ef455225c00f5049c808c2eda3e76866@ gl_GNULIB_ENABLED_ef455225c00f5049c808c2eda3e76866_CONDITION = @gl_GNULIB_ENABLED_ef455225c00f5049c808c2eda3e76866_CONDITION@
gl_GNULIB_ENABLED_euidaccess = @gl_GNULIB_ENABLED_euidaccess@ gl_GNULIB_ENABLED_euidaccess_CONDITION = @gl_GNULIB_ENABLED_euidaccess_CONDITION@
gl_GNULIB_ENABLED_getdtablesize = @gl_GNULIB_ENABLED_getdtablesize@ gl_GNULIB_ENABLED_getdtablesize_CONDITION = @gl_GNULIB_ENABLED_getdtablesize_CONDITION@
gl_GNULIB_ENABLED_getgroups = @gl_GNULIB_ENABLED_getgroups@ gl_GNULIB_ENABLED_getgroups_CONDITION = @gl_GNULIB_ENABLED_getgroups_CONDITION@
gl_GNULIB_ENABLED_lchmod = @gl_GNULIB_ENABLED_lchmod@ gl_GNULIB_ENABLED_lchmod_CONDITION = @gl_GNULIB_ENABLED_lchmod_CONDITION@
gl_GNULIB_ENABLED_open = @gl_GNULIB_ENABLED_open@ gl_GNULIB_ENABLED_open_CONDITION = @gl_GNULIB_ENABLED_open_CONDITION@
gl_GNULIB_ENABLED_rawmemchr = @gl_GNULIB_ENABLED_rawmemchr@ gl_GNULIB_ENABLED_rawmemchr_CONDITION = @gl_GNULIB_ENABLED_rawmemchr_CONDITION@
gl_GNULIB_ENABLED_scratch_buffer = @gl_GNULIB_ENABLED_scratch_buffer@ gl_GNULIB_ENABLED_scratch_buffer_CONDITION = @gl_GNULIB_ENABLED_scratch_buffer_CONDITION@
gl_GNULIB_ENABLED_strtoll = @gl_GNULIB_ENABLED_strtoll@ gl_GNULIB_ENABLED_strtoll_CONDITION = @gl_GNULIB_ENABLED_strtoll_CONDITION@
gl_GNULIB_ENABLED_utimens = @gl_GNULIB_ENABLED_utimens@ gl_GNULIB_ENABLED_utimens_CONDITION = @gl_GNULIB_ENABLED_utimens_CONDITION@
gl_LIBOBJS = @gl_LIBOBJS@ gl_LIBOBJS = @gl_LIBOBJS@
gl_LTLIBOBJS = @gl_LTLIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@
gltests_LIBOBJS = @gltests_LIBOBJS@ gltests_LIBOBJS = @gltests_LIBOBJS@
gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
gltests_WITNESS = @gltests_WITNESS@ gltests_WITNESS = @gltests_WITNESS@
gsettingsschemadir = @gsettingsschemadir@
host = @host@ host = @host@
host_alias = @host_alias@ host_alias = @host_alias@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
@ -1296,9 +1325,10 @@ BUILT_SOURCES += $(ALLOCA_H)
# We need the following in order to create <alloca.h> when the system # We need the following in order to create <alloca.h> when the system
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
ifneq (,$(GL_GENERATE_ALLOCA_H)) ifneq (,$(GL_GENERATE_ALLOCA_H_CONDITION))
alloca.h: alloca.in.h $(top_builddir)/config.status alloca.h: alloca.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' < $(srcdir)/alloca.in.h; \ sed -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' < $(srcdir)/alloca.in.h; \
} > $@-t && \ } > $@-t && \
@ -1327,7 +1357,7 @@ endif
## begin gnulib module at-internal ## begin gnulib module at-internal
ifeq (,$(OMIT_GNULIB_MODULE_at-internal)) ifeq (,$(OMIT_GNULIB_MODULE_at-internal))
ifneq (,$(gl_GNULIB_ENABLED_260941c0e5dc67ec9e87d1fb321c300b)) ifneq (,$(gl_GNULIB_ENABLED_260941c0e5dc67ec9e87d1fb321c300b_CONDITION))
libgnu_a_SOURCES += openat-priv.h openat-proc.c libgnu_a_SOURCES += openat-priv.h openat-proc.c
endif endif
@ -1358,9 +1388,10 @@ BUILT_SOURCES += $(BYTESWAP_H)
# We need the following in order to create <byteswap.h> when the system # We need the following in order to create <byteswap.h> when the system
# doesn't have one. # doesn't have one.
ifneq (,$(GL_GENERATE_BYTESWAP_H)) ifneq (,$(GL_GENERATE_BYTESWAP_H_CONDITION))
byteswap.h: byteswap.in.h $(top_builddir)/config.status byteswap.h: byteswap.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/byteswap.in.h; \ cat $(srcdir)/byteswap.in.h; \
} > $@-t && \ } > $@-t && \
@ -1416,7 +1447,7 @@ endif
## begin gnulib module cloexec ## begin gnulib module cloexec
ifeq (,$(OMIT_GNULIB_MODULE_cloexec)) ifeq (,$(OMIT_GNULIB_MODULE_cloexec))
ifneq (,$(gl_GNULIB_ENABLED_cloexec)) ifneq (,$(gl_GNULIB_ENABLED_cloexec_CONDITION))
libgnu_a_SOURCES += cloexec.c libgnu_a_SOURCES += cloexec.c
endif endif
@ -1541,6 +1572,7 @@ BUILT_SOURCES += dirent.h
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \ -e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \
@ -1585,7 +1617,7 @@ endif
## begin gnulib module dirfd ## begin gnulib module dirfd
ifeq (,$(OMIT_GNULIB_MODULE_dirfd)) ifeq (,$(OMIT_GNULIB_MODULE_dirfd))
ifneq (,$(gl_GNULIB_ENABLED_dirfd)) ifneq (,$(gl_GNULIB_ENABLED_dirfd_CONDITION))
endif endif
EXTRA_DIST += dirfd.c EXTRA_DIST += dirfd.c
@ -1629,11 +1661,11 @@ endif
## begin gnulib module dynarray ## begin gnulib module dynarray
ifeq (,$(OMIT_GNULIB_MODULE_dynarray)) ifeq (,$(OMIT_GNULIB_MODULE_dynarray))
ifneq (,$(gl_GNULIB_ENABLED_dynarray)) ifneq (,$(gl_GNULIB_ENABLED_dynarray_CONDITION))
BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h
malloc/dynarray.gl.h: malloc/dynarray.h malloc/dynarray.gl.h: malloc/dynarray.h
$(AM_V_at)$(MKDIR_P) malloc $(AM_V_at)$(MKDIR_P) 'malloc'
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e '/libc_hidden_proto/d' < $(srcdir)/malloc/dynarray.h; \ sed -e '/libc_hidden_proto/d' < $(srcdir)/malloc/dynarray.h; \
@ -1642,7 +1674,7 @@ malloc/dynarray.gl.h: malloc/dynarray.h
MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t
malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c
$(AM_V_at)$(MKDIR_P) malloc $(AM_V_at)$(MKDIR_P) 'malloc'
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \ sed -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \
@ -1669,7 +1701,7 @@ endif
## begin gnulib module eloop-threshold ## begin gnulib module eloop-threshold
ifeq (,$(OMIT_GNULIB_MODULE_eloop-threshold)) ifeq (,$(OMIT_GNULIB_MODULE_eloop-threshold))
ifneq (,$(gl_GNULIB_ENABLED_925677f0343de64b89a9f0c790b4104c)) ifneq (,$(gl_GNULIB_ENABLED_925677f0343de64b89a9f0c790b4104c_CONDITION))
endif endif
EXTRA_DIST += eloop-threshold.h EXTRA_DIST += eloop-threshold.h
@ -1684,9 +1716,10 @@ BUILT_SOURCES += $(ERRNO_H)
# We need the following in order to create <errno.h> when the system # We need the following in order to create <errno.h> when the system
# doesn't have one that is POSIX compliant. # doesn't have one that is POSIX compliant.
ifneq (,$(GL_GENERATE_ERRNO_H)) ifneq (,$(GL_GENERATE_ERRNO_H_CONDITION))
errno.h: errno.in.h $(top_builddir)/config.status errno.h: errno.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@ -1716,7 +1749,7 @@ endif
## begin gnulib module euidaccess ## begin gnulib module euidaccess
ifeq (,$(OMIT_GNULIB_MODULE_euidaccess)) ifeq (,$(OMIT_GNULIB_MODULE_euidaccess))
ifneq (,$(gl_GNULIB_ENABLED_euidaccess)) ifneq (,$(gl_GNULIB_ENABLED_euidaccess_CONDITION))
endif endif
EXTRA_DIST += euidaccess.c EXTRA_DIST += euidaccess.c
@ -1733,9 +1766,10 @@ BUILT_SOURCES += $(EXECINFO_H)
# We need the following in order to create <execinfo.h> when the system # We need the following in order to create <execinfo.h> when the system
# doesn't have one that works. # doesn't have one that works.
ifneq (,$(GL_GENERATE_EXECINFO_H)) ifneq (,$(GL_GENERATE_EXECINFO_H_CONDITION))
execinfo.h: execinfo.in.h $(top_builddir)/config.status execinfo.h: execinfo.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/execinfo.in.h; \ cat $(srcdir)/execinfo.in.h; \
} > $@-t && \ } > $@-t && \
@ -1806,6 +1840,7 @@ BUILT_SOURCES += fcntl.h
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@ -1966,7 +2001,7 @@ endif
## begin gnulib module getdtablesize ## begin gnulib module getdtablesize
ifeq (,$(OMIT_GNULIB_MODULE_getdtablesize)) ifeq (,$(OMIT_GNULIB_MODULE_getdtablesize))
ifneq (,$(gl_GNULIB_ENABLED_getdtablesize)) ifneq (,$(gl_GNULIB_ENABLED_getdtablesize_CONDITION))
endif endif
EXTRA_DIST += getdtablesize.c EXTRA_DIST += getdtablesize.c
@ -1979,7 +2014,7 @@ endif
## begin gnulib module getgroups ## begin gnulib module getgroups
ifeq (,$(OMIT_GNULIB_MODULE_getgroups)) ifeq (,$(OMIT_GNULIB_MODULE_getgroups))
ifneq (,$(gl_GNULIB_ENABLED_getgroups)) ifneq (,$(gl_GNULIB_ENABLED_getgroups_CONDITION))
endif endif
EXTRA_DIST += getgroups.c EXTRA_DIST += getgroups.c
@ -2007,8 +2042,10 @@ BUILT_SOURCES += $(GETOPT_H) $(GETOPT_CDEFS_H)
# We need the following in order to create <getopt.h> when the system # We need the following in order to create <getopt.h> when the system
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
ifneq (,$(GL_GENERATE_GETOPT_H_CONDITION))
getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
@ -2020,7 +2057,12 @@ getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
< $(srcdir)/getopt.in.h; \ < $(srcdir)/getopt.in.h; \
} > $@-t && \ } > $@-t && \
mv -f $@-t $@ mv -f $@-t $@
else
getopt.h: $(top_builddir)/config.status
rm -f $@
endif
ifneq (,$(GL_GENERATE_GETOPT_CDEFS_H_CONDITION))
getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@ -2028,6 +2070,10 @@ getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status
< $(srcdir)/getopt-cdefs.in.h; \ < $(srcdir)/getopt-cdefs.in.h; \
} > $@-t && \ } > $@-t && \
mv -f $@-t $@ mv -f $@-t $@
else
getopt-cdefs.h: $(top_builddir)/config.status
rm -f $@
endif
MOSTLYCLEANFILES += getopt.h getopt.h-t getopt-cdefs.h getopt-cdefs.h-t MOSTLYCLEANFILES += getopt.h getopt.h-t getopt-cdefs.h getopt-cdefs.h-t
@ -2052,7 +2098,7 @@ endif
## begin gnulib module gettext-h ## begin gnulib module gettext-h
ifeq (,$(OMIT_GNULIB_MODULE_gettext-h)) ifeq (,$(OMIT_GNULIB_MODULE_gettext-h))
ifneq (,$(gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36)) ifneq (,$(gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_CONDITION))
libgnu_a_SOURCES += gettext.h libgnu_a_SOURCES += gettext.h
endif endif
@ -2090,7 +2136,7 @@ endif
## begin gnulib module group-member ## begin gnulib module group-member
ifeq (,$(OMIT_GNULIB_MODULE_group-member)) ifeq (,$(OMIT_GNULIB_MODULE_group-member))
ifneq (,$(gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1)) ifneq (,$(gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1_CONDITION))
endif endif
EXTRA_DIST += group-member.c EXTRA_DIST += group-member.c
@ -2115,9 +2161,10 @@ BUILT_SOURCES += $(IEEE754_H)
# We need the following in order to create <ieee754.h> when the system # We need the following in order to create <ieee754.h> when the system
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
ifneq (,$(GL_GENERATE_IEEE754_H)) ifneq (,$(GL_GENERATE_IEEE754_H_CONDITION))
ieee754.h: ieee754.in.h $(top_builddir)/config.status ieee754.h: ieee754.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t && \ $(AM_V_GEN)rm -f $@-t && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/ifndef _GL_GNULIB_HEADER/if 0/g' \ sed -e 's/ifndef _GL_GNULIB_HEADER/if 0/g' \
$(srcdir)/ieee754.in.h; \ $(srcdir)/ieee754.in.h; \
@ -2161,6 +2208,7 @@ BUILT_SOURCES += inttypes.h
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@ -2200,7 +2248,7 @@ endif
## begin gnulib module lchmod ## begin gnulib module lchmod
ifeq (,$(OMIT_GNULIB_MODULE_lchmod)) ifeq (,$(OMIT_GNULIB_MODULE_lchmod))
ifneq (,$(gl_GNULIB_ENABLED_lchmod)) ifneq (,$(gl_GNULIB_ENABLED_lchmod_CONDITION))
endif endif
EXTRA_DIST += lchmod.c EXTRA_DIST += lchmod.c
@ -2224,22 +2272,25 @@ ifeq (,$(OMIT_GNULIB_MODULE_libgmp))
BUILT_SOURCES += $(GMP_H) BUILT_SOURCES += $(GMP_H)
ifneq (,$(GL_GENERATE_MINI_GMP_H)) ifneq (,$(GL_GENERATE_GMP_H_CONDITION))
ifneq (,$(GL_GENERATE_MINI_GMP_H_CONDITION))
# Build gmp.h as a wrapper for mini-gmp.h when using mini-gmp. # Build gmp.h as a wrapper for mini-gmp.h when using mini-gmp.
gmp.h: $(top_builddir)/config.status gmp.h: $(top_builddir)/config.status
echo '#include "mini-gmp.h"' >$@-t $(MKDIR_P) '.'
echo '#include "mini-gmp.h"' > $@-t
mv $@-t $@ mv $@-t $@
else endif
ifneq (,$(GL_GENERATE_GMP_GMP_H)) ifneq (,$(GL_GENERATE_GMP_GMP_H_CONDITION))
# Build gmp.h as a wrapper for gmp/gmp.h. # Build gmp.h as a wrapper for gmp/gmp.h.
gmp.h: $(top_builddir)/config.status gmp.h: $(top_builddir)/config.status
echo '#include <gmp/gmp.h>' >$@-t $(MKDIR_P) '.'
echo '#include <gmp/gmp.h>' > $@-t
mv $@-t $@ mv $@-t $@
endif
else else
gmp.h: $(top_builddir)/config.status gmp.h: $(top_builddir)/config.status
rm -f $@ rm -f $@
endif endif
endif
MOSTLYCLEANFILES += gmp.h gmp.h-t MOSTLYCLEANFILES += gmp.h gmp.h-t
EXTRA_DIST += mini-gmp-gnulib.c mini-gmp.c mini-gmp.h EXTRA_DIST += mini-gmp-gnulib.c mini-gmp.c mini-gmp.h
@ -2256,9 +2307,10 @@ BUILT_SOURCES += $(LIMITS_H)
# We need the following in order to create <limits.h> when the system # We need the following in order to create <limits.h> when the system
# doesn't have one that is compatible with GNU. # doesn't have one that is compatible with GNU.
ifneq (,$(GL_GENERATE_LIMITS_H)) ifneq (,$(GL_GENERATE_LIMITS_H_CONDITION))
limits.h: limits.in.h $(top_builddir)/config.status limits.h: limits.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@ -2293,7 +2345,7 @@ endif
## begin gnulib module malloc-posix ## begin gnulib module malloc-posix
ifeq (,$(OMIT_GNULIB_MODULE_malloc-posix)) ifeq (,$(OMIT_GNULIB_MODULE_malloc-posix))
ifneq (,$(gl_GNULIB_ENABLED_ef455225c00f5049c808c2eda3e76866)) ifneq (,$(gl_GNULIB_ENABLED_ef455225c00f5049c808c2eda3e76866_CONDITION))
endif endif
EXTRA_DIST += malloc.c EXTRA_DIST += malloc.c
@ -2369,7 +2421,7 @@ endif
## begin gnulib module mktime-internal ## begin gnulib module mktime-internal
ifeq (,$(OMIT_GNULIB_MODULE_mktime-internal)) ifeq (,$(OMIT_GNULIB_MODULE_mktime-internal))
ifneq (,$(gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31)) ifneq (,$(gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31_CONDITION))
endif endif
EXTRA_DIST += mktime-internal.h mktime.c EXTRA_DIST += mktime-internal.h mktime.c
@ -2402,7 +2454,7 @@ endif
## begin gnulib module open ## begin gnulib module open
ifeq (,$(OMIT_GNULIB_MODULE_open)) ifeq (,$(OMIT_GNULIB_MODULE_open))
ifneq (,$(gl_GNULIB_ENABLED_open)) ifneq (,$(gl_GNULIB_ENABLED_open_CONDITION))
endif endif
EXTRA_DIST += open.c EXTRA_DIST += open.c
@ -2415,7 +2467,7 @@ endif
## begin gnulib module openat-h ## begin gnulib module openat-h
ifeq (,$(OMIT_GNULIB_MODULE_openat-h)) ifeq (,$(OMIT_GNULIB_MODULE_openat-h))
ifneq (,$(gl_GNULIB_ENABLED_03e0aaad4cb89ca757653bd367a6ccb7)) ifneq (,$(gl_GNULIB_ENABLED_03e0aaad4cb89ca757653bd367a6ccb7_CONDITION))
endif endif
EXTRA_DIST += openat.h EXTRA_DIST += openat.h
@ -2473,7 +2525,7 @@ endif
## begin gnulib module rawmemchr ## begin gnulib module rawmemchr
ifeq (,$(OMIT_GNULIB_MODULE_rawmemchr)) ifeq (,$(OMIT_GNULIB_MODULE_rawmemchr))
ifneq (,$(gl_GNULIB_ENABLED_rawmemchr)) ifneq (,$(gl_GNULIB_ENABLED_rawmemchr_CONDITION))
endif endif
EXTRA_DIST += rawmemchr.c rawmemchr.valgrind EXTRA_DIST += rawmemchr.c rawmemchr.valgrind
@ -2508,7 +2560,7 @@ endif
## begin gnulib module realloc-gnu ## begin gnulib module realloc-gnu
ifeq (,$(OMIT_GNULIB_MODULE_realloc-gnu)) ifeq (,$(OMIT_GNULIB_MODULE_realloc-gnu))
ifneq (,$(gl_GNULIB_ENABLED_d3b2383720ee0e541357aa2aac598e2b)) ifneq (,$(gl_GNULIB_ENABLED_d3b2383720ee0e541357aa2aac598e2b_CONDITION))
endif endif
EXTRA_DIST += realloc.c EXTRA_DIST += realloc.c
@ -2521,7 +2573,7 @@ endif
## begin gnulib module realloc-posix ## begin gnulib module realloc-posix
ifeq (,$(OMIT_GNULIB_MODULE_realloc-posix)) ifeq (,$(OMIT_GNULIB_MODULE_realloc-posix))
ifneq (,$(gl_GNULIB_ENABLED_61bcaca76b3e6f9ae55d57a1c3193bc4)) ifneq (,$(gl_GNULIB_ENABLED_61bcaca76b3e6f9ae55d57a1c3193bc4_CONDITION))
endif endif
EXTRA_DIST += realloc.c EXTRA_DIST += realloc.c
@ -2545,7 +2597,7 @@ endif
## begin gnulib module root-uid ## begin gnulib module root-uid
ifeq (,$(OMIT_GNULIB_MODULE_root-uid)) ifeq (,$(OMIT_GNULIB_MODULE_root-uid))
ifneq (,$(gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c)) ifneq (,$(gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c_CONDITION))
endif endif
EXTRA_DIST += root-uid.h EXTRA_DIST += root-uid.h
@ -2556,11 +2608,11 @@ endif
## begin gnulib module scratch_buffer ## begin gnulib module scratch_buffer
ifeq (,$(OMIT_GNULIB_MODULE_scratch_buffer)) ifeq (,$(OMIT_GNULIB_MODULE_scratch_buffer))
ifneq (,$(gl_GNULIB_ENABLED_scratch_buffer)) ifneq (,$(gl_GNULIB_ENABLED_scratch_buffer_CONDITION))
BUILT_SOURCES += malloc/scratch_buffer.gl.h BUILT_SOURCES += malloc/scratch_buffer.gl.h
malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h
$(AM_V_at)$(MKDIR_P) malloc $(AM_V_at)$(MKDIR_P) 'malloc'
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ sed -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \
@ -2611,6 +2663,7 @@ BUILT_SOURCES += signal.h
# doesn't have a complete one. # doesn't have a complete one.
signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@ -2719,9 +2772,10 @@ BUILT_SOURCES += $(STDALIGN_H)
# We need the following in order to create <stdalign.h> when the system # We need the following in order to create <stdalign.h> when the system
# doesn't have one that works. # doesn't have one that works.
ifneq (,$(GL_GENERATE_STDALIGN_H)) ifneq (,$(GL_GENERATE_STDALIGN_H_CONDITION))
stdalign.h: stdalign.in.h $(top_builddir)/config.status stdalign.h: stdalign.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/stdalign.in.h; \ cat $(srcdir)/stdalign.in.h; \
} > $@-t && \ } > $@-t && \
@ -2744,9 +2798,10 @@ BUILT_SOURCES += $(STDDEF_H)
# We need the following in order to create <stddef.h> when the system # We need the following in order to create <stddef.h> when the system
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
ifneq (,$(GL_GENERATE_STDDEF_H)) ifneq (,$(GL_GENERATE_STDDEF_H_CONDITION))
stddef.h: stddef.in.h $(top_builddir)/config.status stddef.h: stddef.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@ -2777,9 +2832,10 @@ BUILT_SOURCES += $(STDINT_H)
# We need the following in order to create <stdint.h> when the system # We need the following in order to create <stdint.h> when the system
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
ifneq (,$(GL_GENERATE_STDINT_H)) ifneq (,$(GL_GENERATE_STDINT_H_CONDITION))
stdint.h: stdint.in.h $(top_builddir)/config.status stdint.h: stdint.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
@ -2831,6 +2887,7 @@ BUILT_SOURCES += stdio.h
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@ -2969,6 +3026,7 @@ BUILT_SOURCES += stdlib.h
stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
$(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@ -3125,6 +3183,7 @@ BUILT_SOURCES += string.h
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@ -3256,7 +3315,7 @@ endif
## begin gnulib module strtoll ## begin gnulib module strtoll
ifeq (,$(OMIT_GNULIB_MODULE_strtoll)) ifeq (,$(OMIT_GNULIB_MODULE_strtoll))
ifneq (,$(gl_GNULIB_ENABLED_strtoll)) ifneq (,$(gl_GNULIB_ENABLED_strtoll_CONDITION))
endif endif
EXTRA_DIST += strtol.c strtoll.c EXTRA_DIST += strtol.c strtoll.c
@ -3285,7 +3344,7 @@ BUILT_SOURCES += sys/random.h
# We need the following in order to create <sys/random.h> when the system # We need the following in order to create <sys/random.h> when the system
# doesn't have one. # doesn't have one.
sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_at)$(MKDIR_P) sys $(AM_V_at)$(MKDIR_P) 'sys'
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@ -3319,7 +3378,7 @@ BUILT_SOURCES += sys/select.h
# We need the following in order to create <sys/select.h> when the system # We need the following in order to create <sys/select.h> when the system
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_at)$(MKDIR_P) sys $(AM_V_at)$(MKDIR_P) 'sys'
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@ -3355,7 +3414,7 @@ BUILT_SOURCES += sys/stat.h
# We need the following in order to create <sys/stat.h> when the system # We need the following in order to create <sys/stat.h> when the system
# has one that is incomplete. # has one that is incomplete.
sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_at)$(MKDIR_P) sys $(AM_V_at)$(MKDIR_P) 'sys'
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@ -3430,7 +3489,7 @@ BUILT_SOURCES += sys/time.h
# We need the following in order to create <sys/time.h> when the system # We need the following in order to create <sys/time.h> when the system
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_at)$(MKDIR_P) sys $(AM_V_at)$(MKDIR_P) 'sys'
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@ -3466,7 +3525,7 @@ BUILT_SOURCES += sys/types.h
# We need the following in order to create <sys/types.h> when the system # We need the following in order to create <sys/types.h> when the system
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
sys/types.h: sys_types.in.h $(top_builddir)/config.status sys/types.h: sys_types.in.h $(top_builddir)/config.status
$(AM_V_at)$(MKDIR_P) sys $(AM_V_at)$(MKDIR_P) 'sys'
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@ -3505,6 +3564,7 @@ BUILT_SOURCES += time.h
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@ -3635,6 +3695,7 @@ libgnu_a_SOURCES += unistd.c
# <unistd.h> when the system doesn't have one. # <unistd.h> when the system doesn't have one.
unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \ $(AM_V_GEN)rm -f $@-t $@ && \
$(MKDIR_P) '.' && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
@ -3853,7 +3914,7 @@ endif
## begin gnulib module utimens ## begin gnulib module utimens
ifeq (,$(OMIT_GNULIB_MODULE_utimens)) ifeq (,$(OMIT_GNULIB_MODULE_utimens))
ifneq (,$(gl_GNULIB_ENABLED_utimens)) ifneq (,$(gl_GNULIB_ENABLED_utimens_CONDITION))
libgnu_a_SOURCES += utimens.c libgnu_a_SOURCES += utimens.c
endif endif
@ -3894,7 +3955,7 @@ endif
## begin gnulib module xalloc-oversized ## begin gnulib module xalloc-oversized
ifeq (,$(OMIT_GNULIB_MODULE_xalloc-oversized)) ifeq (,$(OMIT_GNULIB_MODULE_xalloc-oversized))
ifneq (,$(gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec)) ifneq (,$(gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec_CONDITION))
endif endif
EXTRA_DIST += xalloc-oversized.h EXTRA_DIST += xalloc-oversized.h

15
lib/intprops.h
View file

@ -229,18 +229,18 @@
/* True if __builtin_add_overflow (A, B, P) and __builtin_sub_overflow /* True if __builtin_add_overflow (A, B, P) and __builtin_sub_overflow
(A, B, P) work when P is non-null. */ (A, B, P) work when P is non-null. */
#if defined __has_builtin
# define _GL_HAS_BUILTIN_ADD_OVERFLOW __has_builtin (__builtin_add_overflow)
/* __builtin_{add,sub}_overflow exists but is not reliable in GCC 5.x and 6.x, /* __builtin_{add,sub}_overflow exists but is not reliable in GCC 5.x and 6.x,
see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98269>. */ see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98269>. */
#if 7 <= __GNUC__ && !defined __ICC #elif 7 <= __GNUC__ && !defined __EDG__
# define _GL_HAS_BUILTIN_ADD_OVERFLOW 1 # define _GL_HAS_BUILTIN_ADD_OVERFLOW 1
#elif defined __has_builtin
# define _GL_HAS_BUILTIN_ADD_OVERFLOW __has_builtin (__builtin_add_overflow)
#else #else
# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0 # define _GL_HAS_BUILTIN_ADD_OVERFLOW 0
#endif #endif
/* True if __builtin_mul_overflow (A, B, P) works when P is non-null. */ /* True if __builtin_mul_overflow (A, B, P) works when P is non-null. */
#ifdef __clang__ #if defined __clang_major_ && __clang_major__ < 14
/* Work around Clang bug <https://bugs.llvm.org/show_bug.cgi?id=16404>. */ /* Work around Clang bug <https://bugs.llvm.org/show_bug.cgi?id=16404>. */
# define _GL_HAS_BUILTIN_MUL_OVERFLOW 0 # define _GL_HAS_BUILTIN_MUL_OVERFLOW 0
#else #else
@ -249,9 +249,8 @@
/* True if __builtin_add_overflow_p (A, B, C) works, and similarly for /* True if __builtin_add_overflow_p (A, B, C) works, and similarly for
__builtin_sub_overflow_p and __builtin_mul_overflow_p. */ __builtin_sub_overflow_p and __builtin_mul_overflow_p. */
#if defined __clang__ || defined __ICC #ifdef __EDG__
/* Clang 11 lacks __builtin_mul_overflow_p, and even if it did it /* In EDG-based compilers like ICC 2021.3 and earlier,
would presumably run afoul of Clang bug 16404. ICC 2021.1's
__builtin_add_overflow_p etc. are not treated as integral constant __builtin_add_overflow_p etc. are not treated as integral constant
expressions even when all arguments are. */ expressions even when all arguments are. */
# define _GL_HAS_BUILTIN_OVERFLOW_P 0 # define _GL_HAS_BUILTIN_OVERFLOW_P 0
@ -400,7 +399,7 @@
#if _GL_HAS_BUILTIN_MUL_OVERFLOW #if _GL_HAS_BUILTIN_MUL_OVERFLOW
# if ((9 < __GNUC__ + (3 <= __GNUC_MINOR__) \ # if ((9 < __GNUC__ + (3 <= __GNUC_MINOR__) \
|| (__GNUC__ == 8 && 4 <= __GNUC_MINOR__)) \ || (__GNUC__ == 8 && 4 <= __GNUC_MINOR__)) \
&& !defined __ICC) && !defined __EDG__)
# define INT_MULTIPLY_WRAPV(a, b, r) __builtin_mul_overflow (a, b, r) # define INT_MULTIPLY_WRAPV(a, b, r) __builtin_mul_overflow (a, b, r)
# else # else
/* Work around GCC bug 91450. */ /* Work around GCC bug 91450. */

5
lib/nproc.c
View file

@ -307,10 +307,11 @@ num_processors_ignoring_omp (enum nproc_query query)
NPROC_CURRENT and NPROC_ALL. */ NPROC_CURRENT and NPROC_ALL. */
#if HAVE_SYSCTL && ! defined __GLIBC__ && defined HW_NCPU #if HAVE_SYSCTL && ! defined __GLIBC__ && defined HW_NCPU
{ /* This works on Mac OS X, FreeBSD, NetBSD, OpenBSD. */ { /* This works on macOS, FreeBSD, NetBSD, OpenBSD.
macOS 10.14 does not allow mib to be const. */
int nprocs; int nprocs;
size_t len = sizeof (nprocs); size_t len = sizeof (nprocs);
static int const mib[][2] = { static int mib[][2] = {
# ifdef HW_NCPUONLINE # ifdef HW_NCPUONLINE
{ CTL_HW, HW_NCPUONLINE }, { CTL_HW, HW_NCPUONLINE },
# endif # endif

9
lib/nstrftime.c
View file

@ -22,7 +22,7 @@
# define HAVE_TZNAME 1 # define HAVE_TZNAME 1
# include "../locale/localeinfo.h" # include "../locale/localeinfo.h"
#else #else
# include <config.h> # include <libc-config.h>
# if FPRINTFTIME # if FPRINTFTIME
# include "fprintftime.h" # include "fprintftime.h"
# else # else
@ -367,10 +367,7 @@ tm_diff (const struct tm *a, const struct tm *b)
#define ISO_WEEK1_WDAY 4 /* Thursday */ #define ISO_WEEK1_WDAY 4 /* Thursday */
#define YDAY_MINIMUM (-366) #define YDAY_MINIMUM (-366)
static int iso_week_days (int, int); static int iso_week_days (int, int);
#if defined __GNUC__ || defined __clang__ static __inline int
__inline__
#endif
static int
iso_week_days (int yday, int wday) iso_week_days (int yday, int wday)
{ {
/* Add enough to the first operand of % to make it nonnegative. */ /* Add enough to the first operand of % to make it nonnegative. */
@ -428,9 +425,7 @@ my_strftime (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
return __strftime_internal (s, STRFTIME_ARG (maxsize) format, tp, false, return __strftime_internal (s, STRFTIME_ARG (maxsize) format, tp, false,
0, -1, &tzset_called extra_args LOCALE_ARG); 0, -1, &tzset_called extra_args LOCALE_ARG);
} }
#if defined _LIBC && ! FPRINTFTIME
libc_hidden_def (my_strftime) libc_hidden_def (my_strftime)
#endif
/* Just like my_strftime, above, but with more parameters. /* Just like my_strftime, above, but with more parameters.
UPCASE indicates that the result should be converted to upper case. UPCASE indicates that the result should be converted to upper case.

859
lib/regcomp.c
View file

File diff suppressed because it is too large Load diff

40
lib/regex_internal.c
View file

@ -30,10 +30,8 @@ static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa,
re_hashval_t hash); re_hashval_t hash);
static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr, static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
Idx new_buf_len); Idx new_buf_len);
#ifdef RE_ENABLE_I18N
static void build_wcs_buffer (re_string_t *pstr); static void build_wcs_buffer (re_string_t *pstr);
static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr); static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr);
#endif /* RE_ENABLE_I18N */
static void build_upper_buffer (re_string_t *pstr); static void build_upper_buffer (re_string_t *pstr);
static void re_string_translate_buffer (re_string_t *pstr); static void re_string_translate_buffer (re_string_t *pstr);
static unsigned int re_string_context_at (const re_string_t *input, Idx idx, static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
@ -91,7 +89,6 @@ re_string_construct (re_string_t *pstr, const char *str, Idx len,
if (icase) if (icase)
{ {
#ifdef RE_ENABLE_I18N
if (dfa->mb_cur_max > 1) if (dfa->mb_cur_max > 1)
{ {
while (1) while (1)
@ -109,16 +106,13 @@ re_string_construct (re_string_t *pstr, const char *str, Idx len,
} }
} }
else else
#endif /* RE_ENABLE_I18N */
build_upper_buffer (pstr); build_upper_buffer (pstr);
} }
else else
{ {
#ifdef RE_ENABLE_I18N
if (dfa->mb_cur_max > 1) if (dfa->mb_cur_max > 1)
build_wcs_buffer (pstr); build_wcs_buffer (pstr);
else else
#endif /* RE_ENABLE_I18N */
{ {
if (trans != NULL) if (trans != NULL)
re_string_translate_buffer (pstr); re_string_translate_buffer (pstr);
@ -139,7 +133,6 @@ static reg_errcode_t
__attribute_warn_unused_result__ __attribute_warn_unused_result__
re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len) re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len)
{ {
#ifdef RE_ENABLE_I18N
if (pstr->mb_cur_max > 1) if (pstr->mb_cur_max > 1)
{ {
wint_t *new_wcs; wint_t *new_wcs;
@ -162,7 +155,6 @@ re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len)
pstr->offsets = new_offsets; pstr->offsets = new_offsets;
} }
} }
#endif /* RE_ENABLE_I18N */
if (pstr->mbs_allocated) if (pstr->mbs_allocated)
{ {
unsigned char *new_mbs = re_realloc (pstr->mbs, unsigned char, unsigned char *new_mbs = re_realloc (pstr->mbs, unsigned char,
@ -194,7 +186,6 @@ re_string_construct_common (const char *str, Idx len, re_string_t *pstr,
pstr->raw_stop = pstr->stop; pstr->raw_stop = pstr->stop;
} }
#ifdef RE_ENABLE_I18N
/* Build wide character buffer PSTR->WCS. /* Build wide character buffer PSTR->WCS.
If the byte sequence of the string are: If the byte sequence of the string are:
@ -530,7 +521,6 @@ re_string_skip_chars (re_string_t *pstr, Idx new_raw_idx, wint_t *last_wc)
*last_wc = wc; *last_wc = wc;
return rawbuf_idx; return rawbuf_idx;
} }
#endif /* RE_ENABLE_I18N */
/* Build the buffer PSTR->MBS, and apply the translation if we need. /* Build the buffer PSTR->MBS, and apply the translation if we need.
This function is used in case of REG_ICASE. */ This function is used in case of REG_ICASE. */
@ -585,10 +575,8 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
else else
{ {
/* Reset buffer. */ /* Reset buffer. */
#ifdef RE_ENABLE_I18N
if (pstr->mb_cur_max > 1) if (pstr->mb_cur_max > 1)
memset (&pstr->cur_state, '\0', sizeof (mbstate_t)); memset (&pstr->cur_state, '\0', sizeof (mbstate_t));
#endif /* RE_ENABLE_I18N */
pstr->len = pstr->raw_len; pstr->len = pstr->raw_len;
pstr->stop = pstr->raw_stop; pstr->stop = pstr->raw_stop;
pstr->valid_len = 0; pstr->valid_len = 0;
@ -608,7 +596,6 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
if (__glibc_likely (offset < pstr->valid_raw_len)) if (__glibc_likely (offset < pstr->valid_raw_len))
{ {
/* Yes, move them to the front of the buffer. */ /* Yes, move them to the front of the buffer. */
#ifdef RE_ENABLE_I18N
if (__glibc_unlikely (pstr->offsets_needed)) if (__glibc_unlikely (pstr->offsets_needed))
{ {
Idx low = 0, high = pstr->valid_len, mid; Idx low = 0, high = pstr->valid_len, mid;
@ -672,15 +659,12 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
} }
} }
else else
#endif
{ {
pstr->tip_context = re_string_context_at (pstr, offset - 1, pstr->tip_context = re_string_context_at (pstr, offset - 1,
eflags); eflags);
#ifdef RE_ENABLE_I18N
if (pstr->mb_cur_max > 1) if (pstr->mb_cur_max > 1)
memmove (pstr->wcs, pstr->wcs + offset, memmove (pstr->wcs, pstr->wcs + offset,
(pstr->valid_len - offset) * sizeof (wint_t)); (pstr->valid_len - offset) * sizeof (wint_t));
#endif /* RE_ENABLE_I18N */
if (__glibc_unlikely (pstr->mbs_allocated)) if (__glibc_unlikely (pstr->mbs_allocated))
memmove (pstr->mbs, pstr->mbs + offset, memmove (pstr->mbs, pstr->mbs + offset,
pstr->valid_len - offset); pstr->valid_len - offset);
@ -691,7 +675,6 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
} }
else else
{ {
#ifdef RE_ENABLE_I18N
/* No, skip all characters until IDX. */ /* No, skip all characters until IDX. */
Idx prev_valid_len = pstr->valid_len; Idx prev_valid_len = pstr->valid_len;
@ -701,9 +684,7 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
pstr->stop = pstr->raw_stop - idx + offset; pstr->stop = pstr->raw_stop - idx + offset;
pstr->offsets_needed = 0; pstr->offsets_needed = 0;
} }
#endif
pstr->valid_len = 0; pstr->valid_len = 0;
#ifdef RE_ENABLE_I18N
if (pstr->mb_cur_max > 1) if (pstr->mb_cur_max > 1)
{ {
Idx wcs_idx; Idx wcs_idx;
@ -787,7 +768,6 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
pstr->valid_raw_len = pstr->valid_len; pstr->valid_raw_len = pstr->valid_len;
} }
else else
#endif /* RE_ENABLE_I18N */
{ {
int c = pstr->raw_mbs[pstr->raw_mbs_idx + offset - 1]; int c = pstr->raw_mbs[pstr->raw_mbs_idx + offset - 1];
pstr->valid_raw_len = 0; pstr->valid_raw_len = 0;
@ -807,7 +787,6 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
pstr->stop -= offset; pstr->stop -= offset;
/* Then build the buffers. */ /* Then build the buffers. */
#ifdef RE_ENABLE_I18N
if (pstr->mb_cur_max > 1) if (pstr->mb_cur_max > 1)
{ {
if (pstr->icase) if (pstr->icase)
@ -820,7 +799,6 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
build_wcs_buffer (pstr); build_wcs_buffer (pstr);
} }
else else
#endif /* RE_ENABLE_I18N */
if (__glibc_unlikely (pstr->mbs_allocated)) if (__glibc_unlikely (pstr->mbs_allocated))
{ {
if (pstr->icase) if (pstr->icase)
@ -846,28 +824,22 @@ re_string_peek_byte_case (const re_string_t *pstr, Idx idx)
if (__glibc_likely (!pstr->mbs_allocated)) if (__glibc_likely (!pstr->mbs_allocated))
return re_string_peek_byte (pstr, idx); return re_string_peek_byte (pstr, idx);
#ifdef RE_ENABLE_I18N
if (pstr->mb_cur_max > 1 if (pstr->mb_cur_max > 1
&& ! re_string_is_single_byte_char (pstr, pstr->cur_idx + idx)) && ! re_string_is_single_byte_char (pstr, pstr->cur_idx + idx))
return re_string_peek_byte (pstr, idx); return re_string_peek_byte (pstr, idx);
#endif
off = pstr->cur_idx + idx; off = pstr->cur_idx + idx;
#ifdef RE_ENABLE_I18N
if (pstr->offsets_needed) if (pstr->offsets_needed)
off = pstr->offsets[off]; off = pstr->offsets[off];
#endif
ch = pstr->raw_mbs[pstr->raw_mbs_idx + off]; ch = pstr->raw_mbs[pstr->raw_mbs_idx + off];
#ifdef RE_ENABLE_I18N
/* Ensure that e.g. for tr_TR.UTF-8 BACKSLASH DOTLESS SMALL LETTER I /* Ensure that e.g. for tr_TR.UTF-8 BACKSLASH DOTLESS SMALL LETTER I
this function returns CAPITAL LETTER I instead of first byte of this function returns CAPITAL LETTER I instead of first byte of
DOTLESS SMALL LETTER I. The latter would confuse the parser, DOTLESS SMALL LETTER I. The latter would confuse the parser,
since peek_byte_case doesn't advance cur_idx in any way. */ since peek_byte_case doesn't advance cur_idx in any way. */
if (pstr->offsets_needed && !isascii (ch)) if (pstr->offsets_needed && !isascii (ch))
return re_string_peek_byte (pstr, idx); return re_string_peek_byte (pstr, idx);
#endif
return ch; return ch;
} }
@ -878,7 +850,6 @@ re_string_fetch_byte_case (re_string_t *pstr)
if (__glibc_likely (!pstr->mbs_allocated)) if (__glibc_likely (!pstr->mbs_allocated))
return re_string_fetch_byte (pstr); return re_string_fetch_byte (pstr);
#ifdef RE_ENABLE_I18N
if (pstr->offsets_needed) if (pstr->offsets_needed)
{ {
Idx off; Idx off;
@ -904,7 +875,6 @@ re_string_fetch_byte_case (re_string_t *pstr)
re_string_char_size_at (pstr, pstr->cur_idx)); re_string_char_size_at (pstr, pstr->cur_idx));
return ch; return ch;
} }
#endif
return pstr->raw_mbs[pstr->raw_mbs_idx + pstr->cur_idx++]; return pstr->raw_mbs[pstr->raw_mbs_idx + pstr->cur_idx++];
} }
@ -912,10 +882,8 @@ re_string_fetch_byte_case (re_string_t *pstr)
static void static void
re_string_destruct (re_string_t *pstr) re_string_destruct (re_string_t *pstr)
{ {
#ifdef RE_ENABLE_I18N
re_free (pstr->wcs); re_free (pstr->wcs);
re_free (pstr->offsets); re_free (pstr->offsets);
#endif /* RE_ENABLE_I18N */
if (pstr->mbs_allocated) if (pstr->mbs_allocated)
re_free (pstr->mbs); re_free (pstr->mbs);
} }
@ -933,7 +901,6 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags)
if (__glibc_unlikely (idx == input->len)) if (__glibc_unlikely (idx == input->len))
return ((eflags & REG_NOTEOL) ? CONTEXT_ENDBUF return ((eflags & REG_NOTEOL) ? CONTEXT_ENDBUF
: CONTEXT_NEWLINE | CONTEXT_ENDBUF); : CONTEXT_NEWLINE | CONTEXT_ENDBUF);
#ifdef RE_ENABLE_I18N
if (input->mb_cur_max > 1) if (input->mb_cur_max > 1)
{ {
wint_t wc; wint_t wc;
@ -953,7 +920,6 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags)
? CONTEXT_NEWLINE : 0); ? CONTEXT_NEWLINE : 0);
} }
else else
#endif
{ {
c = re_string_byte_at (input, idx); c = re_string_byte_at (input, idx);
if (bitset_contain (input->word_char, c)) if (bitset_contain (input->word_char, c))
@ -1451,11 +1417,9 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
} }
dfa->nodes[dfa->nodes_len] = token; dfa->nodes[dfa->nodes_len] = token;
dfa->nodes[dfa->nodes_len].constraint = 0; dfa->nodes[dfa->nodes_len].constraint = 0;
#ifdef RE_ENABLE_I18N
dfa->nodes[dfa->nodes_len].accept_mb = dfa->nodes[dfa->nodes_len].accept_mb =
((token.type == OP_PERIOD && dfa->mb_cur_max > 1) ((token.type == OP_PERIOD && dfa->mb_cur_max > 1)
|| token.type == COMPLEX_BRACKET); || token.type == COMPLEX_BRACKET);
#endif
dfa->nexts[dfa->nodes_len] = -1; dfa->nexts[dfa->nodes_len] = -1;
re_node_set_init_empty (dfa->edests + dfa->nodes_len); re_node_set_init_empty (dfa->edests + dfa->nodes_len);
re_node_set_init_empty (dfa->eclosures + dfa->nodes_len); re_node_set_init_empty (dfa->eclosures + dfa->nodes_len);
@ -1651,9 +1615,7 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
re_token_type_t type = node->type; re_token_type_t type = node->type;
if (type == CHARACTER && !node->constraint) if (type == CHARACTER && !node->constraint)
continue; continue;
#ifdef RE_ENABLE_I18N
newstate->accept_mb |= node->accept_mb; newstate->accept_mb |= node->accept_mb;
#endif /* RE_ENABLE_I18N */
/* If the state has the halt node, the state is a halt state. */ /* If the state has the halt node, the state is a halt state. */
if (type == END_OF_RE) if (type == END_OF_RE)
@ -1705,9 +1667,7 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
if (type == CHARACTER && !constraint) if (type == CHARACTER && !constraint)
continue; continue;
#ifdef RE_ENABLE_I18N
newstate->accept_mb |= node->accept_mb; newstate->accept_mb |= node->accept_mb;
#endif /* RE_ENABLE_I18N */
/* If the state has the halt node, the state is a halt state. */ /* If the state has the halt node, the state is a halt state. */
if (type == END_OF_RE) if (type == END_OF_RE)

49
lib/regex_internal.h
View file

@ -116,10 +116,6 @@
# define gettext_noop(String) String # define gettext_noop(String) String
#endif #endif
#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE) || _LIBC
# define RE_ENABLE_I18N
#endif
/* Number of ASCII characters. */ /* Number of ASCII characters. */
#define ASCII_CHARS 0x80 #define ASCII_CHARS 0x80
@ -150,6 +146,11 @@
# define __regfree regfree # define __regfree regfree
#endif /* not _LIBC */ #endif /* not _LIBC */
/* Types related to integers. Unless protected by #ifdef _LIBC, the
regex code should avoid exact-width types like int32_t and uint64_t
as some non-GCC platforms lack them, an issue when this code is
used in Gnulib. */
#ifndef SSIZE_MAX #ifndef SSIZE_MAX
# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
#endif #endif
@ -246,10 +247,8 @@ typedef enum
SIMPLE_BRACKET = 3, SIMPLE_BRACKET = 3,
OP_BACK_REF = 4, OP_BACK_REF = 4,
OP_PERIOD = 5, OP_PERIOD = 5,
#ifdef RE_ENABLE_I18N
COMPLEX_BRACKET = 6, COMPLEX_BRACKET = 6,
OP_UTF8_PERIOD = 7, OP_UTF8_PERIOD = 7,
#endif /* RE_ENABLE_I18N */
/* We define EPSILON_BIT as a macro so that OP_OPEN_SUBEXP is used /* We define EPSILON_BIT as a macro so that OP_OPEN_SUBEXP is used
when the debugger shows values of this enum type. */ when the debugger shows values of this enum type. */
@ -287,30 +286,29 @@ typedef enum
} re_token_type_t; } re_token_type_t;
#ifdef RE_ENABLE_I18N
typedef struct typedef struct
{ {
/* Multibyte characters. */ /* Multibyte characters. */
wchar_t *mbchars; wchar_t *mbchars;
#ifdef _LIBC
/* Collating symbols. */ /* Collating symbols. */
# ifdef _LIBC
int32_t *coll_syms; int32_t *coll_syms;
# endif #endif
#ifdef _LIBC
/* Equivalence classes. */ /* Equivalence classes. */
# ifdef _LIBC
int32_t *equiv_classes; int32_t *equiv_classes;
# endif #endif
/* Range expressions. */ /* Range expressions. */
# ifdef _LIBC #ifdef _LIBC
uint32_t *range_starts; uint32_t *range_starts;
uint32_t *range_ends; uint32_t *range_ends;
# else /* not _LIBC */ #else
wchar_t *range_starts; wchar_t *range_starts;
wchar_t *range_ends; wchar_t *range_ends;
# endif /* not _LIBC */ #endif
/* Character classes. */ /* Character classes. */
wctype_t *char_classes; wctype_t *char_classes;
@ -333,7 +331,6 @@ typedef struct
/* # of character classes. */ /* # of character classes. */
Idx nchar_classes; Idx nchar_classes;
} re_charset_t; } re_charset_t;
#endif /* RE_ENABLE_I18N */
typedef struct typedef struct
{ {
@ -341,9 +338,7 @@ typedef struct
{ {
unsigned char c; /* for CHARACTER */ unsigned char c; /* for CHARACTER */
re_bitset_ptr_t sbcset; /* for SIMPLE_BRACKET */ re_bitset_ptr_t sbcset; /* for SIMPLE_BRACKET */
#ifdef RE_ENABLE_I18N
re_charset_t *mbcset; /* for COMPLEX_BRACKET */ re_charset_t *mbcset; /* for COMPLEX_BRACKET */
#endif /* RE_ENABLE_I18N */
Idx idx; /* for BACK_REF */ Idx idx; /* for BACK_REF */
re_context_type ctx_type; /* for ANCHOR */ re_context_type ctx_type; /* for ANCHOR */
} opr; } opr;
@ -355,12 +350,10 @@ typedef struct
unsigned int constraint : 10; /* context constraint */ unsigned int constraint : 10; /* context constraint */
unsigned int duplicated : 1; unsigned int duplicated : 1;
unsigned int opt_subexp : 1; unsigned int opt_subexp : 1;
#ifdef RE_ENABLE_I18N
unsigned int accept_mb : 1; unsigned int accept_mb : 1;
/* These 2 bits can be moved into the union if needed (e.g. if running out /* These 2 bits can be moved into the union if needed (e.g. if running out
of bits; move opr.c to opr.c.c and move the flags to opr.c.flags). */ of bits; move opr.c to opr.c.c and move the flags to opr.c.flags). */
unsigned int mb_partial : 1; unsigned int mb_partial : 1;
#endif
unsigned int word_char : 1; unsigned int word_char : 1;
} re_token_t; } re_token_t;
@ -375,12 +368,10 @@ struct re_string_t
REG_ICASE, upper cases of the string are stored, otherwise MBS points REG_ICASE, upper cases of the string are stored, otherwise MBS points
the same address that RAW_MBS points. */ the same address that RAW_MBS points. */
unsigned char *mbs; unsigned char *mbs;
#ifdef RE_ENABLE_I18N
/* Store the wide character string which is corresponding to MBS. */ /* Store the wide character string which is corresponding to MBS. */
wint_t *wcs; wint_t *wcs;
Idx *offsets; Idx *offsets;
mbstate_t cur_state; mbstate_t cur_state;
#endif
/* Index in RAW_MBS. Each character mbs[i] corresponds to /* Index in RAW_MBS. Each character mbs[i] corresponds to
raw_mbs[raw_mbs_idx + i]. */ raw_mbs[raw_mbs_idx + i]. */
Idx raw_mbs_idx; Idx raw_mbs_idx;
@ -779,7 +770,6 @@ bitset_mask (bitset_t dest, const bitset_t src)
dest[bitset_i] &= src[bitset_i]; dest[bitset_i] &= src[bitset_i];
} }
#ifdef RE_ENABLE_I18N
/* Functions for re_string. */ /* Functions for re_string. */
static int static int
__attribute__ ((pure, unused)) __attribute__ ((pure, unused))
@ -803,15 +793,15 @@ re_string_wchar_at (const re_string_t *pstr, Idx idx)
return (wint_t) pstr->wcs[idx]; return (wint_t) pstr->wcs[idx];
} }
# ifdef _LIBC #ifdef _LIBC
# include <locale/weight.h> # include <locale/weight.h>
# endif #endif
static int static int
__attribute__ ((pure, unused)) __attribute__ ((pure, unused))
re_string_elem_size_at (const re_string_t *pstr, Idx idx) re_string_elem_size_at (const re_string_t *pstr, Idx idx)
{ {
# ifdef _LIBC #ifdef _LIBC
const unsigned char *p, *extra; const unsigned char *p, *extra;
const int32_t *table, *indirect; const int32_t *table, *indirect;
uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
@ -827,11 +817,10 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx)
findidx (table, indirect, extra, &p, pstr->len - idx); findidx (table, indirect, extra, &p, pstr->len - idx);
return p - pstr->mbs - idx; return p - pstr->mbs - idx;
} }
else #endif /* _LIBC */
# endif /* _LIBC */
return 1; return 1;
} }
#endif /* RE_ENABLE_I18N */
#ifdef _LIBC #ifdef _LIBC
# if __GNUC__ >= 7 # if __GNUC__ >= 7

84
lib/regexec.c
View file

@ -67,11 +67,9 @@ static reg_errcode_t set_regs (const regex_t *preg,
bool fl_backtrack); bool fl_backtrack);
static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs); static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs);
#ifdef RE_ENABLE_I18N
static int sift_states_iter_mb (const re_match_context_t *mctx, static int sift_states_iter_mb (const re_match_context_t *mctx,
re_sift_context_t *sctx, re_sift_context_t *sctx,
Idx node_idx, Idx str_idx, Idx max_str_idx); Idx node_idx, Idx str_idx, Idx max_str_idx);
#endif /* RE_ENABLE_I18N */
static reg_errcode_t sift_states_backward (const re_match_context_t *mctx, static reg_errcode_t sift_states_backward (const re_match_context_t *mctx,
re_sift_context_t *sctx); re_sift_context_t *sctx);
static reg_errcode_t build_sifted_states (const re_match_context_t *mctx, static reg_errcode_t build_sifted_states (const re_match_context_t *mctx,
@ -123,10 +121,8 @@ static re_dfastate_t *transit_state_sb (reg_errcode_t *err,
re_match_context_t *mctx, re_match_context_t *mctx,
re_dfastate_t *pstate); re_dfastate_t *pstate);
#endif #endif
#ifdef RE_ENABLE_I18N
static reg_errcode_t transit_state_mb (re_match_context_t *mctx, static reg_errcode_t transit_state_mb (re_match_context_t *mctx,
re_dfastate_t *pstate); re_dfastate_t *pstate);
#endif /* RE_ENABLE_I18N */
static reg_errcode_t transit_state_bkref (re_match_context_t *mctx, static reg_errcode_t transit_state_bkref (re_match_context_t *mctx,
const re_node_set *nodes); const re_node_set *nodes);
static reg_errcode_t get_subexp (re_match_context_t *mctx, static reg_errcode_t get_subexp (re_match_context_t *mctx,
@ -156,14 +152,12 @@ static reg_errcode_t expand_bkref_cache (re_match_context_t *mctx,
re_node_set *cur_nodes, Idx cur_str, re_node_set *cur_nodes, Idx cur_str,
Idx subexp_num, int type); Idx subexp_num, int type);
static bool build_trtable (const re_dfa_t *dfa, re_dfastate_t *state); static bool build_trtable (const re_dfa_t *dfa, re_dfastate_t *state);
#ifdef RE_ENABLE_I18N
static int check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx, static int check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
const re_string_t *input, Idx idx); const re_string_t *input, Idx idx);
# ifdef _LIBC #ifdef _LIBC
static unsigned int find_collation_sequence_value (const unsigned char *mbs, static unsigned int find_collation_sequence_value (const unsigned char *mbs,
size_t name_len); size_t name_len);
# endif /* _LIBC */ #endif
#endif /* RE_ENABLE_I18N */
static Idx group_nodes_into_DFAstates (const re_dfa_t *dfa, static Idx group_nodes_into_DFAstates (const re_dfa_t *dfa,
const re_dfastate_t *state, const re_dfastate_t *state,
re_node_set *states_node, re_node_set *states_node,
@ -758,10 +752,9 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
offset = match_first - mctx.input.raw_mbs_idx; offset = match_first - mctx.input.raw_mbs_idx;
} }
/* If MATCH_FIRST is out of the buffer, leave it as '\0'. /* Use buffer byte if OFFSET is in buffer, otherwise '\0'. */
Note that MATCH_FIRST must not be smaller than 0. */ ch = (offset < mctx.input.valid_len
ch = (match_first >= length ? re_string_byte_at (&mctx.input, offset) : 0);
? 0 : re_string_byte_at (&mctx.input, offset));
if (fastmap[ch]) if (fastmap[ch])
break; break;
match_first += incr; match_first += incr;
@ -780,12 +773,10 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
if (__glibc_unlikely (err != REG_NOERROR)) if (__glibc_unlikely (err != REG_NOERROR))
goto free_return; goto free_return;
#ifdef RE_ENABLE_I18N /* Don't consider this char as a possible match start if it part,
/* Don't consider this char as a possible match start if it part, yet isn't the head, of a multibyte character. */
yet isn't the head, of a multibyte character. */
if (!sb && !re_string_first_byte (&mctx.input, 0)) if (!sb && !re_string_first_byte (&mctx.input, 0))
continue; continue;
#endif
/* It seems to be appropriate one, then use the matcher. */ /* It seems to be appropriate one, then use the matcher. */
/* We assume that the matching starts from 0. */ /* We assume that the matching starts from 0. */
@ -859,7 +850,6 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
for (reg_idx = 0; reg_idx < nmatch; ++reg_idx) for (reg_idx = 0; reg_idx < nmatch; ++reg_idx)
if (pmatch[reg_idx].rm_so != -1) if (pmatch[reg_idx].rm_so != -1)
{ {
#ifdef RE_ENABLE_I18N
if (__glibc_unlikely (mctx.input.offsets_needed != 0)) if (__glibc_unlikely (mctx.input.offsets_needed != 0))
{ {
pmatch[reg_idx].rm_so = pmatch[reg_idx].rm_so =
@ -871,9 +861,6 @@ re_search_internal (const regex_t *preg, const char *string, Idx length,
? mctx.input.valid_raw_len ? mctx.input.valid_raw_len
: mctx.input.offsets[pmatch[reg_idx].rm_eo]); : mctx.input.offsets[pmatch[reg_idx].rm_eo]);
} }
#else
DEBUG_ASSERT (mctx.input.offsets_needed == 0);
#endif
pmatch[reg_idx].rm_so += match_first; pmatch[reg_idx].rm_so += match_first;
pmatch[reg_idx].rm_eo += match_first; pmatch[reg_idx].rm_eo += match_first;
} }
@ -997,8 +984,7 @@ prune_impossible_nodes (re_match_context_t *mctx)
We must select appropriate initial state depending on the context, We must select appropriate initial state depending on the context,
since initial states may have constraints like "\<", "^", etc.. */ since initial states may have constraints like "\<", "^", etc.. */
static inline re_dfastate_t * static __always_inline re_dfastate_t *
__attribute__ ((always_inline))
acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx, acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
Idx idx) Idx idx)
{ {
@ -1262,12 +1248,9 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
Idx naccepted = 0; Idx naccepted = 0;
re_token_type_t type = dfa->nodes[node].type; re_token_type_t type = dfa->nodes[node].type;
#ifdef RE_ENABLE_I18N
if (dfa->nodes[node].accept_mb) if (dfa->nodes[node].accept_mb)
naccepted = check_node_accept_bytes (dfa, node, &mctx->input, *pidx); naccepted = check_node_accept_bytes (dfa, node, &mctx->input, *pidx);
else else if (type == OP_BACK_REF)
#endif /* RE_ENABLE_I18N */
if (type == OP_BACK_REF)
{ {
Idx subexp_idx = dfa->nodes[node].opr.idx + 1; Idx subexp_idx = dfa->nodes[node].opr.idx + 1;
if (subexp_idx < nregs) if (subexp_idx < nregs)
@ -1635,12 +1618,10 @@ build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx,
bool ok; bool ok;
DEBUG_ASSERT (!IS_EPSILON_NODE (dfa->nodes[prev_node].type)); DEBUG_ASSERT (!IS_EPSILON_NODE (dfa->nodes[prev_node].type));
#ifdef RE_ENABLE_I18N
/* If the node may accept "multi byte". */ /* If the node may accept "multi byte". */
if (dfa->nodes[prev_node].accept_mb) if (dfa->nodes[prev_node].accept_mb)
naccepted = sift_states_iter_mb (mctx, sctx, prev_node, naccepted = sift_states_iter_mb (mctx, sctx, prev_node,
str_idx, sctx->last_str_idx); str_idx, sctx->last_str_idx);
#endif /* RE_ENABLE_I18N */
/* We don't check backreferences here. /* We don't check backreferences here.
See update_cur_sifted_state(). */ See update_cur_sifted_state(). */
@ -1689,6 +1670,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx)
if (top < next_state_log_idx) if (top < next_state_log_idx)
{ {
DEBUG_ASSERT (mctx->state_log != NULL);
memset (mctx->state_log + top + 1, '\0', memset (mctx->state_log + top + 1, '\0',
sizeof (re_dfastate_t *) * (next_state_log_idx - top)); sizeof (re_dfastate_t *) * (next_state_log_idx - top));
mctx->state_log_top = next_state_log_idx; mctx->state_log_top = next_state_log_idx;
@ -2177,7 +2159,6 @@ sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,
} }
#ifdef RE_ENABLE_I18N
static int static int
sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx, sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
Idx node_idx, Idx str_idx, Idx max_str_idx) Idx node_idx, Idx str_idx, Idx max_str_idx)
@ -2197,8 +2178,6 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
'naccepted' bytes input. */ 'naccepted' bytes input. */
return naccepted; return naccepted;
} }
#endif /* RE_ENABLE_I18N */
/* Functions for state transition. */ /* Functions for state transition. */
@ -2216,7 +2195,6 @@ transit_state (reg_errcode_t *err, re_match_context_t *mctx,
re_dfastate_t **trtable; re_dfastate_t **trtable;
unsigned char ch; unsigned char ch;
#ifdef RE_ENABLE_I18N
/* If the current state can accept multibyte. */ /* If the current state can accept multibyte. */
if (__glibc_unlikely (state->accept_mb)) if (__glibc_unlikely (state->accept_mb))
{ {
@ -2224,7 +2202,6 @@ transit_state (reg_errcode_t *err, re_match_context_t *mctx,
if (__glibc_unlikely (*err != REG_NOERROR)) if (__glibc_unlikely (*err != REG_NOERROR))
return NULL; return NULL;
} }
#endif /* RE_ENABLE_I18N */
/* Then decide the next state with the single byte. */ /* Then decide the next state with the single byte. */
#if 0 #if 0
@ -2445,7 +2422,6 @@ transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx,
} }
#endif #endif
#ifdef RE_ENABLE_I18N
static reg_errcode_t static reg_errcode_t
transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate) transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
{ {
@ -2513,7 +2489,6 @@ transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
} }
return REG_NOERROR; return REG_NOERROR;
} }
#endif /* RE_ENABLE_I18N */
static reg_errcode_t static reg_errcode_t
transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes) transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
@ -3003,9 +2978,7 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
const re_dfa_t *const dfa = mctx->dfa; const re_dfa_t *const dfa = mctx->dfa;
bool ok; bool ok;
Idx cur_idx; Idx cur_idx;
#ifdef RE_ENABLE_I18N
reg_errcode_t err = REG_NOERROR; reg_errcode_t err = REG_NOERROR;
#endif
re_node_set union_set; re_node_set union_set;
re_node_set_init_empty (&union_set); re_node_set_init_empty (&union_set);
for (cur_idx = 0; cur_idx < cur_nodes->nelem; ++cur_idx) for (cur_idx = 0; cur_idx < cur_nodes->nelem; ++cur_idx)
@ -3014,7 +2987,6 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
Idx cur_node = cur_nodes->elems[cur_idx]; Idx cur_node = cur_nodes->elems[cur_idx];
DEBUG_ASSERT (!IS_EPSILON_NODE (dfa->nodes[cur_node].type)); DEBUG_ASSERT (!IS_EPSILON_NODE (dfa->nodes[cur_node].type));
#ifdef RE_ENABLE_I18N
/* If the node may accept "multi byte". */ /* If the node may accept "multi byte". */
if (dfa->nodes[cur_node].accept_mb) if (dfa->nodes[cur_node].accept_mb)
{ {
@ -3052,7 +3024,7 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
} }
} }
} }
#endif /* RE_ENABLE_I18N */
if (naccepted if (naccepted
|| check_node_accept (mctx, dfa->nodes + cur_node, str_idx)) || check_node_accept (mctx, dfa->nodes + cur_node, str_idx))
{ {
@ -3476,18 +3448,15 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
} }
else if (type == OP_PERIOD) else if (type == OP_PERIOD)
{ {
#ifdef RE_ENABLE_I18N
if (dfa->mb_cur_max > 1) if (dfa->mb_cur_max > 1)
bitset_merge (accepts, dfa->sb_char); bitset_merge (accepts, dfa->sb_char);
else else
#endif
bitset_set_all (accepts); bitset_set_all (accepts);
if (!(dfa->syntax & RE_DOT_NEWLINE)) if (!(dfa->syntax & RE_DOT_NEWLINE))
bitset_clear (accepts, '\n'); bitset_clear (accepts, '\n');
if (dfa->syntax & RE_DOT_NOT_NULL) if (dfa->syntax & RE_DOT_NOT_NULL)
bitset_clear (accepts, '\0'); bitset_clear (accepts, '\0');
} }
#ifdef RE_ENABLE_I18N
else if (type == OP_UTF8_PERIOD) else if (type == OP_UTF8_PERIOD)
{ {
if (ASCII_CHARS % BITSET_WORD_BITS == 0) if (ASCII_CHARS % BITSET_WORD_BITS == 0)
@ -3499,7 +3468,6 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
if (dfa->syntax & RE_DOT_NOT_NULL) if (dfa->syntax & RE_DOT_NOT_NULL)
bitset_clear (accepts, '\0'); bitset_clear (accepts, '\0');
} }
#endif
else else
continue; continue;
@ -3530,12 +3498,10 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
bitset_empty (accepts); bitset_empty (accepts);
continue; continue;
} }
#ifdef RE_ENABLE_I18N
if (dfa->mb_cur_max > 1) if (dfa->mb_cur_max > 1)
for (j = 0; j < BITSET_WORDS; ++j) for (j = 0; j < BITSET_WORDS; ++j)
any_set |= (accepts[j] &= (dfa->word_char[j] | ~dfa->sb_char[j])); any_set |= (accepts[j] &= (dfa->word_char[j] | ~dfa->sb_char[j]));
else else
#endif
for (j = 0; j < BITSET_WORDS; ++j) for (j = 0; j < BITSET_WORDS; ++j)
any_set |= (accepts[j] &= dfa->word_char[j]); any_set |= (accepts[j] &= dfa->word_char[j]);
if (!any_set) if (!any_set)
@ -3549,12 +3515,10 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
bitset_empty (accepts); bitset_empty (accepts);
continue; continue;
} }
#ifdef RE_ENABLE_I18N
if (dfa->mb_cur_max > 1) if (dfa->mb_cur_max > 1)
for (j = 0; j < BITSET_WORDS; ++j) for (j = 0; j < BITSET_WORDS; ++j)
any_set |= (accepts[j] &= ~(dfa->word_char[j] & dfa->sb_char[j])); any_set |= (accepts[j] &= ~(dfa->word_char[j] & dfa->sb_char[j]));
else else
#endif
for (j = 0; j < BITSET_WORDS; ++j) for (j = 0; j < BITSET_WORDS; ++j)
any_set |= (accepts[j] &= ~dfa->word_char[j]); any_set |= (accepts[j] &= ~dfa->word_char[j]);
if (!any_set) if (!any_set)
@ -3631,7 +3595,6 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
return -1; return -1;
} }
#ifdef RE_ENABLE_I18N
/* Check how many bytes the node 'dfa->nodes[node_idx]' accepts. /* Check how many bytes the node 'dfa->nodes[node_idx]' accepts.
Return the number of the bytes the node accepts. Return the number of the bytes the node accepts.
STR_IDX is the current index of the input string. STR_IDX is the current index of the input string.
@ -3640,9 +3603,9 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
one collating element like '.', '[a-z]', opposite to the other nodes one collating element like '.', '[a-z]', opposite to the other nodes
can only accept one byte. */ can only accept one byte. */
# ifdef _LIBC #ifdef _LIBC
# include <locale/weight.h> # include <locale/weight.h>
# endif #endif
static int static int
check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx, check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
@ -3726,12 +3689,12 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
if (node->type == COMPLEX_BRACKET) if (node->type == COMPLEX_BRACKET)
{ {
const re_charset_t *cset = node->opr.mbcset; const re_charset_t *cset = node->opr.mbcset;
# ifdef _LIBC #ifdef _LIBC
const unsigned char *pin const unsigned char *pin
= ((const unsigned char *) re_string_get_buffer (input) + str_idx); = ((const unsigned char *) re_string_get_buffer (input) + str_idx);
Idx j; Idx j;
uint32_t nrules; uint32_t nrules;
# endif /* _LIBC */ #endif
int match_len = 0; int match_len = 0;
wchar_t wc = ((cset->nranges || cset->nchar_classes || cset->nmbchars) wchar_t wc = ((cset->nranges || cset->nchar_classes || cset->nmbchars)
? re_string_wchar_at (input, str_idx) : 0); ? re_string_wchar_at (input, str_idx) : 0);
@ -3754,7 +3717,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
} }
} }
# ifdef _LIBC #ifdef _LIBC
nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
if (nrules != 0) if (nrules != 0)
{ {
@ -3843,7 +3806,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
} }
} }
else else
# endif /* _LIBC */ #endif /* _LIBC */
{ {
/* match with range expression? */ /* match with range expression? */
for (i = 0; i < cset->nranges; ++i) for (i = 0; i < cset->nranges; ++i)
@ -3869,7 +3832,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
return 0; return 0;
} }
# ifdef _LIBC #ifdef _LIBC
static unsigned int static unsigned int
find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len) find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)
{ {
@ -3927,8 +3890,7 @@ find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)
return UINT_MAX; return UINT_MAX;
} }
} }
# endif /* _LIBC */ #endif /* _LIBC */
#endif /* RE_ENABLE_I18N */
/* Check whether the node accepts the byte which is IDX-th /* Check whether the node accepts the byte which is IDX-th
byte of the INPUT. */ byte of the INPUT. */
@ -3951,12 +3913,10 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node,
return false; return false;
break; break;
#ifdef RE_ENABLE_I18N
case OP_UTF8_PERIOD: case OP_UTF8_PERIOD:
if (ch >= ASCII_CHARS) if (ch >= ASCII_CHARS)
return false; return false;
FALLTHROUGH; FALLTHROUGH;
#endif
case OP_PERIOD: case OP_PERIOD:
if ((ch == '\n' && !(mctx->dfa->syntax & RE_DOT_NEWLINE)) if ((ch == '\n' && !(mctx->dfa->syntax & RE_DOT_NEWLINE))
|| (ch == '\0' && (mctx->dfa->syntax & RE_DOT_NOT_NULL))) || (ch == '\0' && (mctx->dfa->syntax & RE_DOT_NOT_NULL)))
@ -4017,7 +3977,6 @@ extend_buffers (re_match_context_t *mctx, int min_len)
/* Then reconstruct the buffers. */ /* Then reconstruct the buffers. */
if (pstr->icase) if (pstr->icase)
{ {
#ifdef RE_ENABLE_I18N
if (pstr->mb_cur_max > 1) if (pstr->mb_cur_max > 1)
{ {
ret = build_wcs_upper_buffer (pstr); ret = build_wcs_upper_buffer (pstr);
@ -4025,16 +3984,13 @@ extend_buffers (re_match_context_t *mctx, int min_len)
return ret; return ret;
} }
else else
#endif /* RE_ENABLE_I18N */
build_upper_buffer (pstr); build_upper_buffer (pstr);
} }
else else
{ {
#ifdef RE_ENABLE_I18N
if (pstr->mb_cur_max > 1) if (pstr->mb_cur_max > 1)
build_wcs_buffer (pstr); build_wcs_buffer (pstr);
else else
#endif /* RE_ENABLE_I18N */
{ {
if (pstr->trans != NULL) if (pstr->trans != NULL)
re_string_translate_buffer (pstr); re_string_translate_buffer (pstr);

29
lib/string.in.h
View file

@ -67,6 +67,35 @@
# include <strings.h> # include <strings.h>
#endif #endif
/* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers
that can be freed by passing them as the Ith argument to the
function F. */
#ifndef _GL_ATTRIBUTE_DEALLOC
# if __GNUC__ >= 11
# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
# else
# define _GL_ATTRIBUTE_DEALLOC(f, i)
# endif
#endif
/* _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that
can be freed via 'free'; it can be used only after declaring 'free'. */
/* Applies to: functions. Cannot be used on inline functions. */
#ifndef _GL_ATTRIBUTE_DEALLOC_FREE
# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1)
#endif
/* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly
allocated memory. */
/* Applies to: functions. */
#ifndef _GL_ATTRIBUTE_MALLOC
# if __GNUC__ >= 3 || defined __clang__
# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
# else
# define _GL_ATTRIBUTE_MALLOC
# endif
#endif
/* The __attribute__ feature is available in gcc versions 2.5 and later. /* The __attribute__ feature is available in gcc versions 2.5 and later.
The attribute __pure__ was added in gcc 2.96. */ The attribute __pure__ was added in gcc 2.96. */
#ifndef _GL_ATTRIBUTE_PURE #ifndef _GL_ATTRIBUTE_PURE

6
lib/sys_random.in.h
View file

@ -23,8 +23,10 @@
#if @HAVE_SYS_RANDOM_H@ #if @HAVE_SYS_RANDOM_H@
/* On uClibc, <sys/random.h> assumes prior inclusion of <stddef.h>. */ /* On uClibc < 1.0.35, <sys/random.h> assumes prior inclusion of <stddef.h>.
# if defined __UCLIBC__ Do not use __UCLIBC__ here, as it might not be defined yet.
But avoid namespace pollution on glibc systems. */
# ifndef __GLIBC__
# include <stddef.h> # include <stddef.h>
# endif # endif
/* On Mac OS X 10.5, <sys/random.h> assumes prior inclusion of <sys/types.h>. /* On Mac OS X 10.5, <sys/random.h> assumes prior inclusion of <sys/types.h>.

10
m4/alloca.m4
View file

@ -1,4 +1,4 @@
# alloca.m4 serial 20 # alloca.m4 serial 21
dnl Copyright (C) 2002-2004, 2006-2007, 2009-2021 Free Software Foundation, dnl Copyright (C) 2002-2004, 2006-2007, 2009-2021 Free Software Foundation,
dnl Inc. dnl Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
@ -26,17 +26,15 @@ AC_DEFUN([gl_FUNC_ALLOCA],
AC_DEFINE([HAVE_ALLOCA], [1], AC_DEFINE([HAVE_ALLOCA], [1],
[Define to 1 if you have 'alloca' after including <alloca.h>, [Define to 1 if you have 'alloca' after including <alloca.h>,
a header that may be supplied by this distribution.]) a header that may be supplied by this distribution.])
ALLOCA_H=alloca.h GL_GENERATE_ALLOCA_H=true
else else
dnl alloca exists as a library function, i.e. it is slow and probably dnl alloca exists as a library function, i.e. it is slow and probably
dnl a memory leak. Don't define HAVE_ALLOCA in this case. dnl a memory leak. Don't define HAVE_ALLOCA in this case.
ALLOCA_H= GL_GENERATE_ALLOCA_H=false
fi fi
else else
ALLOCA_H=alloca.h GL_GENERATE_ALLOCA_H=true
fi fi
AC_SUBST([ALLOCA_H])
AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
if test $ac_cv_working_alloca_h = yes; then if test $ac_cv_working_alloca_h = yes; then
HAVE_ALLOCA_H=1 HAVE_ALLOCA_H=1

8
m4/byteswap.m4
View file

@ -1,4 +1,4 @@
# byteswap.m4 serial 4 # byteswap.m4 serial 5
dnl Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. dnl Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -10,10 +10,8 @@ AC_DEFUN([gl_BYTESWAP],
[ [
dnl Prerequisites of lib/byteswap.in.h. dnl Prerequisites of lib/byteswap.in.h.
AC_CHECK_HEADERS([byteswap.h], [ AC_CHECK_HEADERS([byteswap.h], [
BYTESWAP_H='' GL_GENERATE_BYTESWAP_H=false
], [ ], [
BYTESWAP_H='byteswap.h' GL_GENERATE_BYTESWAP_H=true
]) ])
AC_SUBST([BYTESWAP_H])
AM_CONDITIONAL([GL_GENERATE_BYTESWAP_H], [test -n "$BYTESWAP_H"])
]) ])

10
m4/errno_h.m4
View file

@ -1,4 +1,4 @@
# errno_h.m4 serial 13 # errno_h.m4 serial 14
dnl Copyright (C) 2004, 2006, 2008-2021 Free Software Foundation, Inc. dnl Copyright (C) 2004, 2006, 2008-2021 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -68,13 +68,11 @@ booboo
[gl_cv_header_errno_h_complete=yes]) [gl_cv_header_errno_h_complete=yes])
]) ])
if test $gl_cv_header_errno_h_complete = yes; then if test $gl_cv_header_errno_h_complete = yes; then
ERRNO_H='' GL_GENERATE_ERRNO_H=false
else else
gl_NEXT_HEADERS([errno.h]) gl_NEXT_HEADERS([errno.h])
ERRNO_H='errno.h' GL_GENERATE_ERRNO_H=true
fi fi
AC_SUBST([ERRNO_H])
AM_CONDITIONAL([GL_GENERATE_ERRNO_H], [test -n "$ERRNO_H"])
gl_REPLACE_ERRNO_VALUE([EMULTIHOP]) gl_REPLACE_ERRNO_VALUE([EMULTIHOP])
gl_REPLACE_ERRNO_VALUE([ENOLINK]) gl_REPLACE_ERRNO_VALUE([ENOLINK])
gl_REPLACE_ERRNO_VALUE([EOVERFLOW]) gl_REPLACE_ERRNO_VALUE([EOVERFLOW])
@ -88,7 +86,7 @@ booboo
# Set the variables EOVERFLOW_HIDDEN and EOVERFLOW_VALUE. # Set the variables EOVERFLOW_HIDDEN and EOVERFLOW_VALUE.
AC_DEFUN([gl_REPLACE_ERRNO_VALUE], AC_DEFUN([gl_REPLACE_ERRNO_VALUE],
[ [
if test -n "$ERRNO_H"; then if $GL_GENERATE_ERRNO_H; then
AC_CACHE_CHECK([for ]$1[ value], [gl_cv_header_errno_h_]$1, [ AC_CACHE_CHECK([for ]$1[ value], [gl_cv_header_errno_h_]$1, [
AC_EGREP_CPP([yes],[ AC_EGREP_CPP([yes],[
#include <errno.h> #include <errno.h>

12
m4/execinfo.m4
View file

@ -10,7 +10,7 @@ AC_DEFUN([gl_EXECINFO_H],
AC_CHECK_HEADERS_ONCE([execinfo.h]) AC_CHECK_HEADERS_ONCE([execinfo.h])
LIB_EXECINFO='' LIB_EXECINFO=''
EXECINFO_H='execinfo.h' GL_GENERATE_EXECINFO_H=true
if test $ac_cv_header_execinfo_h = yes; then if test $ac_cv_header_execinfo_h = yes; then
gl_saved_libs=$LIBS gl_saved_libs=$LIBS
@ -18,14 +18,10 @@ AC_DEFUN([gl_EXECINFO_H],
[test "$ac_cv_search_backtrace_symbols_fd" = "none required" || [test "$ac_cv_search_backtrace_symbols_fd" = "none required" ||
LIB_EXECINFO=$ac_cv_search_backtrace_symbols_fd]) LIB_EXECINFO=$ac_cv_search_backtrace_symbols_fd])
LIBS=$gl_saved_libs LIBS=$gl_saved_libs
test "$ac_cv_search_backtrace_symbols_fd" = no || EXECINFO_H='' if test "$ac_cv_search_backtrace_symbols_fd" != no; then
GL_GENERATE_EXECINFO_H=false
fi
fi fi
if test -n "$EXECINFO_H"; then
AC_LIBOBJ([execinfo])
fi
AC_SUBST([EXECINFO_H])
AC_SUBST([LIB_EXECINFO]) AC_SUBST([LIB_EXECINFO])
AM_CONDITIONAL([GL_GENERATE_EXECINFO_H], [test -n "$EXECINFO_H"])
]) ])

10
m4/getopt.m4
View file

@ -1,4 +1,4 @@
# getopt.m4 serial 47 # getopt.m4 serial 48
dnl Copyright (C) 2002-2006, 2008-2021 Free Software Foundation, Inc. dnl Copyright (C) 2002-2006, 2008-2021 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -21,6 +21,8 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX],
REPLACE_GETOPT=1 REPLACE_GETOPT=1
fi fi
]) ])
GL_GENERATE_GETOPT_H=false
GL_GENERATE_GETOPT_CDEFS_H=false
if test $REPLACE_GETOPT = 1; then if test $REPLACE_GETOPT = 1; then
dnl Arrange for getopt.h to be created. dnl Arrange for getopt.h to be created.
gl_GETOPT_SUBSTITUTE_HEADER gl_GETOPT_SUBSTITUTE_HEADER
@ -374,8 +376,6 @@ AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
AC_DEFINE([__GETOPT_PREFIX], [[rpl_]], AC_DEFINE([__GETOPT_PREFIX], [[rpl_]],
[Define to rpl_ if the getopt replacement functions and variables [Define to rpl_ if the getopt replacement functions and variables
should be used.]) should be used.])
GETOPT_H=getopt.h GL_GENERATE_GETOPT_H=true
GETOPT_CDEFS_H=getopt-cdefs.h GL_GENERATE_GETOPT_CDEFS_H=true
AC_SUBST([GETOPT_H])
AC_SUBST([GETOPT_CDEFS_H])
]) ])

32
m4/gnulib-common.m4
View file

@ -1,4 +1,4 @@
# gnulib-common.m4 serial 67 # gnulib-common.m4 serial 69
dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. dnl Copyright (C) 2007-2021 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -879,6 +879,36 @@ AC_DEFUN([gl_CXX_ALLOW_WARNINGS],
AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS]) AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS])
]) ])
dnl gl_CONDITIONAL_HEADER([foo.h])
dnl takes a shell variable GL_GENERATE_FOO_H (with value true or false) as input
dnl and produces
dnl - an AC_SUBSTed variable FOO_H that is either a file name or empty, based
dnl on whether GL_GENERATE_FOO_H is true or false,
dnl - an Automake conditional GL_GENERATE_FOO_H that evaluates to the value of
dnl the shell variable GL_GENERATE_FOO_H.
AC_DEFUN([gl_CONDITIONAL_HEADER],
[
m4_pushdef([gl_header_name], AS_TR_SH(m4_toupper($1)))
m4_pushdef([gl_generate_var], [GL_GENERATE_]AS_TR_SH(m4_toupper($1)))
m4_pushdef([gl_generate_cond], [GL_GENERATE_]AS_TR_SH(m4_toupper($1)))
case "$gl_generate_var" in
false) gl_header_name='' ;;
true)
dnl It is OK to use a .h file in lib/ from within tests/, but not vice
dnl versa.
if test -z "$gl_header_name"; then
gl_header_name="${gl_source_base_prefix}$1"
fi
;;
*) echo "*** gl_generate_var is not set correctly" 1>&2; exit 1 ;;
esac
AC_SUBST(gl_header_name)
AM_CONDITIONAL(gl_generate_cond, [$gl_generate_var])
m4_popdef([gl_generate_cond])
m4_popdef([gl_generate_var])
m4_popdef([gl_header_name])
])
dnl Expands to some code for use in .c programs that, on native Windows, defines dnl Expands to some code for use in .c programs that, on native Windows, defines
dnl the Microsoft deprecated alias function names to the underscore-prefixed dnl the Microsoft deprecated alias function names to the underscore-prefixed
dnl actual function names. With this macro, these function names are available dnl actual function names. With this macro, these function names are available

39
m4/gnulib-comp.m4
View file

@ -224,10 +224,15 @@ AC_DEFUN([gl_INIT],
m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL])
gl_COMMON gl_COMMON
gl_source_base='lib' gl_source_base='lib'
gl_source_base_prefix=
gl_FUNC_ACL gl_FUNC_ACL
gl_FUNC_ALLOCA gl_FUNC_ALLOCA
gl_CONDITIONAL_HEADER([alloca.h])
AC_PROG_MKDIR_P
gl___BUILTIN_EXPECT gl___BUILTIN_EXPECT
gl_BYTESWAP gl_BYTESWAP
gl_CONDITIONAL_HEADER([byteswap.h])
AC_PROG_MKDIR_P
gl_CANONICALIZE_LGPL gl_CANONICALIZE_LGPL
if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
AC_LIBOBJ([canonicalize-lgpl]) AC_LIBOBJ([canonicalize-lgpl])
@ -255,6 +260,7 @@ AC_DEFUN([gl_INIT],
gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE
gl_DIRENT_H gl_DIRENT_H
gl_DIRENT_H_REQUIRE_DEFAULTS gl_DIRENT_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
gl_DOUBLE_SLASH_ROOT gl_DOUBLE_SLASH_ROOT
gl_FUNC_DUP2 gl_FUNC_DUP2
if test $REPLACE_DUP2 = 1; then if test $REPLACE_DUP2 = 1; then
@ -265,7 +271,14 @@ AC_DEFUN([gl_INIT],
gl_ENVIRON gl_ENVIRON
gl_UNISTD_MODULE_INDICATOR([environ]) gl_UNISTD_MODULE_INDICATOR([environ])
gl_HEADER_ERRNO_H gl_HEADER_ERRNO_H
gl_CONDITIONAL_HEADER([errno.h])
AC_PROG_MKDIR_P
gl_EXECINFO_H gl_EXECINFO_H
gl_CONDITIONAL_HEADER([execinfo.h])
AC_PROG_MKDIR_P
if $GL_GENERATE_EXECINFO_H; then
AC_LIBOBJ([execinfo])
fi
gl_FUNC_EXPLICIT_BZERO gl_FUNC_EXPLICIT_BZERO
if test $HAVE_EXPLICIT_BZERO = 0; then if test $HAVE_EXPLICIT_BZERO = 0; then
AC_LIBOBJ([explicit_bzero]) AC_LIBOBJ([explicit_bzero])
@ -293,6 +306,7 @@ AC_DEFUN([gl_INIT],
gl_FCNTL_MODULE_INDICATOR([fcntl]) gl_FCNTL_MODULE_INDICATOR([fcntl])
gl_FCNTL_H gl_FCNTL_H
gl_FCNTL_H_REQUIRE_DEFAULTS gl_FCNTL_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
gl_FUNC_FDOPENDIR gl_FUNC_FDOPENDIR
if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then
AC_LIBOBJ([fdopendir]) AC_LIBOBJ([fdopendir])
@ -345,6 +359,9 @@ AC_DEFUN([gl_INIT],
dnl mechanism), there is no need to do any AC_LIBOBJ or AC_SUBST here; they are dnl mechanism), there is no need to do any AC_LIBOBJ or AC_SUBST here; they are
dnl done in the getopt-posix module. dnl done in the getopt-posix module.
gl_FUNC_GETOPT_POSIX gl_FUNC_GETOPT_POSIX
gl_CONDITIONAL_HEADER([getopt.h])
gl_CONDITIONAL_HEADER([getopt-cdefs.h])
AC_PROG_MKDIR_P
if test $REPLACE_GETOPT = 1; then if test $REPLACE_GETOPT = 1; then
AC_LIBOBJ([getopt]) AC_LIBOBJ([getopt])
AC_LIBOBJ([getopt1]) AC_LIBOBJ([getopt1])
@ -367,15 +384,22 @@ AC_DEFUN([gl_INIT],
fi fi
gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
gl_IEEE754_H gl_IEEE754_H
gl_CONDITIONAL_HEADER([ieee754.h])
AC_PROG_MKDIR_P
gl_INTTYPES_INCOMPLETE gl_INTTYPES_INCOMPLETE
gl_INTTYPES_H_REQUIRE_DEFAULTS gl_INTTYPES_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
AC_REQUIRE([gl_LARGEFILE]) AC_REQUIRE([gl_LARGEFILE])
gl___INLINE gl___INLINE
gl_LIBGMP gl_LIBGMP
gl_CONDITIONAL_HEADER([gmp.h])
AC_PROG_MKDIR_P
if test $HAVE_LIBGMP != yes; then if test $HAVE_LIBGMP != yes; then
AC_LIBOBJ([mini-gmp-gnulib]) AC_LIBOBJ([mini-gmp-gnulib])
fi fi
gl_LIMITS_H gl_LIMITS_H
gl_CONDITIONAL_HEADER([limits.h])
AC_PROG_MKDIR_P
gl_FUNC_LSTAT gl_FUNC_LSTAT
if test $REPLACE_LSTAT = 1; then if test $REPLACE_LSTAT = 1; then
AC_LIBOBJ([lstat]) AC_LIBOBJ([lstat])
@ -458,16 +482,26 @@ AC_DEFUN([gl_INIT],
gl_STRING_MODULE_INDICATOR([sigdescr_np]) gl_STRING_MODULE_INDICATOR([sigdescr_np])
gl_SIGNAL_H gl_SIGNAL_H
gl_SIGNAL_H_REQUIRE_DEFAULTS gl_SIGNAL_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
gl_TYPE_SOCKLEN_T gl_TYPE_SOCKLEN_T
gt_TYPE_SSIZE_T gt_TYPE_SSIZE_T
gl_STAT_TIME gl_STAT_TIME
gl_STAT_BIRTHTIME gl_STAT_BIRTHTIME
gl_STDALIGN_H gl_STDALIGN_H
gl_CONDITIONAL_HEADER([stdalign.h])
AC_PROG_MKDIR_P
gl_STDDEF_H gl_STDDEF_H
gl_STDDEF_H_REQUIRE_DEFAULTS gl_STDDEF_H_REQUIRE_DEFAULTS
gl_CONDITIONAL_HEADER([stddef.h])
AC_PROG_MKDIR_P
gl_STDINT_H gl_STDINT_H
gl_CONDITIONAL_HEADER([stdint.h])
dnl Because of gl_REPLACE_LIMITS_H:
gl_CONDITIONAL_HEADER([limits.h])
AC_PROG_MKDIR_P
gl_STDIO_H gl_STDIO_H
gl_STDIO_H_REQUIRE_DEFAULTS gl_STDIO_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
dnl No need to create extra modules for these functions. Everyone who uses dnl No need to create extra modules for these functions. Everyone who uses
dnl <stdio.h> likely needs them. dnl <stdio.h> likely needs them.
gl_STDIO_MODULE_INDICATOR([fscanf]) gl_STDIO_MODULE_INDICATOR([fscanf])
@ -493,6 +527,7 @@ AC_DEFUN([gl_INIT],
gl_STDIO_MODULE_INDICATOR([fwrite]) gl_STDIO_MODULE_INDICATOR([fwrite])
gl_STDLIB_H gl_STDLIB_H
gl_STDLIB_H_REQUIRE_DEFAULTS gl_STDLIB_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
gl_FUNC_STPCPY gl_FUNC_STPCPY
if test $HAVE_STPCPY = 0; then if test $HAVE_STPCPY = 0; then
AC_LIBOBJ([stpcpy]) AC_LIBOBJ([stpcpy])
@ -501,6 +536,7 @@ AC_DEFUN([gl_INIT],
gl_STRING_MODULE_INDICATOR([stpcpy]) gl_STRING_MODULE_INDICATOR([stpcpy])
gl_STRING_H gl_STRING_H
gl_STRING_H_REQUIRE_DEFAULTS gl_STRING_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
gl_FUNC_STRNLEN gl_FUNC_STRNLEN
if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
AC_LIBOBJ([strnlen]) AC_LIBOBJ([strnlen])
@ -537,6 +573,7 @@ AC_DEFUN([gl_INIT],
gl_MODULE_INDICATOR([tempname]) gl_MODULE_INDICATOR([tempname])
gl_TIME_H gl_TIME_H
gl_TIME_H_REQUIRE_DEFAULTS gl_TIME_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
gl_TIME_R gl_TIME_R
if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then
AC_LIBOBJ([time_r]) AC_LIBOBJ([time_r])
@ -558,6 +595,7 @@ AC_DEFUN([gl_INIT],
gl_TIMESPEC gl_TIMESPEC
gl_UNISTD_H gl_UNISTD_H
gl_UNISTD_H_REQUIRE_DEFAULTS gl_UNISTD_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
AC_DEFINE([GNULIB_STDIO_SINGLE_THREAD], [1], AC_DEFINE([GNULIB_STDIO_SINGLE_THREAD], [1],
[Define to 1 if you want the FILE stream functions getc, putc, etc. [Define to 1 if you want the FILE stream functions getc, putc, etc.
to use unlocked I/O if available, throughout the package. to use unlocked I/O if available, throughout the package.
@ -993,6 +1031,7 @@ AC_DEFUN([gl_INIT],
m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL])
gl_COMMON gl_COMMON
gl_source_base='tests' gl_source_base='tests'
gl_source_base_prefix=
changequote(,)dnl changequote(,)dnl
gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS
changequote([, ])dnl changequote([, ])dnl

6
m4/ieee754-h.m4
View file

@ -10,12 +10,10 @@ AC_DEFUN([gl_IEEE754_H],
AC_REQUIRE([AC_C_BIGENDIAN]) AC_REQUIRE([AC_C_BIGENDIAN])
AC_CHECK_HEADERS_ONCE([ieee754.h]) AC_CHECK_HEADERS_ONCE([ieee754.h])
if test $ac_cv_header_ieee754_h = yes; then if test $ac_cv_header_ieee754_h = yes; then
IEEE754_H= GL_GENERATE_IEEE754_H=false
else else
IEEE754_H=ieee754.h GL_GENERATE_IEEE754_H=true
AC_DEFINE([_GL_REPLACE_IEEE754_H], 1, AC_DEFINE([_GL_REPLACE_IEEE754_H], 1,
[Define to 1 if <ieee754.h> is missing.]) [Define to 1 if <ieee754.h> is missing.])
fi fi
AC_SUBST([IEEE754_H])
AM_CONDITIONAL([GL_GENERATE_IEEE754_H], [test -n "$IEEE754_H"])
]) ])

6
m4/include_next.m4
View file

@ -193,9 +193,9 @@ AC_DEFUN([gl_NEXT_HEADERS_INTERNAL],
if test AS_VAR_GET([gl_header_exists]) = yes; then if test AS_VAR_GET([gl_header_exists]) = yes; then
AS_VAR_POPDEF([gl_header_exists]) AS_VAR_POPDEF([gl_header_exists])
]) ])
gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME) gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME)
AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME)) AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME))
AS_VAR_SET([gl_next_header], ['"'$gl_header'"']) AS_VAR_SET([gl_next_header], ['"'$gl_header'"'])
m4_if([$2], [check], m4_if([$2], [check],
[else [else
AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])

4
m4/inttypes.m4
View file

@ -1,4 +1,4 @@
# inttypes.m4 serial 35 # inttypes.m4 serial 36
dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. dnl Copyright (C) 2006-2021 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -36,7 +36,7 @@ AC_DEFUN_ONCE([gl_INTTYPES_INCOMPLETE],
AC_DEFUN([gl_INTTYPES_PRI_SCN], AC_DEFUN([gl_INTTYPES_PRI_SCN],
[ [
PRIPTR_PREFIX= PRIPTR_PREFIX=
if test -n "$STDINT_H"; then if $GL_GENERATE_STDINT_H; then
dnl Using the gnulib <stdint.h>. It defines intptr_t to 'long' or dnl Using the gnulib <stdint.h>. It defines intptr_t to 'long' or
dnl 'long long', depending on _WIN64. dnl 'long long', depending on _WIN64.
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(

7
m4/libgmp.m4
View file

@ -1,4 +1,4 @@
# libgmp.m4 serial 5 # libgmp.m4 serial 6
# Configure the GMP library or a replacement. # Configure the GMP library or a replacement.
dnl Copyright 2020-2021 Free Software Foundation, Inc. dnl Copyright 2020-2021 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
@ -59,11 +59,10 @@ AC_DEFUN([gl_LIBGMP],
[ Try specifying --with-libgmp-prefix=DIR.])]) [ Try specifying --with-libgmp-prefix=DIR.])])
fi]) fi])
if test $HAVE_LIBGMP = yes && test "$ac_cv_header_gmp_h" = yes; then if test $HAVE_LIBGMP = yes && test "$ac_cv_header_gmp_h" = yes; then
GMP_H= GL_GENERATE_GMP_H=false
else else
GMP_H=gmp.h GL_GENERATE_GMP_H=true
fi fi
AC_SUBST([GMP_H])
AM_CONDITIONAL([GL_GENERATE_MINI_GMP_H], AM_CONDITIONAL([GL_GENERATE_MINI_GMP_H],
[test $HAVE_LIBGMP != yes]) [test $HAVE_LIBGMP != yes])
AM_CONDITIONAL([GL_GENERATE_GMP_GMP_H], AM_CONDITIONAL([GL_GENERATE_GMP_GMP_H],

9
m4/limits-h.m4
View file

@ -27,18 +27,15 @@ AC_DEFUN_ONCE([gl_LIMITS_H],
[gl_cv_header_limits_width=yes], [gl_cv_header_limits_width=yes],
[gl_cv_header_limits_width=no])]) [gl_cv_header_limits_width=no])])
if test "$gl_cv_header_limits_width" = yes; then if test "$gl_cv_header_limits_width" = yes; then
LIMITS_H= GL_GENERATE_LIMITS_H=false
else else
LIMITS_H=limits.h GL_GENERATE_LIMITS_H=true
fi fi
AC_SUBST([LIMITS_H])
AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
]) ])
dnl Unconditionally enables the replacement of <limits.h>. dnl Unconditionally enables the replacement of <limits.h>.
AC_DEFUN([gl_REPLACE_LIMITS_H], AC_DEFUN([gl_REPLACE_LIMITS_H],
[ [
AC_REQUIRE([gl_LIMITS_H]) AC_REQUIRE([gl_LIMITS_H])
LIMITS_H='limits.h' GL_GENERATE_LIMITS_H=true
AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
]) ])

7
m4/stdalign.m4
View file

@ -49,11 +49,8 @@ AC_DEFUN([gl_STDALIGN_H],
[gl_cv_header_working_stdalign_h=no])]) [gl_cv_header_working_stdalign_h=no])])
if test $gl_cv_header_working_stdalign_h = yes; then if test $gl_cv_header_working_stdalign_h = yes; then
STDALIGN_H='' GL_GENERATE_STDALIGN_H=false
else else
STDALIGN_H='stdalign.h' GL_GENERATE_STDALIGN_H=true
fi fi
AC_SUBST([STDALIGN_H])
AM_CONDITIONAL([GL_GENERATE_STDALIGN_H], [test -n "$STDALIGN_H"])
]) ])

14
m4/stddef_h.m4
View file

@ -1,4 +1,4 @@
# stddef_h.m4 serial 11 # stddef_h.m4 serial 12
dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. dnl Copyright (C) 2009-2021 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -14,7 +14,7 @@ AC_DEFUN_ONCE([gl_STDDEF_H],
dnl Persuade OpenBSD <stddef.h> to declare max_align_t. dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
STDDEF_H= GL_GENERATE_STDDEF_H=false
dnl Test whether the type max_align_t exists and whether its alignment dnl Test whether the type max_align_t exists and whether its alignment
dnl "is as great as is supported by the implementation in all contexts". dnl "is as great as is supported by the implementation in all contexts".
@ -41,12 +41,12 @@ AC_DEFUN_ONCE([gl_STDDEF_H],
]) ])
if test $gl_cv_type_max_align_t = no; then if test $gl_cv_type_max_align_t = no; then
HAVE_MAX_ALIGN_T=0 HAVE_MAX_ALIGN_T=0
STDDEF_H=stddef.h GL_GENERATE_STDDEF_H=true
fi fi
if test $gt_cv_c_wchar_t = no; then if test $gt_cv_c_wchar_t = no; then
HAVE_WCHAR_T=0 HAVE_WCHAR_T=0
STDDEF_H=stddef.h GL_GENERATE_STDDEF_H=true
fi fi
AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions], AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions],
@ -58,12 +58,10 @@ AC_DEFUN_ONCE([gl_STDDEF_H],
[gl_cv_decl_null_works=no])]) [gl_cv_decl_null_works=no])])
if test $gl_cv_decl_null_works = no; then if test $gl_cv_decl_null_works = no; then
REPLACE_NULL=1 REPLACE_NULL=1
STDDEF_H=stddef.h GL_GENERATE_STDDEF_H=true
fi fi
AC_SUBST([STDDEF_H]) if $GL_GENERATE_STDDEF_H; then
AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"])
if test -n "$STDDEF_H"; then
gl_NEXT_HEADERS([stddef.h]) gl_NEXT_HEADERS([stddef.h])
fi fi
]) ])

8
m4/stdint.m4
View file

@ -1,4 +1,4 @@
# stdint.m4 serial 60 # stdint.m4 serial 61
dnl Copyright (C) 2001-2021 Free Software Foundation, Inc. dnl Copyright (C) 2001-2021 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -296,7 +296,7 @@ static const char *macro_values[] =
HAVE_C99_STDINT_H=0 HAVE_C99_STDINT_H=0
HAVE_SYS_BITYPES_H=0 HAVE_SYS_BITYPES_H=0
HAVE_SYS_INTTYPES_H=0 HAVE_SYS_INTTYPES_H=0
STDINT_H=stdint.h GL_GENERATE_STDINT_H=true
case "$gl_cv_header_working_stdint_h" in case "$gl_cv_header_working_stdint_h" in
*yes) *yes)
HAVE_C99_STDINT_H=1 HAVE_C99_STDINT_H=1
@ -341,7 +341,7 @@ int32_t i32 = INT32_C (0x7fffffff);
]])], ]])],
[gl_cv_header_stdint_width=yes])]) [gl_cv_header_stdint_width=yes])])
if test "$gl_cv_header_stdint_width" = yes; then if test "$gl_cv_header_stdint_width" = yes; then
STDINT_H= GL_GENERATE_STDINT_H=false
fi fi
;; ;;
*) *)
@ -364,8 +364,6 @@ int32_t i32 = INT32_C (0x7fffffff);
AC_SUBST([HAVE_C99_STDINT_H]) AC_SUBST([HAVE_C99_STDINT_H])
AC_SUBST([HAVE_SYS_BITYPES_H]) AC_SUBST([HAVE_SYS_BITYPES_H])
AC_SUBST([HAVE_SYS_INTTYPES_H]) AC_SUBST([HAVE_SYS_INTTYPES_H])
AC_SUBST([STDINT_H])
AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"])
]) ])
dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES) dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)

7
m4/sys_socket_h.m4
View file

@ -1,4 +1,4 @@
# sys_socket_h.m4 serial 28 # sys_socket_h.m4 serial 29
dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. dnl Copyright (C) 2005-2021 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -22,6 +22,7 @@ AC_DEFUN_ONCE([gl_SYS_SOCKET_H],
;; ;;
esac esac
GL_GENERATE_SYS_SOCKET_H=false
AC_CACHE_CHECK([whether <sys/socket.h> is self-contained], AC_CACHE_CHECK([whether <sys/socket.h> is self-contained],
[gl_cv_header_sys_socket_h_selfcontained], [gl_cv_header_sys_socket_h_selfcontained],
[ [
@ -44,7 +45,7 @@ AC_DEFUN_ONCE([gl_SYS_SOCKET_H],
[gl_cv_header_sys_socket_h_shut=no]) [gl_cv_header_sys_socket_h_shut=no])
]) ])
if test $gl_cv_header_sys_socket_h_shut = no; then if test $gl_cv_header_sys_socket_h_shut = no; then
SYS_SOCKET_H='sys/socket.h' GL_GENERATE_SYS_SOCKET_H=true
fi fi
fi fi
fi fi
@ -83,7 +84,7 @@ AC_DEFUN_ONCE([gl_SYS_SOCKET_H],
fi fi
if test $HAVE_STRUCT_SOCKADDR_STORAGE = 0 || test $HAVE_SA_FAMILY_T = 0 \ if test $HAVE_STRUCT_SOCKADDR_STORAGE = 0 || test $HAVE_SA_FAMILY_T = 0 \
|| test $HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = 0; then || test $HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = 0; then
SYS_SOCKET_H='sys/socket.h' GL_GENERATE_SYS_SOCKET_H=true
fi fi
gl_PREREQ_SYS_H_WINSOCK2 gl_PREREQ_SYS_H_WINSOCK2