updates for gnulib and readline

Change-Id: I7bd57ed17fbd41557d0598d654ac515234e46139

src/gdb/configure

@@ -42796,7 +42796,8 @@ else
   GL_GENERATE_STDINT_H_FALSE=
 fi
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 printf %s "checking for C/C++ restrict keyword... " >&6; }
 if test ${ac_cv_c_restrict+y}
 then :
@@ -46919,7 +46920,8 @@ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
 esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if malloc debugging is wanted" >&5
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if malloc debugging is wanted" >&5
 printf %s "checking if malloc debugging is wanted... " >&6; }
 
 # Check whether --with-dmalloc was given.
@@ -46943,7 +46945,7 @@ printf "%s\n" "no" >&6; }
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for obstacks" >&5
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for obstacks" >&5
 printf %s "checking for obstacks... " >&6; }
 if test ${ac_cv_func_obstack+y}
 then :

src/gdb/configure.ac

@@ -1667,7 +1667,13 @@ AC_CHECK_HEADERS([gettext.h],[],[],[
 gl_LIMITS_H dnl# and this:
 gl_STDINT_H dnl# in case failed to subst:
 AC_SUBST([STDINT_H])dnl
-gl_HEADER_STRING_H dnl# yeah
+m4_ifdef([gl_HEADER_STRING_H],[
+  gl_HEADER_STRING_H dnl# yeah
+],[
+  m4_ifdef([gl_STRING_H],[
+    gl_STRING_H dnl# ...or maybe it got renamed to this.
+  ])dnl
+])dnl
 # Just in case:
 if test "x${NEXT_STRING_H}" = "x"; then
   test -z "${NEXT_STRING_H}" && export NEXT_STRING_H="<string.h>"
@@ -2239,7 +2245,11 @@ if test "x${ac_cv_func_mbrtowc}" = "x"; then
   AC_FUNC_MBRTOWC
 fi
 AC_FUNC_MEMCMP
-AM_WITH_DMALLOC
+m4_ifdef([AM_WITH_DMALLOC],[
+  AM_WITH_DMALLOC
+  dnl# FIXME: do something about how it can put -ldmalloc into LIBS even when the
+  dnl# library is unavailable or unlinkable
+])dnl
 AC_FUNC_OBSTACK
 AC_CHECK_FUNCS([obstack_xfree])dnl
 AC_FUNC_REALLOC

src/gdb/gnulib/aclocal.m4

@@ -188,6 +188,43 @@ AC_DEFUN([AM_AUX_DIR_EXPAND],
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
+# AM_COND_IF                                            -*- Autoconf -*-
+
+# Copyright (C) 2008-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_COND_IF
+# _AM_COND_ELSE
+# _AM_COND_ENDIF
+# --------------
+# These macros are only used for tracing.
+m4_define([_AM_COND_IF])
+m4_define([_AM_COND_ELSE])
+m4_define([_AM_COND_ENDIF])
+
+# AM_COND_IF(COND, [IF-TRUE], [IF-FALSE])
+# ---------------------------------------
+# If the shell condition COND is true, execute IF-TRUE, otherwise execute
+# IF-FALSE.  Allow automake to learn about conditional instantiating macros
+# (the AC_CONFIG_FOOS).
+AC_DEFUN([AM_COND_IF],
+[m4_ifndef([_AM_COND_VALUE_$1],
+	   [m4_fatal([$0: no such condition "$1"])])dnl
+_AM_COND_IF([$1])dnl
+if test -z "$$1_TRUE"; then :
+  m4_n([$2])[]dnl
+m4_ifval([$3],
+[_AM_COND_ELSE([$1])dnl
+else
+  $3
+])dnl
+_AM_COND_ENDIF([$1])dnl
+fi[]dnl
+])
+
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
 # Copyright (C) 1997-2021 Free Software Foundation, Inc.
@@ -1265,8 +1302,10 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([m4/gnulib-use-manually.m4])
+m4_include([m4/localtime-buffer.m4])
 m4_include([m4/lt_ac.m4])
 m4_include([m4/onceonly_2_57.m4])
+m4_include([m4/stdbool.m4])
 m4_include([import/m4/00gnulib.m4])
 m4_include([import/m4/__inline.m4])
 m4_include([import/m4/absolute-header.m4])
@@ -1281,30 +1320,32 @@ m4_include([import/m4/autobuild.m4])
 m4_include([import/m4/ax_check_gnu_make.m4])
 m4_include([import/m4/bison-i18n.m4])
 m4_include([import/m4/btowc.m4])
+m4_include([import/m4/build-to-host.m4])
 m4_include([import/m4/builtin-expect.m4])
+m4_include([import/m4/c-bool.m4])
 m4_include([import/m4/calloc.m4])
 m4_include([import/m4/chdir-long.m4])
+m4_include([import/m4/clock_time.m4])
 m4_include([import/m4/close.m4])
 m4_include([import/m4/closedir.m4])
 m4_include([import/m4/codeset.m4])
 m4_include([import/m4/configmake.m4])
 m4_include([import/m4/ctime.m4])
-m4_include([import/m4/ctype.m4])
+m4_include([import/m4/ctype_h.m4])
 m4_include([import/m4/cycle-check.m4])
 m4_include([import/m4/d-ino.m4])
 m4_include([import/m4/d-type.m4])
 m4_include([import/m4/dirent-safer.m4])
 m4_include([import/m4/dirent_h.m4])
 m4_include([import/m4/dirfd.m4])
-m4_include([import/m4/dirname.m4])
 m4_include([import/m4/double-slash-root.m4])
 m4_include([import/m4/dup.m4])
-m4_include([import/m4/dup2-obsolete.m4])
 m4_include([import/m4/dup2.m4])
 m4_include([import/m4/eealloc.m4])
 m4_include([import/m4/environ.m4])
 m4_include([import/m4/errno_h.m4])
 m4_include([import/m4/error.m4])
+m4_include([import/m4/error_h.m4])
 m4_include([import/m4/euidaccess.m4])
 m4_include([import/m4/exponentd.m4])
 m4_include([import/m4/exponentf.m4])
@@ -1319,6 +1360,8 @@ m4_include([import/m4/fcntl.m4])
 m4_include([import/m4/fcntl_h.m4])
 m4_include([import/m4/fdopendir.m4])
 m4_include([import/m4/fflush.m4])
+m4_include([import/m4/ffs.m4])
+m4_include([import/m4/ffsl.m4])
 m4_include([import/m4/fileblocks.m4])
 m4_include([import/m4/filenamecat.m4])
 m4_include([import/m4/flexmember.m4])
@@ -1330,6 +1373,7 @@ m4_include([import/m4/fpieee.m4])
 m4_include([import/m4/fprintf-posix.m4])
 m4_include([import/m4/fpurge.m4])
 m4_include([import/m4/freading.m4])
+m4_include([import/m4/free.m4])
 m4_include([import/m4/frexp.m4])
 m4_include([import/m4/frexpl.m4])
 m4_include([import/m4/fseek.m4])
@@ -1347,9 +1391,9 @@ m4_include([import/m4/getdtablesize.m4])
 m4_include([import/m4/getgroups.m4])
 m4_include([import/m4/getpagesize.m4])
 m4_include([import/m4/getprogname.m4])
+m4_include([import/m4/getrandom.m4])
 m4_include([import/m4/gettext.m4])
 m4_include([import/m4/gettimeofday.m4])
-m4_include([import/m4/glibc21.m4])
 m4_include([import/m4/glob_h.m4])
 m4_include([import/m4/gnu-make.m4])
 m4_include([import/m4/gnulib-common.m4])
@@ -1362,14 +1406,16 @@ m4_include([import/m4/iconv_h.m4])
 m4_include([import/m4/include_next.m4])
 m4_include([import/m4/inline.m4])
 m4_include([import/m4/intmax_t.m4])
-m4_include([import/m4/inttypes-pri.m4])
 m4_include([import/m4/inttypes.m4])
 m4_include([import/m4/inttypes_h.m4])
+m4_include([import/m4/isblank.m4])
 m4_include([import/m4/isnand.m4])
 m4_include([import/m4/isnanf.m4])
 m4_include([import/m4/isnanl.m4])
 m4_include([import/m4/iswblank.m4])
 m4_include([import/m4/iswctype.m4])
+m4_include([import/m4/iswdigit.m4])
+m4_include([import/m4/iswxdigit.m4])
 m4_include([import/m4/jm-winsz1.m4])
 m4_include([import/m4/jm-winsz2.m4])
 m4_include([import/m4/langinfo_h.m4])
@@ -1385,29 +1431,30 @@ m4_include([import/m4/locale-ja.m4])
 m4_include([import/m4/locale-zh.m4])
 m4_include([import/m4/locale_h.m4])
 m4_include([import/m4/localeconv.m4])
-m4_include([import/m4/localtime-buffer.m4])
 m4_include([import/m4/localtime.m4])
 m4_include([import/m4/longlong.m4])
 m4_include([import/m4/lseek.m4])
 m4_include([import/m4/lstat.m4])
 m4_include([import/m4/malloc.m4])
+m4_include([import/m4/malloc_h.m4])
 m4_include([import/m4/malloca.m4])
 m4_include([import/m4/math_h.m4])
 m4_include([import/m4/mathfunc.m4])
 m4_include([import/m4/mbchar.m4])
 m4_include([import/m4/mbiter.m4])
+m4_include([import/m4/mbrtoc32.m4])
 m4_include([import/m4/mbrtowc.m4])
 m4_include([import/m4/mbsinit.m4])
 m4_include([import/m4/mbsrtowcs.m4])
 m4_include([import/m4/mbstate_t.m4])
 m4_include([import/m4/mbtowc.m4])
-m4_include([import/m4/memchr-obsolete.m4])
 m4_include([import/m4/memchr.m4])
 m4_include([import/m4/memcmp.m4])
 m4_include([import/m4/memmem.m4])
 m4_include([import/m4/memmove.m4])
 m4_include([import/m4/mempcpy.m4])
 m4_include([import/m4/memrchr.m4])
+m4_include([import/m4/minmax.m4])
 m4_include([import/m4/mkdir.m4])
 m4_include([import/m4/mkdtemp.m4])
 m4_include([import/m4/mktime.m4])
@@ -1416,13 +1463,15 @@ m4_include([import/m4/mode_t.m4])
 m4_include([import/m4/monetary_h.m4])
 m4_include([import/m4/msvc-inval.m4])
 m4_include([import/m4/multiarch.m4])
+m4_include([import/m4/musl.m4])
 m4_include([import/m4/netdb_h.m4])
 m4_include([import/m4/nl_langinfo.m4])
 m4_include([import/m4/no-c++.m4])
 m4_include([import/m4/nocrash.m4])
 m4_include([import/m4/obstack.m4])
 m4_include([import/m4/off_t.m4])
 m4_include([import/m4/open-cloexec.m4])
+m4_include([import/m4/open-slash.m4])
 m4_include([import/m4/open.m4])
 m4_include([import/m4/openat.m4])
 m4_include([import/m4/opendir.m4])
@@ -1437,12 +1486,14 @@ m4_include([import/m4/posixcheck.m4])
 m4_include([import/m4/printf-frexp.m4])
 m4_include([import/m4/printf-frexpl.m4])
 m4_include([import/m4/printf.m4])
+m4_include([import/m4/pthread_h.m4])
 m4_include([import/m4/pty_h.m4])
 m4_include([import/m4/putenv.m4])
 m4_include([import/m4/raise.m4])
 m4_include([import/m4/readdir.m4])
 m4_include([import/m4/readlink.m4])
 m4_include([import/m4/realloc.m4])
+m4_include([import/m4/reallocarray.m4])
 m4_include([import/m4/regex.m4])
 m4_include([import/m4/rewinddir.m4])
 m4_include([import/m4/rmdir.m4])
@@ -1451,6 +1502,7 @@ m4_include([import/m4/sched_h.m4])
 m4_include([import/m4/search_h.m4])
 m4_include([import/m4/secure_getenv.m4])
 m4_include([import/m4/setenv.m4])
+m4_include([import/m4/setlocale_null.m4])
 m4_include([import/m4/sh-filename.m4])
 m4_include([import/m4/sig2str.m4])
 m4_include([import/m4/sigaction.m4])
@@ -1469,9 +1521,7 @@ m4_include([import/m4/ssize_t.m4])
 m4_include([import/m4/stat-size.m4])
 m4_include([import/m4/stat-time.m4])
 m4_include([import/m4/stat.m4])
-m4_include([import/m4/std-gnu11.m4])
 m4_include([import/m4/stdalign.m4])
-m4_include([import/m4/stdbool.m4])
 m4_include([import/m4/stddef_h.m4])
 m4_include([import/m4/stdint.m4])
 m4_include([import/m4/stdint_h.m4])
@@ -1491,6 +1541,7 @@ m4_include([import/m4/strstr.m4])
 m4_include([import/m4/strtok_r.m4])
 m4_include([import/m4/sys_file_h.m4])
 m4_include([import/m4/sys_ioctl_h.m4])
+m4_include([import/m4/sys_random_h.m4])
 m4_include([import/m4/sys_resource_h.m4])
 m4_include([import/m4/sys_select_h.m4])
 m4_include([import/m4/sys_socket_h.m4])
@@ -1503,20 +1554,30 @@ m4_include([import/m4/sys_utsname_h.m4])
 m4_include([import/m4/sys_wait_h.m4])
 m4_include([import/m4/tempname.m4])
 m4_include([import/m4/termios_h.m4])
+m4_include([import/m4/threadlib.m4])
+m4_include([import/m4/threads_h.m4])
+m4_include([import/m4/time.m4])
 m4_include([import/m4/time_h.m4])
 m4_include([import/m4/time_r.m4])
 m4_include([import/m4/time_rz.m4])
 m4_include([import/m4/timegm.m4])
 m4_include([import/m4/towctrans.m4])
 m4_include([import/m4/tzset.m4])
+m4_include([import/m4/uchar_h.m4])
+m4_include([import/m4/ungetc.m4])
+m4_include([import/m4/unicase_h.m4])
+m4_include([import/m4/unictype_h.m4])
+m4_include([import/m4/uninorm_h.m4])
 m4_include([import/m4/unistd-safer.m4])
 m4_include([import/m4/unistd_h.m4])
 m4_include([import/m4/unlink-busy.m4])
 m4_include([import/m4/unlink.m4])
 m4_include([import/m4/usleep.m4])
 m4_include([import/m4/utime_h.m4])
+m4_include([import/m4/utmp_h.m4])
 m4_include([import/m4/vasnprintf.m4])
 m4_include([import/m4/vfprintf-posix.m4])
+m4_include([import/m4/visibility.m4])
 m4_include([import/m4/warn-on-use.m4])
 m4_include([import/m4/wchar_h.m4])
 m4_include([import/m4/wchar_t.m4])
@@ -1531,7 +1592,9 @@ m4_include([import/m4/wcwidth.m4])
 m4_include([import/m4/wint_t.m4])
 m4_include([import/m4/wmemchr.m4])
 m4_include([import/m4/wmemcpy.m4])
+m4_include([import/m4/wmempcpy.m4])
 m4_include([import/m4/xalloc.m4])
 m4_include([import/m4/xsize.m4])
 m4_include([import/m4/xstrndup.m4])
+m4_include([import/m4/zzgnulib.m4])
 m4_include([acinclude.m4])