333 files changed, 1420 insertions, 281 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ab7ce37754..c2d02749d6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2019-06-14  Tom Tromey  <tom@tromey.com>
+
+	* MAINTAINERS: Add gnulib.
+	* gnulib: New directory, move from gdb/gnulib.
+	* configure.ac (host_libs): Add gnulib.
+	* configure: Rebuild.
+	* Makefile.def (host_modules, dependencies): Add gnulib.
+	* Makefile.in: Rebuild.
+
 2019-06-03  Nick Clifton  <nickc@redhat.com>
 
 	Revert:
diff --git a/MAINTAINERS b/MAINTAINERS
index b9fa405fcc1..4e04918dad8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -41,7 +41,7 @@ config.guess; config.sub; readline/support/config.{sub,guess}
 depcomp; mkinstalldirs
         Send bug reports and patches to bug-automake@gnu.org.
 
-gdb/; readline/; sim/; GDB's part of include/
+gdb/; gnulib/; readline/; sim/; GDB's part of include/
 	GDB: http://www.gnu.org/software/gdb/
 	Patches to gdb-patches@sourceware.org.
 	See also gdb/MAINTAINERS and sim/MAINTAINERS.
diff --git a/Makefile.def b/Makefile.def
index e3a94f2c7de..28bf61d7715 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -112,6 +112,7 @@ host_modules= { module= texinfo; no_install= true; };
 host_modules= { module= zlib; no_install=true; no_check=true;
 		bootstrap=true;
 	        extra_configure_flags='@extra_host_zlib_configure_flags@';};
+host_modules= { module= gnulib; };
 host_modules= { module= gdb; };
 host_modules= { module= expect; };
 host_modules= { module= guile; };
@@ -390,11 +391,13 @@ dependencies = { module=all-intl; on=all-libiconv; };
 dependencies = { module=configure-gdb; on=all-intl; };
 dependencies = { module=configure-gdb; on=configure-sim; };
 dependencies = { module=configure-gdb; on=all-bfd; };
+dependencies = { module=configure-gdb; on=all-gnulib; };
 // Depend on all-libiconv so that configure checks for iconv
 // functions will work.
 dependencies = { module=configure-gdb; on=all-libiconv; };
 dependencies = { module=all-gdb; on=all-libiberty; };
 dependencies = { module=all-gdb; on=all-libiconv; };
+dependencies = { module=all-gdb; on=all-gnulib; };
 dependencies = { module=all-gdb; on=all-opcodes; };
 dependencies = { module=all-gdb; on=all-readline; };
 dependencies = { module=all-gdb; on=all-build-bison; };
diff --git a/Makefile.in b/Makefile.in
index e4b6051b1a7..7a6700af964 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -942,6 +942,7 @@ configure-host:  \
     maybe-configure-sim \
     maybe-configure-texinfo \
     maybe-configure-zlib \
+    maybe-configure-gnulib \
     maybe-configure-gdb \
     maybe-configure-expect \
     maybe-configure-guile \
@@ -1095,6 +1096,7 @@ all-host: maybe-all-texinfo
 @if zlib-no-bootstrap
 all-host: maybe-all-zlib
 @endif zlib-no-bootstrap
+all-host: maybe-all-gnulib
 all-host: maybe-all-gdb
 all-host: maybe-all-expect
 all-host: maybe-all-guile
@@ -1202,6 +1204,7 @@ info-host: maybe-info-sid
 info-host: maybe-info-sim
 info-host: maybe-info-texinfo
 info-host: maybe-info-zlib
+info-host: maybe-info-gnulib
 info-host: maybe-info-gdb
 info-host: maybe-info-expect
 info-host: maybe-info-guile
@@ -1288,6 +1291,7 @@ dvi-host: maybe-dvi-sid
 dvi-host: maybe-dvi-sim
 dvi-host: maybe-dvi-texinfo
 dvi-host: maybe-dvi-zlib
+dvi-host: maybe-dvi-gnulib
 dvi-host: maybe-dvi-gdb
 dvi-host: maybe-dvi-expect
 dvi-host: maybe-dvi-guile
@@ -1374,6 +1378,7 @@ pdf-host: maybe-pdf-sid
 pdf-host: maybe-pdf-sim
 pdf-host: maybe-pdf-texinfo
 pdf-host: maybe-pdf-zlib
+pdf-host: maybe-pdf-gnulib
 pdf-host: maybe-pdf-gdb
 pdf-host: maybe-pdf-expect
 pdf-host: maybe-pdf-guile
@@ -1460,6 +1465,7 @@ html-host: maybe-html-sid
 html-host: maybe-html-sim
 html-host: maybe-html-texinfo
 html-host: maybe-html-zlib
+html-host: maybe-html-gnulib
 html-host: maybe-html-gdb
 html-host: maybe-html-expect
 html-host: maybe-html-guile
@@ -1546,6 +1552,7 @@ TAGS-host: maybe-TAGS-sid
 TAGS-host: maybe-TAGS-sim
 TAGS-host: maybe-TAGS-texinfo
 TAGS-host: maybe-TAGS-zlib
+TAGS-host: maybe-TAGS-gnulib
 TAGS-host: maybe-TAGS-gdb
 TAGS-host: maybe-TAGS-expect
 TAGS-host: maybe-TAGS-guile
@@ -1632,6 +1639,7 @@ install-info-host: maybe-install-info-sid
 install-info-host: maybe-install-info-sim
 install-info-host: maybe-install-info-texinfo
 install-info-host: maybe-install-info-zlib
+install-info-host: maybe-install-info-gnulib
 install-info-host: maybe-install-info-gdb
 install-info-host: maybe-install-info-expect
 install-info-host: maybe-install-info-guile
@@ -1718,6 +1726,7 @@ install-pdf-host: maybe-install-pdf-sid
 install-pdf-host: maybe-install-pdf-sim
 install-pdf-host: maybe-install-pdf-texinfo
 install-pdf-host: maybe-install-pdf-zlib
+install-pdf-host: maybe-install-pdf-gnulib
 install-pdf-host: maybe-install-pdf-gdb
 install-pdf-host: maybe-install-pdf-expect
 install-pdf-host: maybe-install-pdf-guile
@@ -1804,6 +1813,7 @@ install-html-host: maybe-install-html-sid
 install-html-host: maybe-install-html-sim
 install-html-host: maybe-install-html-texinfo
 install-html-host: maybe-install-html-zlib
+install-html-host: maybe-install-html-gnulib
 install-html-host: maybe-install-html-gdb
 install-html-host: maybe-install-html-expect
 install-html-host: maybe-install-html-guile
@@ -1890,6 +1900,7 @@ installcheck-host: maybe-installcheck-sid
 installcheck-host: maybe-installcheck-sim
 installcheck-host: maybe-installcheck-texinfo
 installcheck-host: maybe-installcheck-zlib
+installcheck-host: maybe-installcheck-gnulib
 installcheck-host: maybe-installcheck-gdb
 installcheck-host: maybe-installcheck-expect
 installcheck-host: maybe-installcheck-guile
@@ -1976,6 +1987,7 @@ mostlyclean-host: maybe-mostlyclean-sid
 mostlyclean-host: maybe-mostlyclean-sim
 mostlyclean-host: maybe-mostlyclean-texinfo
 mostlyclean-host: maybe-mostlyclean-zlib
+mostlyclean-host: maybe-mostlyclean-gnulib
 mostlyclean-host: maybe-mostlyclean-gdb
 mostlyclean-host: maybe-mostlyclean-expect
 mostlyclean-host: maybe-mostlyclean-guile
@@ -2062,6 +2074,7 @@ clean-host: maybe-clean-sid
 clean-host: maybe-clean-sim
 clean-host: maybe-clean-texinfo
 clean-host: maybe-clean-zlib
+clean-host: maybe-clean-gnulib
 clean-host: maybe-clean-gdb
 clean-host: maybe-clean-expect
 clean-host: maybe-clean-guile
@@ -2148,6 +2161,7 @@ distclean-host: maybe-distclean-sid
 distclean-host: maybe-distclean-sim
 distclean-host: maybe-distclean-texinfo
 distclean-host: maybe-distclean-zlib
+distclean-host: maybe-distclean-gnulib
 distclean-host: maybe-distclean-gdb
 distclean-host: maybe-distclean-expect
 distclean-host: maybe-distclean-guile
@@ -2234,6 +2248,7 @@ maintainer-clean-host: maybe-maintainer-clean-sid
 maintainer-clean-host: maybe-maintainer-clean-sim
 maintainer-clean-host: maybe-maintainer-clean-texinfo
 maintainer-clean-host: maybe-maintainer-clean-zlib
+maintainer-clean-host: maybe-maintainer-clean-gnulib
 maintainer-clean-host: maybe-maintainer-clean-gdb
 maintainer-clean-host: maybe-maintainer-clean-expect
 maintainer-clean-host: maybe-maintainer-clean-guile
@@ -2376,6 +2391,7 @@ check-host:  \
     maybe-check-sim \
     maybe-check-texinfo \
     maybe-check-zlib \
+    maybe-check-gnulib \
     maybe-check-gdb \
     maybe-check-expect \
     maybe-check-guile \
@@ -2509,6 +2525,7 @@ install-host-nogcc:  \
     maybe-install-sim \
     maybe-install-texinfo \
     maybe-install-zlib \
+    maybe-install-gnulib \
     maybe-install-gdb \
     maybe-install-expect \
     maybe-install-guile \
@@ -2559,6 +2576,7 @@ install-host:  \
     maybe-install-sim \
     maybe-install-texinfo \
     maybe-install-zlib \
+    maybe-install-gnulib \
     maybe-install-gdb \
     maybe-install-expect \
     maybe-install-guile \
@@ -2665,6 +2683,7 @@ install-strip-host:  \
     maybe-install-strip-sim \
     maybe-install-strip-texinfo \
     maybe-install-strip-zlib \
+    maybe-install-strip-gnulib \
     maybe-install-strip-gdb \
     maybe-install-strip-expect \
     maybe-install-strip-guile \
@@ -28085,6 +28104,447 @@ maintainer-clean-zlib:
 
 
 
+.PHONY: configure-gnulib maybe-configure-gnulib
+maybe-configure-gnulib:
+@if gcc-bootstrap
+configure-gnulib: stage_current
+@endif gcc-bootstrap
+@if gnulib
+maybe-configure-gnulib: configure-gnulib
+configure-gnulib: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gnulib/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnulib; \
+	$(HOST_EXPORTS)  \
+	echo Configuring in $(HOST_SUBDIR)/gnulib; \
+	cd "$(HOST_SUBDIR)/gnulib" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gnulib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	module_srcdir=gnulib; \
+	$(SHELL) \
+	  $$s/$$module_srcdir/configure \
+	  --srcdir=$${topdir}/$$module_srcdir \
+	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+	  --target=${target_alias}  \
+	  || exit 1
+@endif gnulib
+
+
+
+
+
+.PHONY: all-gnulib maybe-all-gnulib
+maybe-all-gnulib:
+@if gcc-bootstrap
+all-gnulib: stage_current
+@endif gcc-bootstrap
+@if gnulib
+TARGET-gnulib=all
+maybe-all-gnulib: all-gnulib
+all-gnulib: configure-gnulib
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+		$(TARGET-gnulib))
+@endif gnulib
+
+
+
+
+.PHONY: check-gnulib maybe-check-gnulib
+maybe-check-gnulib:
+@if gnulib
+maybe-check-gnulib: check-gnulib
+
+check-gnulib:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS)  \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gnulib
+
+.PHONY: install-gnulib maybe-install-gnulib
+maybe-install-gnulib:
+@if gnulib
+maybe-install-gnulib: install-gnulib
+
+install-gnulib: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif gnulib
+
+.PHONY: install-strip-gnulib maybe-install-strip-gnulib
+maybe-install-strip-gnulib:
+@if gnulib
+maybe-install-strip-gnulib: install-strip-gnulib
+
+install-strip-gnulib: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gnulib
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gnulib info-gnulib
+maybe-info-gnulib:
+@if gnulib
+maybe-info-gnulib: info-gnulib
+
+info-gnulib: \
+    configure-gnulib 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing info in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          info) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-dvi-gnulib dvi-gnulib
+maybe-dvi-gnulib:
+@if gnulib
+maybe-dvi-gnulib: dvi-gnulib
+
+dvi-gnulib: \
+    configure-gnulib 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing dvi in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          dvi) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-pdf-gnulib pdf-gnulib
+maybe-pdf-gnulib:
+@if gnulib
+maybe-pdf-gnulib: pdf-gnulib
+
+pdf-gnulib: \
+    configure-gnulib 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing pdf in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          pdf) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-html-gnulib html-gnulib
+maybe-html-gnulib:
+@if gnulib
+maybe-html-gnulib: html-gnulib
+
+html-gnulib: \
+    configure-gnulib 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing html in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          html) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-TAGS-gnulib TAGS-gnulib
+maybe-TAGS-gnulib:
+@if gnulib
+maybe-TAGS-gnulib: TAGS-gnulib
+
+TAGS-gnulib: \
+    configure-gnulib 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing TAGS in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          TAGS) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-install-info-gnulib install-info-gnulib
+maybe-install-info-gnulib:
+@if gnulib
+maybe-install-info-gnulib: install-info-gnulib
+
+install-info-gnulib: \
+    configure-gnulib \
+    info-gnulib 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-info in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-info) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-install-pdf-gnulib install-pdf-gnulib
+maybe-install-pdf-gnulib:
+@if gnulib
+maybe-install-pdf-gnulib: install-pdf-gnulib
+
+install-pdf-gnulib: \
+    configure-gnulib \
+    pdf-gnulib 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-pdf in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-pdf) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-install-html-gnulib install-html-gnulib
+maybe-install-html-gnulib:
+@if gnulib
+maybe-install-html-gnulib: install-html-gnulib
+
+install-html-gnulib: \
+    configure-gnulib \
+    html-gnulib 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          install-html) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-installcheck-gnulib installcheck-gnulib
+maybe-installcheck-gnulib:
+@if gnulib
+maybe-installcheck-gnulib: installcheck-gnulib
+
+installcheck-gnulib: \
+    configure-gnulib 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing installcheck in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          installcheck) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-mostlyclean-gnulib mostlyclean-gnulib
+maybe-mostlyclean-gnulib:
+@if gnulib
+maybe-mostlyclean-gnulib: mostlyclean-gnulib
+
+mostlyclean-gnulib: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing mostlyclean in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          mostlyclean) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-clean-gnulib clean-gnulib
+maybe-clean-gnulib:
+@if gnulib
+maybe-clean-gnulib: clean-gnulib
+
+clean-gnulib: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing clean in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          clean) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-distclean-gnulib distclean-gnulib
+maybe-distclean-gnulib:
+@if gnulib
+maybe-distclean-gnulib: distclean-gnulib
+
+distclean-gnulib: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing distclean in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          distclean) \
+	  || exit 1
+
+@endif gnulib
+
+.PHONY: maybe-maintainer-clean-gnulib maintainer-clean-gnulib
+maybe-maintainer-clean-gnulib:
+@if gnulib
+maybe-maintainer-clean-gnulib: maintainer-clean-gnulib
+
+maintainer-clean-gnulib: 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnulib/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) ; do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing maintainer-clean in gnulib"; \
+	(cd $(HOST_SUBDIR)/gnulib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	          maintainer-clean) \
+	  || exit 1
+
+@endif gnulib
+
+
+
 .PHONY: configure-gdb maybe-configure-gdb
 maybe-configure-gdb:
 @if gcc-bootstrap
@@ -50576,6 +51036,8 @@ all-stage4-intl: maybe-all-stage4-libiconv
 all-stageprofile-intl: maybe-all-stageprofile-libiconv
 all-stagefeedback-intl: maybe-all-stagefeedback-libiconv
 configure-gdb: maybe-configure-sim
+configure-gdb: maybe-all-gnulib
+all-gdb: maybe-all-gnulib
 all-gdb: maybe-all-readline
 all-gdb: maybe-all-build-bison
 all-gdb: maybe-all-sim
diff --git a/configure b/configure
index 3e95ce50ffb..4d111486926 100755
--- a/configure
+++ b/configure
@@ -7184,6 +7184,14 @@ esac
 CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
 INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
 
+# gdb depends on gnulib, but as nothing else does, only include it if
+# gdb is built.
+if echo " ${configdirs} " | grep " gdb " > /dev/null 2>&1 ; then
+  # The Makefile provides the ordering, so it's enough here to add
+  # gnulib to the list.
+  configdirs="${configdirs} gnulib"
+fi
+
 # Strip out unwanted targets.
 
 # While at that, we remove Makefiles if we were started for recursive
diff --git a/configure.ac b/configure.ac
index c84263c516b..854f71a34e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
 #   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-#   2014, 2015, 2016 Free Software Foundation, Inc.
+#   2014, 2015, 2016, 2019 Free Software Foundation, Inc.
 #
 # 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
@@ -2712,6 +2712,14 @@ esac
 CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
 INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
 
+# gdb depends on gnulib, but as nothing else does, only include it if
+# gdb is built.
+if echo " ${configdirs} " | grep " gdb " > /dev/null 2>&1 ; then
+  # The Makefile provides the ordering, so it's enough here to add
+  # gnulib to the list.
+  configdirs="${configdirs} gnulib"
+fi
+
 # Strip out unwanted targets.
 
 # While at that, we remove Makefiles if we were started for recursive
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 146b18138d2..f17e48bfbf5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,19 @@
+2019-06-14  Tom Tromey  <tom@tromey.com>
+
+	* gnulib: Move directory to top-level.
+	* configure.ac: Don't configure gnulib.
+	* configure: Rebuild.
+	* common/common-defs.h: Use new path to gnulib.
+	* Makefile.in (GNULIB_BUILDDIR): Now ../gnulib.
+	(GNULIB_H): Remove.
+	(INCGNU): Look in new gnulib location.
+	(HFILES_NO_SRCDIR): Remove gnulib files.
+	(SUBDIR, REQUIRED_SUBDIRS): Remove gnulib.
+	(generated_files): Remove GNULIB_H.
+	($(LIBGNU), all-lib): Remove targets.
+	(distclean): Don't mention GNULIB_BUILDDIR.
+	($(GNULIB_BUILDDIR)/Makefile): Remove target.
+
 2019-06-14  Tom Tromey  <tromey@adacore.com>
 
 	* symfile.c (add_symbol_file_command): Remove obsolete comment.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 03a5159193a..7308ea57674 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -224,13 +224,9 @@ CODESIGN_CERT = @CODESIGN_CERT@
 GDBFLAGS =
 
 # Helper code from gnulib.
-GNULIB_BUILDDIR = build-gnulib
+GNULIB_BUILDDIR = ../gnulib
 LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a
-INCGNU = -I$(srcdir)/gnulib/import -I$(GNULIB_BUILDDIR)/import
-
-# Generated headers in the gnulib directory.  These must be listed
-# so that they are generated before other files are compiled.
-GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@
+INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import
 
 #
 # CLI sub directory definitons
@@ -1499,14 +1495,6 @@ HFILES_NO_SRCDIR = \
 	config/djgpp/nl_types.h \
 	config/i386/nm-i386gnu.h \
 	config/sparc/nm-sol2.h \
-	gnulib/import/inttypes.in.h \
-	gnulib/import/stddef.in.h \
-	gnulib/import/stdint.in.h \
-	gnulib/import/str-two-way.h \
-	gnulib/import/string.in.h \
-	gnulib/import/extra/snippet/arg-nonnull.h \
-	gnulib/import/extra/snippet/c++defs.h \
-	gnulib/import/extra/snippet/warn-on-use.h \
 	mi/mi-cmds.h \
 	mi/mi-common.h \
 	mi/mi-console.h \
@@ -1592,14 +1580,14 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 	$(SUBDIR_TARGET_OBS) \
 	$(SUBDIR_GCC_COMPILE_OBS)
 
-SUBDIRS = doc @subdirs@ data-directory $(GNULIB_BUILDDIR)
+SUBDIRS = doc @subdirs@ data-directory
 CLEANDIRS = $(SUBDIRS)
 
 # List of subdirectories in the build tree that must exist.
 # This is used to force build failures in existing trees when
 # a new directory is added.
 # The format here is for the `case' shell command.
-REQUIRED_SUBDIRS = doc | testsuite | $(GNULIB_BUILDDIR) | data-directory
+REQUIRED_SUBDIRS = doc | testsuite | data-directory
 
 # Parser intermediate files.
 YYFILES = \
@@ -1629,7 +1617,6 @@ generated_files = \
 	config.h \
 	gcore \
 	jit-reader.h \
-	$(GNULIB_H) \
 	$(NAT_GENERATED_FILES)
 
 # Flags needed to compile Python code
@@ -1901,12 +1888,6 @@ ifneq ($(CODESIGN_CERT),)
 endif
 
 # Convenience rule to handle recursion.
-$(LIBGNU) $(GNULIB_H): all-lib
-all-lib: $(GNULIB_BUILDDIR)/Makefile
-	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=$(GNULIB_BUILDDIR) subdir_do
-.PHONY: all-lib
-
-# Convenience rule to handle recursion.
 .PHONY: all-data-directory
 all-data-directory: data-directory/Makefile
 	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=data-directory subdir_do
@@ -1962,7 +1943,6 @@ clean mostlyclean: $(CONFIG_CLEAN)
 # always included in SUBDIRS.  Remove the gdbserver files explicitly.
 distclean: clean
 	@$(MAKE) $(FLAGS_TO_PASS) DO=distclean "DODIRS=$(CLEANDIRS)" subdir_do
-	rm -rf $(GNULIB_BUILDDIR)
 	rm -f gdbserver/config.status gdbserver/config.log
 	rm -f gdbserver/tm.h gdbserver/xm.h gdbserver/nm.h
 	rm -f gdbserver/Makefile gdbserver/config.cache
@@ -2020,13 +2000,6 @@ Makefile: Makefile.in config.status
 	  CONFIG_HEADERS= \
 	  $(SHELL) config.status
 
-$(GNULIB_BUILDDIR)/Makefile: gnulib/Makefile.in config.status
-	@cd $(GNULIB_BUILDDIR); CONFIG_FILES="Makefile" \
-	  CONFIG_COMMANDS="depfiles" \
-	  CONFIG_HEADERS= \
-	  CONFIG_LINKS= \
-	  $(SHELL) config.status
-
 data-directory/Makefile: data-directory/Makefile.in config.status
 	CONFIG_FILES="data-directory/Makefile" \
 	  CONFIG_COMMANDS="depfiles" \
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index 8c164926db0..92badd56bd3 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -30,7 +30,7 @@
 #ifdef GDBSERVER
 #include "build-gnulib-gdbserver/config.h"
 #else
-#include "build-gnulib/config.h"
+#include "../../gnulib/config.h"
 #endif
 
 #undef PACKAGE_NAME
diff --git a/gdb/configure b/gdb/configure
index ff0971bc287..361f3cc95bb 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -757,7 +757,6 @@ MAKEINFO_EXTRA_FLAGS
 MAKEINFOFLAGS
 MAKEINFO
 PACKAGE
-GNULIB_STDINT_H
 CATOBJEXT
 GENCAT
 INSTOBJEXT
@@ -6194,119 +6193,6 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 fi
 
 
-gnulib_extra_configure_args=
-# If large-file support is disabled, make sure gnulib does the same.
-if test "$enable_largefile" = no; then
-gnulib_extra_configure_args="$gnulib_extra_configure_args --disable-largefile"
-fi
-
-# Configure gnulib.  We need to build gnulib under some other
-# directory not "gnulib", to avoid the problem of both GDB and
-# GDBserver wanting to build it in the same directory, when building
-# in the source dir.
-
-  in_src="gnulib"
-  in_build="build-gnulib"
-  in_extra_args="$gnulib_extra_configure_args"
-
-  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
-  # so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  eval "set x $ac_configure_args"
-  shift
-  for ac_arg
-  do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case $ac_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    --disable-option-checking)
-      ;;
-    *)
-      case $ac_arg in
-      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-      esac
-      as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_arg="--prefix=$prefix"
-  case $ac_arg in
-  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
-  # Pass --silent
-  if test "$silent" = yes; then
-    ac_sub_configure_args="--silent $ac_sub_configure_args"
-  fi
-
-  # Always prepend --disable-option-checking to silence warnings, since
-  # different subdirs can have different --enable and --with options.
-  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
-  ac_popdir=`pwd`
-  ac_dir=$in_build
-
-  ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-  $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
-  $as_echo "$ac_msg" >&6
-  as_dir="$ac_dir"; as_fn_mkdir_p
-
-  case $srcdir in
-  [\\/]* | ?:[\\/]* )
-    ac_srcdir=$srcdir/$in_src ;;
-  *) # Relative name.
-    ac_srcdir=../$srcdir/$in_src ;;
-  esac
-
-  cd "$ac_dir"
-
-  ac_sub_configure=$ac_srcdir/configure
-
-  # Make the cache file name correct relative to the subdirectory.
-  case $cache_file in
-  [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-  *) # Relative name.
-    ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
-  esac
-
-  if test -n "$in_extra_args"; then
-    # Add the extra args at the end.
-    ac_sub_configure_args="$ac_sub_configure_args $in_extra_args"
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-  # The eval makes quoting arguments work.
-  eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
-       --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-    as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
-
-  cd "$ac_popdir"
-
-
 
 CONFIG_OBS=
 CONFIG_DEPS=
@@ -6399,15 +6285,6 @@ if test x"$USE_NLS" = xyes; then
    CONFIG_UNINSTALL="$CONFIG_UNINSTALL uninstall-po"
 fi
 
-GNULIB=build-gnulib/import
-
-# For Makefile dependencies.
-GNULIB_STDINT_H=
-if test x"$STDINT_H" != x; then
-  GNULIB_STDINT_H=$GNULIB/$STDINT_H
-fi
-
-
 PACKAGE=gdb
 
 cat >>confdefs.h <<_ACEOF
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 1318c8d0087..275f08d2a70 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -45,19 +45,6 @@ AX_CXX_COMPILE_STDCXX(11, , mandatory)
 ZW_CREATE_DEPDIR
 ZW_PROG_COMPILER_DEPENDENCIES([CC])
 
-gnulib_extra_configure_args=
-# If large-file support is disabled, make sure gnulib does the same.
-if test "$enable_largefile" = no; then
-gnulib_extra_configure_args="$gnulib_extra_configure_args --disable-largefile"
-fi
-
-# Configure gnulib.  We need to build gnulib under some other
-# directory not "gnulib", to avoid the problem of both GDB and
-# GDBserver wanting to build it in the same directory, when building
-# in the source dir.
-ACX_CONFIGURE_DIR(["gnulib"], ["build-gnulib"],
-                  ["$gnulib_extra_configure_args"])
-
 dnl List of object files and targets accumulated by configure.
 
 CONFIG_OBS=
@@ -83,15 +70,6 @@ if test x"$USE_NLS" = xyes; then
    CONFIG_UNINSTALL="$CONFIG_UNINSTALL uninstall-po"
 fi
 
-GNULIB=build-gnulib/import
-
-# For Makefile dependencies.
-GNULIB_STDINT_H=
-if test x"$STDINT_H" != x; then
-  GNULIB_STDINT_H=$GNULIB/$STDINT_H
-fi
-AC_SUBST(GNULIB_STDINT_H)
-
 PACKAGE=gdb
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package. ])
 AC_SUBST(PACKAGE)
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 460daab6ea0..a67a9a2fa7d 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,10 @@
+2019-06-14  Tom Tromey  <tom@tromey.com>
+
+	* configure.ac: Use new path to gnulib.
+	* configure: Rebuild.
+	* Makefile.in (INCGNU, $(GNULIB_BUILDDIR)/Makefile): Use new path
+	to gnulib.
+
 2019-06-11  Tom Tromey  <tom@tromey.com>
 
 	* Makefile.in (SFILES): Add alloc.c.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 792325bc511..b9df2be9df1 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -103,7 +103,7 @@ ustinc = @ustinc@
 # gnulib
 GNULIB_BUILDDIR = build-gnulib-gdbserver
 LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a
-INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import
+INCGNU = -I$(srcdir)/../../gnulib/import -I$(GNULIB_BUILDDIR)/import
 
 # Generated headers in the gnulib directory.  These must be listed
 # so that they are generated before other files are compiled.
@@ -500,7 +500,7 @@ stamp-h: config.in config.status
 Makefile: Makefile.in config.status
 	CONFIG_HEADERS="" $(SHELL) ./config.status
 
-$(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../gnulib/Makefile.in config.status
+$(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../../gnulib/Makefile.in config.status
 	  @cd $(GNULIB_BUILDDIR); CONFIG_FILES="Makefile" \
 	  CONFIG_COMMANDS="depfiles" \
 	  CONFIG_HEADERS= \
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index 5ffdeb0816b..e89f2d06c14 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -6073,7 +6073,7 @@ fi
 # "gnulib", to avoid the problem of both GDB and GDBserver wanting to
 # build it in the same directory, when building in the source dir.
 
-  in_src="../gnulib"
+  in_src="../../gnulib"
   in_build="build-gnulib-gdbserver"
   in_extra_args="$gnulib_extra_configure_args"
 
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index 98b22535775..d943269377b 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -88,7 +88,7 @@ fi
 # gdbserver/.  We need to build gnulib under some other directory not
 # "gnulib", to avoid the problem of both GDB and GDBserver wanting to
 # build it in the same directory, when building in the source dir.
-ACX_CONFIGURE_DIR(["../gnulib"], ["build-gnulib-gdbserver"],
+ACX_CONFIGURE_DIR(["../../gnulib"], ["build-gnulib-gdbserver"],
                   ["$gnulib_extra_configure_args"])
 
 ACX_CONFIGURE_DIR(["../../libiberty"], ["build-libiberty-gdbserver"])
diff --git a/gnulib/ChangeLog b/gnulib/ChangeLog
new file mode 100644
index 00000000000..930023e6be4
--- /dev/null
+++ b/gnulib/ChangeLog
@@ -0,0 +1,6 @@
+2019-06-14  Tom Tromey  <tom@tromey.com>
+
+	* update-gnulib.sh: Adjust paths.
+	* Makefile.in: Adjust paths.
+	* configure.ac: Adjust paths.  Use ACX_LARGEFILE.
+	* configure: Rebuild.
diff --git a/gdb/gnulib/Makefile.in b/gnulib/Makefile.in
index a965e88dfac..c42bb239d34 100644
--- a/gdb/gnulib/Makefile.in
+++ b/gnulib/Makefile.in
@@ -199,7 +199,7 @@ config.status: $(srcdir)/configure
 	$(SHELL) config.status --recheck
 
 ACLOCAL = aclocal
-ACLOCAL_AMFLAGS = -I import/m4 -I ../../config
+ACLOCAL_AMFLAGS = -I import/m4 -I ../config
 
 include $(srcdir)/aclocal-m4-deps.mk
 
@@ -240,6 +240,6 @@ force_update:
 MAKEOVERRIDES=
 
 # Disable implicit make rules.
-include $(srcdir)/../disable-implicit-rules.mk
+include $(srcdir)/../gdb/disable-implicit-rules.mk
 
 ### end of the libgnu Makefile.in.
diff --git a/gnulib/README b/gnulib/README
new file mode 100644
index 00000000000..0cbb9006878
--- /dev/null
+++ b/gnulib/README
@@ -0,0 +1,6 @@
+This is an import of gnulib that is used by gdb and gdbserver.
+
+To send patches, follow the gdb patch submission instructions in
+../gdb/CONTRIBUTE.  For maintainers, see ../gdb/MAINTAINERS.
+
+See update-gnulib.sh for instructions on updating gnulib.
diff --git a/gdb/gnulib/aclocal-m4-deps.mk b/gnulib/aclocal-m4-deps.mk
index ffa003d7613..ffa003d7613 100644
--- a/gdb/gnulib/aclocal-m4-deps.mk
+++ b/gnulib/aclocal-m4-deps.mk
diff --git a/gdb/gnulib/aclocal.m4 b/gnulib/aclocal.m4
index e480633394d..911623ed09a 100644
--- a/gdb/gnulib/aclocal.m4
+++ b/gnulib/aclocal.m4
@@ -20,6 +20,460 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.60])
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+  AC_REQUIRE([AC_PROG_SED])dnl
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+
+  dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+    *) MSGFMT_015=$MSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([MSGFMT_015])
+changequote(,)dnl
+  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+    *) GMSGFMT_015=$GMSGFMT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([GMSGFMT_015])
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Test whether it is GNU xgettext >= 0.15.
+changequote(,)dnl
+  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+    *) XGETTEXT_015=$XGETTEXT ;;
+  esac
+changequote([,])dnl
+  AC_SUBST([XGETTEXT_015])
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+  dnl Installation directories.
+  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+  dnl have to define it here, so that it can be used in po/Makefile.
+  test -n "$localedir" || localedir='${datadir}/locale'
+  AC_SUBST([localedir])
+
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+  AC_CONFIG_COMMANDS([po-directories], [[
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          gt_tab=`printf '\t'`
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done]],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake < 1.5.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+  # When this code is run, in config.status, two variables have already been
+  # set:
+  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+  # - LINGUAS is the value of the environment variable LINGUAS at configure
+  #   time.
+
+changequote(,)dnl
+  # Adjust a relative srcdir.
+  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  # In autoconf-2.13 it is called $ac_given_srcdir.
+  # In autoconf-2.50 it is called $srcdir.
+  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  case "$ac_given_srcdir" in
+    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+    /*) top_srcdir="$ac_given_srcdir" ;;
+    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  # Find a way to echo strings without interpreting backslash.
+  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+    gt_echo='echo'
+  else
+    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+      gt_echo='printf %s\n'
+    else
+      echo_func () {
+        cat <<EOT
+$*
+EOT
+      }
+      gt_echo='echo_func'
+    fi
+  fi
+
+  # A sed script that extracts the value of VARIABLE from a Makefile.
+  tab=`printf '\t'`
+  sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
+  # Seen the first line of the variable definition.
+  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
+  ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+  # Set POTFILES to the value of the Makefile variable POTFILES.
+  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+  # Compute POTFILES_DEPS as
+  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+  POTFILES_DEPS=
+  for file in $POTFILES; do
+    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+  done
+  POMAKEFILEDEPS=""
+
+  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+    # The LINGUAS file contains the set of available languages.
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+  else
+    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+  fi
+  # Hide the ALL_LINGUAS assignment from automake < 1.5.
+  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+  # Compute POFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+  # Compute UPDATEPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+  # Compute DUMMYPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+  # Compute GMOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+  # Compute PROPERTIESFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+  # Compute CLASSFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+  # Compute QMFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+  # Compute MSGFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+  # Compute RESOURCESDLLFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+  case "$ac_given_srcdir" in
+    .) srcdirpre= ;;
+    *) srcdirpre='$(srcdir)/' ;;
+  esac
+  POFILES=
+  UPDATEPOFILES=
+  DUMMYPOFILES=
+  GMOFILES=
+  PROPERTIESFILES=
+  CLASSFILES=
+  QMFILES=
+  MSGFILES=
+  RESOURCESDLLFILES=
+  for lang in $ALL_LINGUAS; do
+    POFILES="$POFILES $srcdirpre$lang.po"
+    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+    QMFILES="$QMFILES $srcdirpre$lang.qm"
+    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+  done
+  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+  # environment variable.
+  INST_LINGUAS=
+  if test -n "$ALL_LINGUAS"; then
+    for presentlang in $ALL_LINGUAS; do
+      useit=no
+      if test "%UNSET%" != "$LINGUAS"; then
+        desiredlanguages="$LINGUAS"
+      else
+        desiredlanguages="$ALL_LINGUAS"
+      fi
+      for desiredlang in $desiredlanguages; do
+        # Use the presentlang catalog if desiredlang is
+        #   a. equal to presentlang, or
+        #   b. a variant of presentlang (because in this case,
+        #      presentlang can be used as a fallback for messages
+        #      which are not translated in the desiredlang catalog).
+        case "$desiredlang" in
+          "$presentlang"*) useit=yes;;
+        esac
+      done
+      if test $useit = yes; then
+        INST_LINGUAS="$INST_LINGUAS $presentlang"
+      fi
+    done
+  fi
+  CATALOGS=
+  JAVACATALOGS=
+  QTCATALOGS=
+  TCLCATALOGS=
+  CSHARPCATALOGS=
+  if test -n "$INST_LINGUAS"; then
+    for lang in $INST_LINGUAS; do
+      CATALOGS="$CATALOGS $lang.gmo"
+      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+      QTCATALOGS="$QTCATALOGS $lang.qm"
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+    done
+  fi
+
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  tab=`printf '\t'`
+  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if test -n "$POMAKEFILEDEPS"; then
+    cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+  fi
+  mv "$ac_file.tmp" "$ac_file"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
+
 # Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -686,25 +1140,6 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2017 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.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
@@ -1275,6 +1710,11 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../config/depstand.m4])
+m4_include([../config/largefile.m4])
+m4_include([../config/lead-dot.m4])
+m4_include([../config/override.m4])
+m4_include([../config/plugins.m4])
 m4_include([import/m4/00gnulib.m4])
 m4_include([import/m4/absolute-header.m4])
 m4_include([import/m4/alloca.m4])
diff --git a/gdb/gnulib/config.in b/gnulib/config.in
index 2f1a5405506..2f1a5405506 100644
--- a/gdb/gnulib/config.in
+++ b/gnulib/config.in
diff --git a/gdb/gnulib/configure b/gnulib/configure
index 340c622cb39..a551e22b22d 100644
--- a/gdb/gnulib/configure
+++ b/gnulib/configure
@@ -1775,6 +1775,7 @@ ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
 enable_largefile
+enable_plugins
 enable_dependency_tracking
 enable_silent_rules
 '
@@ -2410,6 +2411,7 @@ Optional Features:
                           enable make rules and dependencies not useful (and
                           sometimes confusing) to the casual installer
   --disable-largefile     omit support for large files
+  --enable-plugins        Enable support for plugins
   --enable-dependency-tracking
                           do not reject slow dependency extractors
   --disable-dependency-tracking
@@ -2742,6 +2744,52 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_header_compile
 
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2796,52 +2844,6 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_type
 
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -3607,6 +3609,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
 ac_config_headers="$ac_config_headers config.h:config.in"
 
 
@@ -6505,35 +6510,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
 
 
-ac_aux_dir=
-for ac_dir in ../.. "$srcdir"/../..; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
 if ${ac_cv_target+:} false; then :
@@ -6574,6 +6550,364 @@ test -n "$target_alias" &&
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
+# The tests for host and target for $enable_largefile require
+# canonical names.
+
+
+
+# As the $enable_largefile decision depends on --enable-plugins we must set it
+# even in directories otherwise not depending on the $plugins option.
+
+
+  maybe_plugins=no
+  for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+ maybe_plugins=yes
+fi
+
+done
+
+  for ac_header in windows.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_windows_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WINDOWS_H 1
+_ACEOF
+ maybe_plugins=yes
+fi
+
+done
+
+
+  # Check whether --enable-plugins was given.
+if test "${enable_plugins+set}" = set; then :
+  enableval=$enable_plugins; case "${enableval}" in
+      no) plugins=no ;;
+      *) plugins=yes
+         if test "$maybe_plugins" != "yes" ; then
+	   as_fn_error $? "Building with plugin support requires a host that supports dlopen." "$LINENO" 5
+	 fi ;;
+     esac
+else
+  plugins=$maybe_plugins
+
+fi
+
+  if test "$plugins" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5
+$as_echo_n "checking for library containing dlsym... " >&6; }
+if ${ac_cv_search_dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlsym ();
+int
+main ()
+{
+return dlsym ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dlsym=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlsym+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlsym+:} false; then :
+
+else
+  ac_cv_search_dlsym=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlsym" >&5
+$as_echo "$ac_cv_search_dlsym" >&6; }
+ac_res=$ac_cv_search_dlsym
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+  fi
+
+
+case "${host}" in
+  sparc-*-solaris*|i[3-7]86-*-solaris*)
+    # On native 32bit sparc and ia32 solaris, large-file and procfs support
+    # are mutually exclusive; and without procfs support, the bfd/ elf module
+    # cannot provide certain routines such as elfcore_write_prpsinfo
+    # or elfcore_write_prstatus.  So unless the user explicitly requested
+    # large-file support through the --enable-largefile switch, disable
+    # large-file support in favor of procfs support.
+    test "${target}" = "${host}" -a "x$plugins" = xno \
+      && : ${enable_largefile="no"}
+    ;;
+esac
+
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+         # IRIX 6.2 and later do not support large files by default,
+         # so use the C compiler's -n32 option if that helps.
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+         if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+         CC="$CC -n32"
+         if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+         break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+
+
+$as_echo "#define _DARWIN_USE_64_BIT_INODE 1" >>confdefs.h
+
+fi
+
+
+
+ac_aux_dir=
+for ac_dir in .. "$srcdir"/..; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in .. \"$srcdir\"/.." "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+
 
 
 
@@ -8110,6 +8444,9 @@ $as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h
 fi
 
 
+  XGETTEXT_EXTRA_OPTIONS=
+
+
 
 
 
@@ -15898,6 +16235,13 @@ $as_echo "$ac_cv_lib_error_at_line" >&6; }
   fi
 
 
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error:3:c-format"
+
+
+
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error_at_line:5:c-format"
+
+
 
 
 
diff --git a/gdb/gnulib/configure.ac b/gnulib/configure.ac
index 0ea34016266..74e4ae2b688 100644
--- a/gdb/gnulib/configure.ac
+++ b/gnulib/configure.ac
@@ -28,7 +28,9 @@ AC_USE_SYSTEM_EXTENSIONS
 gl_EARLY
 AM_PROG_CC_STDC
 
-AC_CONFIG_AUX_DIR(../..)
+ACX_LARGEFILE
+
+AC_CONFIG_AUX_DIR(..)
 AC_CANONICAL_SYSTEM
 
 gl_INIT
diff --git a/gdb/gnulib/import/Makefile.am b/gnulib/import/Makefile.am
index 9dca489ee10..9dca489ee10 100644
--- a/gdb/gnulib/import/Makefile.am
+++ b/gnulib/import/Makefile.am
diff --git a/gdb/gnulib/import/Makefile.in b/gnulib/import/Makefile.in
index f433c363485..f433c363485 100644
--- a/gdb/gnulib/import/Makefile.in
+++ b/gnulib/import/Makefile.in
diff --git a/gdb/gnulib/import/alloca.c b/gnulib/import/alloca.c
index ee0f0188682..ee0f0188682 100644
--- a/gdb/gnulib/import/alloca.c
+++ b/gnulib/import/alloca.c
diff --git a/gdb/gnulib/import/alloca.in.h b/gnulib/import/alloca.in.h
index 6a25ecdb7b7..6a25ecdb7b7 100644
--- a/gdb/gnulib/import/alloca.in.h
+++ b/gnulib/import/alloca.in.h
diff --git a/gdb/gnulib/import/arpa_inet.in.h b/gnulib/import/arpa_inet.in.h
index 026c4dcb6d2..026c4dcb6d2 100644
--- a/gdb/gnulib/import/arpa_inet.in.h
+++ b/gnulib/import/arpa_inet.in.h
diff --git a/gdb/gnulib/import/assure.h b/gnulib/import/assure.h
index de1f6656886..de1f6656886 100644
--- a/gdb/gnulib/import/assure.h
+++ b/gnulib/import/assure.h
diff --git a/gdb/gnulib/import/at-func.c b/gnulib/import/at-func.c
index 5a8894a4ab5..5a8894a4ab5 100644
--- a/gdb/gnulib/import/at-func.c
+++ b/gnulib/import/at-func.c
diff --git a/gdb/gnulib/import/basename-lgpl.c b/gnulib/import/basename-lgpl.c
index 11821096ae9..11821096ae9 100644
--- a/gdb/gnulib/import/basename-lgpl.c
+++ b/gnulib/import/basename-lgpl.c
diff --git a/gdb/gnulib/import/canonicalize-lgpl.c b/gnulib/import/canonicalize-lgpl.c
index 4b1f6cb40ff..4b1f6cb40ff 100644
--- a/gdb/gnulib/import/canonicalize-lgpl.c
+++ b/gnulib/import/canonicalize-lgpl.c
diff --git a/gdb/gnulib/import/chdir-long.c b/gnulib/import/chdir-long.c
index 5a039ced881..5a039ced881 100644
--- a/gdb/gnulib/import/chdir-long.c
+++ b/gnulib/import/chdir-long.c
diff --git a/gdb/gnulib/import/chdir-long.h b/gnulib/import/chdir-long.h
index 614b6cfc985..614b6cfc985 100644
--- a/gdb/gnulib/import/chdir-long.h
+++ b/gnulib/import/chdir-long.h
diff --git a/gdb/gnulib/import/cloexec.c b/gnulib/import/cloexec.c
index 1202836f7c2..1202836f7c2 100644
--- a/gdb/gnulib/import/cloexec.c
+++ b/gnulib/import/cloexec.c
diff --git a/gdb/gnulib/import/cloexec.h b/gnulib/import/cloexec.h
index 0e5843736cd..0e5843736cd 100644
--- a/gdb/gnulib/import/cloexec.h
+++ b/gnulib/import/cloexec.h
diff --git a/gdb/gnulib/import/close.c b/gnulib/import/close.c
index 46a7aa5176d..46a7aa5176d 100644
--- a/gdb/gnulib/import/close.c
+++ b/gnulib/import/close.c
diff --git a/gdb/gnulib/import/closedir.c b/gnulib/import/closedir.c
index 30d12903517..30d12903517 100644
--- a/gdb/gnulib/import/closedir.c
+++ b/gnulib/import/closedir.c
diff --git a/gdb/gnulib/import/config.charset b/gnulib/import/config.charset
index 947d9164ea7..947d9164ea7 100644
--- a/gdb/gnulib/import/config.charset
+++ b/gnulib/import/config.charset
diff --git a/gdb/gnulib/import/dirent-private.h b/gnulib/import/dirent-private.h
index 9b200f30da0..9b200f30da0 100644
--- a/gdb/gnulib/import/dirent-private.h
+++ b/gnulib/import/dirent-private.h
diff --git a/gdb/gnulib/import/dirent.in.h b/gnulib/import/dirent.in.h
index 65482d7b7ac..65482d7b7ac 100644
--- a/gdb/gnulib/import/dirent.in.h
+++ b/gnulib/import/dirent.in.h
diff --git a/gdb/gnulib/import/dirfd.c b/gnulib/import/dirfd.c
index a32584856a2..a32584856a2 100644
--- a/gdb/gnulib/import/dirfd.c
+++ b/gnulib/import/dirfd.c
diff --git a/gdb/gnulib/import/dirname-lgpl.c b/gnulib/import/dirname-lgpl.c
index a7aabf94162..a7aabf94162 100644
--- a/gdb/gnulib/import/dirname-lgpl.c
+++ b/gnulib/import/dirname-lgpl.c
diff --git a/gdb/gnulib/import/dirname.h b/gnulib/import/dirname.h
index 875b31bae52..875b31bae52 100644
--- a/gdb/gnulib/import/dirname.h
+++ b/gnulib/import/dirname.h
diff --git a/gdb/gnulib/import/dosname.h b/gnulib/import/dosname.h
index 83a953f3c0f..83a953f3c0f 100644
--- a/gdb/gnulib/import/dosname.h
+++ b/gnulib/import/dosname.h
diff --git a/gdb/gnulib/import/dup-safer.c b/gnulib/import/dup-safer.c
index 6ed8f792532..6ed8f792532 100644
--- a/gdb/gnulib/import/dup-safer.c
+++ b/gnulib/import/dup-safer.c
diff --git a/gdb/gnulib/import/dup.c b/gnulib/import/dup.c
index 034fcf8d318..034fcf8d318 100644
--- a/gdb/gnulib/import/dup.c
+++ b/gnulib/import/dup.c
diff --git a/gdb/gnulib/import/dup2.c b/gnulib/import/dup2.c
index 5d026f21fa7..5d026f21fa7 100644
--- a/gdb/gnulib/import/dup2.c
+++ b/gnulib/import/dup2.c
diff --git a/gdb/gnulib/import/errno.in.h b/gnulib/import/errno.in.h
index b8397ee465d..b8397ee465d 100644
--- a/gdb/gnulib/import/errno.in.h
+++ b/gnulib/import/errno.in.h
diff --git a/gdb/gnulib/import/error.c b/gnulib/import/error.c
index b3b1286a350..b3b1286a350 100644
--- a/gdb/gnulib/import/error.c
+++ b/gnulib/import/error.c
diff --git a/gdb/gnulib/import/error.h b/gnulib/import/error.h
index 6a69db09358..6a69db09358 100644
--- a/gdb/gnulib/import/error.h
+++ b/gnulib/import/error.h
diff --git a/gdb/gnulib/import/exitfail.c b/gnulib/import/exitfail.c
index 8033c22ab41..8033c22ab41 100644
--- a/gdb/gnulib/import/exitfail.c
+++ b/gnulib/import/exitfail.c
diff --git a/gdb/gnulib/import/exitfail.h b/gnulib/import/exitfail.h
index 62311bd48ca..62311bd48ca 100644
--- a/gdb/gnulib/import/exitfail.h
+++ b/gnulib/import/exitfail.h
diff --git a/gdb/gnulib/import/extra/snippet/_Noreturn.h b/gnulib/import/extra/snippet/_Noreturn.h
index c44ad89b7c0..c44ad89b7c0 100644
--- a/gdb/gnulib/import/extra/snippet/_Noreturn.h
+++ b/gnulib/import/extra/snippet/_Noreturn.h
diff --git a/gdb/gnulib/import/extra/snippet/arg-nonnull.h b/gnulib/import/extra/snippet/arg-nonnull.h
index 584649f694b..584649f694b 100644
--- a/gdb/gnulib/import/extra/snippet/arg-nonnull.h
+++ b/gnulib/import/extra/snippet/arg-nonnull.h
diff --git a/gdb/gnulib/import/extra/snippet/c++defs.h b/gnulib/import/extra/snippet/c++defs.h
index d42ea25d852..d42ea25d852 100644
--- a/gdb/gnulib/import/extra/snippet/c++defs.h
+++ b/gnulib/import/extra/snippet/c++defs.h
diff --git a/gdb/gnulib/import/extra/snippet/warn-on-use.h b/gnulib/import/extra/snippet/warn-on-use.h
index 2948b47882e..2948b47882e 100644
--- a/gdb/gnulib/import/extra/snippet/warn-on-use.h
+++ b/gnulib/import/extra/snippet/warn-on-use.h
diff --git a/gdb/gnulib/import/extra/update-copyright b/gnulib/import/extra/update-copyright
index 17ee6b14d11..17ee6b14d11 100755
--- a/gdb/gnulib/import/extra/update-copyright
+++ b/gnulib/import/extra/update-copyright
diff --git a/gdb/gnulib/import/fchdir.c b/gnulib/import/fchdir.c
index 8a7a072d7a6..8a7a072d7a6 100644
--- a/gdb/gnulib/import/fchdir.c
+++ b/gnulib/import/fchdir.c
diff --git a/gdb/gnulib/import/fcntl.c b/gnulib/import/fcntl.c
index fd17e962f8b..fd17e962f8b 100644
--- a/gdb/gnulib/import/fcntl.c
+++ b/gnulib/import/fcntl.c
diff --git a/gdb/gnulib/import/fcntl.in.h b/gnulib/import/fcntl.in.h
index b94397307e9..b94397307e9 100644
--- a/gdb/gnulib/import/fcntl.in.h
+++ b/gnulib/import/fcntl.in.h
diff --git a/gdb/gnulib/import/fd-hook.c b/gnulib/import/fd-hook.c
index 8676c6bdfc0..8676c6bdfc0 100644
--- a/gdb/gnulib/import/fd-hook.c
+++ b/gnulib/import/fd-hook.c
diff --git a/gdb/gnulib/import/fd-hook.h b/gnulib/import/fd-hook.h
index 9568d07511b..9568d07511b 100644
--- a/gdb/gnulib/import/fd-hook.h
+++ b/gnulib/import/fd-hook.h
diff --git a/gdb/gnulib/import/fd-safer.c b/gnulib/import/fd-safer.c
index 8a6bee2ee18..8a6bee2ee18 100644
--- a/gdb/gnulib/import/fd-safer.c
+++ b/gnulib/import/fd-safer.c
diff --git a/gdb/gnulib/import/fdopendir.c b/gnulib/import/fdopendir.c
index c1f4dcbaca0..c1f4dcbaca0 100644
--- a/gdb/gnulib/import/fdopendir.c
+++ b/gnulib/import/fdopendir.c
diff --git a/gdb/gnulib/import/filename.h b/gnulib/import/filename.h
index 7d2c31a8c38..7d2c31a8c38 100644
--- a/gdb/gnulib/import/filename.h
+++ b/gnulib/import/filename.h
diff --git a/gdb/gnulib/import/filenamecat-lgpl.c b/gnulib/import/filenamecat-lgpl.c
index 4903fbf370c..4903fbf370c 100644
--- a/gdb/gnulib/import/filenamecat-lgpl.c
+++ b/gnulib/import/filenamecat-lgpl.c
diff --git a/gdb/gnulib/import/filenamecat.h b/gnulib/import/filenamecat.h
index 791a0af9b7a..791a0af9b7a 100644
--- a/gdb/gnulib/import/filenamecat.h
+++ b/gnulib/import/filenamecat.h
diff --git a/gdb/gnulib/import/flexmember.h b/gnulib/import/flexmember.h
index 62c556bae25..62c556bae25 100644
--- a/gdb/gnulib/import/flexmember.h
+++ b/gnulib/import/flexmember.h
diff --git a/gdb/gnulib/import/float+.h b/gnulib/import/float+.h
index 00fcc763225..00fcc763225 100644
--- a/gdb/gnulib/import/float+.h
+++ b/gnulib/import/float+.h
diff --git a/gdb/gnulib/import/float.c b/gnulib/import/float.c
index 1bad2ee2bd9..1bad2ee2bd9 100644
--- a/gdb/gnulib/import/float.c
+++ b/gnulib/import/float.c
diff --git a/gdb/gnulib/import/float.in.h b/gnulib/import/float.in.h
index 0b93d90087a..0b93d90087a 100644
--- a/gdb/gnulib/import/float.in.h
+++ b/gnulib/import/float.in.h
diff --git a/gdb/gnulib/import/fnmatch.c b/gnulib/import/fnmatch.c
index 0858091cf36..0858091cf36 100644
--- a/gdb/gnulib/import/fnmatch.c
+++ b/gnulib/import/fnmatch.c
diff --git a/gdb/gnulib/import/fnmatch.in.h b/gnulib/import/fnmatch.in.h
index 890ee56f278..890ee56f278 100644
--- a/gdb/gnulib/import/fnmatch.in.h
+++ b/gnulib/import/fnmatch.in.h
diff --git a/gdb/gnulib/import/fnmatch_loop.c b/gnulib/import/fnmatch_loop.c
index 0c2b48437cd..0c2b48437cd 100644
--- a/gdb/gnulib/import/fnmatch_loop.c
+++ b/gnulib/import/fnmatch_loop.c
diff --git a/gdb/gnulib/import/fpucw.h b/gnulib/import/fpucw.h
index 05ee0cac947..05ee0cac947 100644
--- a/gdb/gnulib/import/fpucw.h
+++ b/gnulib/import/fpucw.h
diff --git a/gdb/gnulib/import/frexp.c b/gnulib/import/frexp.c
index 5edb028b651..5edb028b651 100644
--- a/gdb/gnulib/import/frexp.c
+++ b/gnulib/import/frexp.c
diff --git a/gdb/gnulib/import/frexpl.c b/gnulib/import/frexpl.c
index 714a2ffded9..714a2ffded9 100644
--- a/gdb/gnulib/import/frexpl.c
+++ b/gnulib/import/frexpl.c
diff --git a/gdb/gnulib/import/fstat.c b/gnulib/import/fstat.c
index 435c4290702..435c4290702 100644
--- a/gdb/gnulib/import/fstat.c
+++ b/gnulib/import/fstat.c
diff --git a/gdb/gnulib/import/fstatat.c b/gnulib/import/fstatat.c
index ebbecfd14ab..ebbecfd14ab 100644
--- a/gdb/gnulib/import/fstatat.c
+++ b/gnulib/import/fstatat.c
diff --git a/gdb/gnulib/import/getcwd-lgpl.c b/gnulib/import/getcwd-lgpl.c
index c553f7b4926..c553f7b4926 100644
--- a/gdb/gnulib/import/getcwd-lgpl.c
+++ b/gnulib/import/getcwd-lgpl.c
diff --git a/gdb/gnulib/import/getcwd.c b/gnulib/import/getcwd.c
index e1265fdd3a4..e1265fdd3a4 100644
--- a/gdb/gnulib/import/getcwd.c
+++ b/gnulib/import/getcwd.c
diff --git a/gdb/gnulib/import/getdtablesize.c b/gnulib/import/getdtablesize.c
index d23405571b0..d23405571b0 100644
--- a/gdb/gnulib/import/getdtablesize.c
+++ b/gnulib/import/getdtablesize.c
diff --git a/gdb/gnulib/import/getlogin_r.c b/gnulib/import/getlogin_r.c
index 2bafb55fb14..2bafb55fb14 100644
--- a/gdb/gnulib/import/getlogin_r.c
+++ b/gnulib/import/getlogin_r.c
diff --git a/gdb/gnulib/import/getprogname.c b/gnulib/import/getprogname.c
index a7246e9ef2e..a7246e9ef2e 100644
--- a/gdb/gnulib/import/getprogname.c
+++ b/gnulib/import/getprogname.c
diff --git a/gdb/gnulib/import/getprogname.h b/gnulib/import/getprogname.h
index e8f9e978b16..e8f9e978b16 100644
--- a/gdb/gnulib/import/getprogname.h
+++ b/gnulib/import/getprogname.h
diff --git a/gdb/gnulib/import/gettext.h b/gnulib/import/gettext.h
index 9a232cc3a86..9a232cc3a86 100644
--- a/gdb/gnulib/import/gettext.h
+++ b/gnulib/import/gettext.h
diff --git a/gdb/gnulib/import/gettimeofday.c b/gnulib/import/gettimeofday.c
index 224ca6a1762..224ca6a1762 100644
--- a/gdb/gnulib/import/gettimeofday.c
+++ b/gnulib/import/gettimeofday.c
diff --git a/gdb/gnulib/import/glob-libc.h b/gnulib/import/glob-libc.h
index 6256077f702..6256077f702 100644
--- a/gdb/gnulib/import/glob-libc.h
+++ b/gnulib/import/glob-libc.h
diff --git a/gdb/gnulib/import/glob.c b/gnulib/import/glob.c
index 4b04b902e51..4b04b902e51 100644
--- a/gdb/gnulib/import/glob.c
+++ b/gnulib/import/glob.c
diff --git a/gdb/gnulib/import/glob.in.h b/gnulib/import/glob.in.h
index 77816bc0995..77816bc0995 100644
--- a/gdb/gnulib/import/glob.in.h
+++ b/gnulib/import/glob.in.h
diff --git a/gdb/gnulib/import/hard-locale.c b/gnulib/import/hard-locale.c
index c7d9da526f8..c7d9da526f8 100644
--- a/gdb/gnulib/import/hard-locale.c
+++ b/gnulib/import/hard-locale.c
diff --git a/gdb/gnulib/import/hard-locale.h b/gnulib/import/hard-locale.h
index 7644afa37fb..7644afa37fb 100644
--- a/gdb/gnulib/import/hard-locale.h
+++ b/gnulib/import/hard-locale.h
diff --git a/gdb/gnulib/import/inet_ntop.c b/gnulib/import/inet_ntop.c
index 8668bf6d1b2..8668bf6d1b2 100644
--- a/gdb/gnulib/import/inet_ntop.c
+++ b/gnulib/import/inet_ntop.c
diff --git a/gdb/gnulib/import/intprops.h b/gnulib/import/intprops.h
index 8add5def8ec..8add5def8ec 100644
--- a/gdb/gnulib/import/intprops.h
+++ b/gnulib/import/intprops.h
diff --git a/gdb/gnulib/import/inttypes.in.h b/gnulib/import/inttypes.in.h
index ed09db6e86e..ed09db6e86e 100644
--- a/gdb/gnulib/import/inttypes.in.h
+++ b/gnulib/import/inttypes.in.h
diff --git a/gdb/gnulib/import/isnan.c b/gnulib/import/isnan.c
index e1e57b2ff2c..e1e57b2ff2c 100644
--- a/gdb/gnulib/import/isnan.c
+++ b/gnulib/import/isnan.c
diff --git a/gdb/gnulib/import/isnand-nolibm.h b/gnulib/import/isnand-nolibm.h
index dc4726464aa..dc4726464aa 100644
--- a/gdb/gnulib/import/isnand-nolibm.h
+++ b/gnulib/import/isnand-nolibm.h
diff --git a/gdb/gnulib/import/isnand.c b/gnulib/import/isnand.c
index 405b23a14de..405b23a14de 100644
--- a/gdb/gnulib/import/isnand.c
+++ b/gnulib/import/isnand.c
diff --git a/gdb/gnulib/import/isnanl-nolibm.h b/gnulib/import/isnanl-nolibm.h
index efd919959b8..efd919959b8 100644
--- a/gdb/gnulib/import/isnanl-nolibm.h
+++ b/gnulib/import/isnanl-nolibm.h
diff --git a/gdb/gnulib/import/isnanl.c b/gnulib/import/isnanl.c
index 67d39d177dc..67d39d177dc 100644
--- a/gdb/gnulib/import/isnanl.c
+++ b/gnulib/import/isnanl.c
diff --git a/gdb/gnulib/import/itold.c b/gnulib/import/itold.c
index 5533392e538..5533392e538 100644
--- a/gdb/gnulib/import/itold.c
+++ b/gnulib/import/itold.c
diff --git a/gdb/gnulib/import/limits.in.h b/gnulib/import/limits.in.h
index a1eae02ada8..a1eae02ada8 100644
--- a/gdb/gnulib/import/limits.in.h
+++ b/gnulib/import/limits.in.h
diff --git a/gdb/gnulib/import/localcharset.c b/gnulib/import/localcharset.c
index b2a0369782d..b2a0369782d 100644
--- a/gdb/gnulib/import/localcharset.c
+++ b/gnulib/import/localcharset.c
diff --git a/gdb/gnulib/import/localcharset.h b/gnulib/import/localcharset.h
index 915182e328c..915182e328c 100644
--- a/gdb/gnulib/import/localcharset.h
+++ b/gnulib/import/localcharset.h
diff --git a/gdb/gnulib/import/lstat.c b/gnulib/import/lstat.c
index 03b063436d4..03b063436d4 100644
--- a/gdb/gnulib/import/lstat.c
+++ b/gnulib/import/lstat.c
diff --git a/gdb/gnulib/import/m4/00gnulib.m4 b/gnulib/import/m4/00gnulib.m4
index bb37e32aa3c..bb37e32aa3c 100644
--- a/gdb/gnulib/import/m4/00gnulib.m4
+++ b/gnulib/import/m4/00gnulib.m4
diff --git a/gdb/gnulib/import/m4/absolute-header.m4 b/gnulib/import/m4/absolute-header.m4
index 7ffc38d7a2b..7ffc38d7a2b 100644
--- a/gdb/gnulib/import/m4/absolute-header.m4
+++ b/gnulib/import/m4/absolute-header.m4
diff --git a/gdb/gnulib/import/m4/alloca.m4 b/gnulib/import/m4/alloca.m4
index 2382ff1eeea..2382ff1eeea 100644
--- a/gdb/gnulib/import/m4/alloca.m4
+++ b/gnulib/import/m4/alloca.m4
diff --git a/gdb/gnulib/import/m4/arpa_inet_h.m4 b/gnulib/import/m4/arpa_inet_h.m4
index 5387f28409d..5387f28409d 100644
--- a/gdb/gnulib/import/m4/arpa_inet_h.m4
+++ b/gnulib/import/m4/arpa_inet_h.m4
diff --git a/gdb/gnulib/import/m4/canonicalize.m4 b/gnulib/import/m4/canonicalize.m4
index cbbf3e26724..cbbf3e26724 100644
--- a/gdb/gnulib/import/m4/canonicalize.m4
+++ b/gnulib/import/m4/canonicalize.m4
diff --git a/gdb/gnulib/import/m4/chdir-long.m4 b/gnulib/import/m4/chdir-long.m4
index 85e7a2284c6..85e7a2284c6 100644
--- a/gdb/gnulib/import/m4/chdir-long.m4
+++ b/gnulib/import/m4/chdir-long.m4
diff --git a/gdb/gnulib/import/m4/close.m4 b/gnulib/import/m4/close.m4
index 310f076bed8..310f076bed8 100644
--- a/gdb/gnulib/import/m4/close.m4
+++ b/gnulib/import/m4/close.m4
diff --git a/gdb/gnulib/import/m4/closedir.m4 b/gnulib/import/m4/closedir.m4
index 0c9fd82de2a..0c9fd82de2a 100644
--- a/gdb/gnulib/import/m4/closedir.m4
+++ b/gnulib/import/m4/closedir.m4
diff --git a/gdb/gnulib/import/m4/codeset.m4 b/gnulib/import/m4/codeset.m4
index bc98201e39d..bc98201e39d 100644
--- a/gdb/gnulib/import/m4/codeset.m4
+++ b/gnulib/import/m4/codeset.m4
diff --git a/gdb/gnulib/import/m4/configmake.m4 b/gnulib/import/m4/configmake.m4
index 80b92548ca3..80b92548ca3 100644
--- a/gdb/gnulib/import/m4/configmake.m4
+++ b/gnulib/import/m4/configmake.m4
diff --git a/gdb/gnulib/import/m4/d-ino.m4 b/gnulib/import/m4/d-ino.m4
index f3ce54c9d88..f3ce54c9d88 100644
--- a/gdb/gnulib/import/m4/d-ino.m4
+++ b/gnulib/import/m4/d-ino.m4
diff --git a/gdb/gnulib/import/m4/d-type.m4 b/gnulib/import/m4/d-type.m4
index eda762c47f9..eda762c47f9 100644
--- a/gdb/gnulib/import/m4/d-type.m4
+++ b/gnulib/import/m4/d-type.m4
diff --git a/gdb/gnulib/import/m4/dirent_h.m4 b/gnulib/import/m4/dirent_h.m4
index 68836a4066b..68836a4066b 100644
--- a/gdb/gnulib/import/m4/dirent_h.m4
+++ b/gnulib/import/m4/dirent_h.m4
diff --git a/gdb/gnulib/import/m4/dirfd.m4 b/gnulib/import/m4/dirfd.m4
index 1d7cb080d8e..1d7cb080d8e 100644
--- a/gdb/gnulib/import/m4/dirfd.m4
+++ b/gnulib/import/m4/dirfd.m4
diff --git a/gdb/gnulib/import/m4/dirname.m4 b/gnulib/import/m4/dirname.m4
index 6f8bec32c48..6f8bec32c48 100644
--- a/gdb/gnulib/import/m4/dirname.m4
+++ b/gnulib/import/m4/dirname.m4
diff --git a/gdb/gnulib/import/m4/double-slash-root.m4 b/gnulib/import/m4/double-slash-root.m4
index dfd3921d1ec..dfd3921d1ec 100644
--- a/gdb/gnulib/import/m4/double-slash-root.m4
+++ b/gnulib/import/m4/double-slash-root.m4
diff --git a/gdb/gnulib/import/m4/dup.m4 b/gnulib/import/m4/dup.m4
index e30348c8cd4..e30348c8cd4 100644
--- a/gdb/gnulib/import/m4/dup.m4
+++ b/gnulib/import/m4/dup.m4
diff --git a/gdb/gnulib/import/m4/dup2.m4 b/gnulib/import/m4/dup2.m4
index 5b68312b1e7..5b68312b1e7 100644
--- a/gdb/gnulib/import/m4/dup2.m4
+++ b/gnulib/import/m4/dup2.m4
diff --git a/gdb/gnulib/import/m4/eealloc.m4 b/gnulib/import/m4/eealloc.m4
index 63d74defece..63d74defece 100644
--- a/gdb/gnulib/import/m4/eealloc.m4
+++ b/gnulib/import/m4/eealloc.m4
diff --git a/gdb/gnulib/import/m4/environ.m4 b/gnulib/import/m4/environ.m4
index 9a0ea7e2144..9a0ea7e2144 100644
--- a/gdb/gnulib/import/m4/environ.m4
+++ b/gnulib/import/m4/environ.m4
diff --git a/gdb/gnulib/import/m4/errno_h.m4 b/gnulib/import/m4/errno_h.m4
index b111fce0532..b111fce0532 100644
--- a/gdb/gnulib/import/m4/errno_h.m4
+++ b/gnulib/import/m4/errno_h.m4
diff --git a/gdb/gnulib/import/m4/error.m4 b/gnulib/import/m4/error.m4
index f772bcf580e..f772bcf580e 100644
--- a/gdb/gnulib/import/m4/error.m4
+++ b/gnulib/import/m4/error.m4
diff --git a/gdb/gnulib/import/m4/exponentd.m4 b/gnulib/import/m4/exponentd.m4
index 7869a7d6cb7..7869a7d6cb7 100644
--- a/gdb/gnulib/import/m4/exponentd.m4
+++ b/gnulib/import/m4/exponentd.m4
diff --git a/gdb/gnulib/import/m4/exponentl.m4 b/gnulib/import/m4/exponentl.m4
index c49cf2c3edf..c49cf2c3edf 100644
--- a/gdb/gnulib/import/m4/exponentl.m4
+++ b/gnulib/import/m4/exponentl.m4
diff --git a/gdb/gnulib/import/m4/extensions.m4 b/gnulib/import/m4/extensions.m4
index e114a6f7290..e114a6f7290 100644
--- a/gdb/gnulib/import/m4/extensions.m4
+++ b/gnulib/import/m4/extensions.m4
diff --git a/gdb/gnulib/import/m4/extern-inline.m4 b/gnulib/import/m4/extern-inline.m4
index 1e578f3deb4..1e578f3deb4 100644
--- a/gdb/gnulib/import/m4/extern-inline.m4
+++ b/gnulib/import/m4/extern-inline.m4
diff --git a/gdb/gnulib/import/m4/fchdir.m4 b/gnulib/import/m4/fchdir.m4
index 4264166a81f..4264166a81f 100644
--- a/gdb/gnulib/import/m4/fchdir.m4
+++ b/gnulib/import/m4/fchdir.m4
diff --git a/gdb/gnulib/import/m4/fcntl-o.m4 b/gnulib/import/m4/fcntl-o.m4
index 24fcf88d094..24fcf88d094 100644
--- a/gdb/gnulib/import/m4/fcntl-o.m4
+++ b/gnulib/import/m4/fcntl-o.m4
diff --git a/gdb/gnulib/import/m4/fcntl.m4 b/gnulib/import/m4/fcntl.m4
index bb61470b2e1..bb61470b2e1 100644
--- a/gdb/gnulib/import/m4/fcntl.m4
+++ b/gnulib/import/m4/fcntl.m4
diff --git a/gdb/gnulib/import/m4/fcntl_h.m4 b/gnulib/import/m4/fcntl_h.m4
index ef0d78dde1c..ef0d78dde1c 100644
--- a/gdb/gnulib/import/m4/fcntl_h.m4
+++ b/gnulib/import/m4/fcntl_h.m4
diff --git a/gdb/gnulib/import/m4/fdopendir.m4 b/gnulib/import/m4/fdopendir.m4
index cadbee3ca97..cadbee3ca97 100644
--- a/gdb/gnulib/import/m4/fdopendir.m4
+++ b/gnulib/import/m4/fdopendir.m4
diff --git a/gdb/gnulib/import/m4/filenamecat.m4 b/gnulib/import/m4/filenamecat.m4
index b7948802e48..b7948802e48 100644
--- a/gdb/gnulib/import/m4/filenamecat.m4
+++ b/gnulib/import/m4/filenamecat.m4
diff --git a/gdb/gnulib/import/m4/flexmember.m4 b/gnulib/import/m4/flexmember.m4
index 155ae9b8120..155ae9b8120 100644
--- a/gdb/gnulib/import/m4/flexmember.m4
+++ b/gnulib/import/m4/flexmember.m4
diff --git a/gdb/gnulib/import/m4/float_h.m4 b/gnulib/import/m4/float_h.m4
index e2887eb5c64..e2887eb5c64 100644
--- a/gdb/gnulib/import/m4/float_h.m4
+++ b/gnulib/import/m4/float_h.m4
diff --git a/gdb/gnulib/import/m4/fnmatch.m4 b/gnulib/import/m4/fnmatch.m4
index b38f56c4d5c..b38f56c4d5c 100644
--- a/gdb/gnulib/import/m4/fnmatch.m4
+++ b/gnulib/import/m4/fnmatch.m4
diff --git a/gdb/gnulib/import/m4/fpieee.m4 b/gnulib/import/m4/fpieee.m4
index e11ac9f09c1..e11ac9f09c1 100644
--- a/gdb/gnulib/import/m4/fpieee.m4
+++ b/gnulib/import/m4/fpieee.m4
diff --git a/gdb/gnulib/import/m4/frexp.m4 b/gnulib/import/m4/frexp.m4
index 23f5821677e..23f5821677e 100644
--- a/gdb/gnulib/import/m4/frexp.m4
+++ b/gnulib/import/m4/frexp.m4
diff --git a/gdb/gnulib/import/m4/frexpl.m4 b/gnulib/import/m4/frexpl.m4
index 0bc6afee31a..0bc6afee31a 100644
--- a/gdb/gnulib/import/m4/frexpl.m4
+++ b/gnulib/import/m4/frexpl.m4
diff --git a/gdb/gnulib/import/m4/fstat.m4 b/gnulib/import/m4/fstat.m4
index 29f9b81654a..29f9b81654a 100644
--- a/gdb/gnulib/import/m4/fstat.m4
+++ b/gnulib/import/m4/fstat.m4
diff --git a/gdb/gnulib/import/m4/fstatat.m4 b/gnulib/import/m4/fstatat.m4
index 84177f02cf0..84177f02cf0 100644
--- a/gdb/gnulib/import/m4/fstatat.m4
+++ b/gnulib/import/m4/fstatat.m4
diff --git a/gdb/gnulib/import/m4/getcwd-abort-bug.m4 b/gnulib/import/m4/getcwd-abort-bug.m4
index b73f47430b6..b73f47430b6 100644
--- a/gdb/gnulib/import/m4/getcwd-abort-bug.m4
+++ b/gnulib/import/m4/getcwd-abort-bug.m4
diff --git a/gdb/gnulib/import/m4/getcwd-path-max.m4 b/gnulib/import/m4/getcwd-path-max.m4
index 90bbc77dea1..90bbc77dea1 100644
--- a/gdb/gnulib/import/m4/getcwd-path-max.m4
+++ b/gnulib/import/m4/getcwd-path-max.m4
diff --git a/gdb/gnulib/import/m4/getcwd.m4 b/gnulib/import/m4/getcwd.m4
index 566c3c13ea8..566c3c13ea8 100644
--- a/gdb/gnulib/import/m4/getcwd.m4
+++ b/gnulib/import/m4/getcwd.m4
diff --git a/gdb/gnulib/import/m4/getdtablesize.m4 b/gnulib/import/m4/getdtablesize.m4
index 1bf4db043e6..1bf4db043e6 100644
--- a/gdb/gnulib/import/m4/getdtablesize.m4
+++ b/gnulib/import/m4/getdtablesize.m4
diff --git a/gdb/gnulib/import/m4/getlogin_r.m4 b/gnulib/import/m4/getlogin_r.m4
index 80f82f4f926..80f82f4f926 100644
--- a/gdb/gnulib/import/m4/getlogin_r.m4
+++ b/gnulib/import/m4/getlogin_r.m4
diff --git a/gdb/gnulib/import/m4/getprogname.m4 b/gnulib/import/m4/getprogname.m4
index f027037fc6b..f027037fc6b 100644
--- a/gdb/gnulib/import/m4/getprogname.m4
+++ b/gnulib/import/m4/getprogname.m4
diff --git a/gdb/gnulib/import/m4/gettimeofday.m4 b/gnulib/import/m4/gettimeofday.m4
index 4ae5d63fe3e..4ae5d63fe3e 100644
--- a/gdb/gnulib/import/m4/gettimeofday.m4
+++ b/gnulib/import/m4/gettimeofday.m4
diff --git a/gdb/gnulib/import/m4/glibc21.m4 b/gnulib/import/m4/glibc21.m4
index dafebf5017d..dafebf5017d 100644
--- a/gdb/gnulib/import/m4/glibc21.m4
+++ b/gnulib/import/m4/glibc21.m4
diff --git a/gdb/gnulib/import/m4/glob.m4 b/gnulib/import/m4/glob.m4
index adf5fe2865c..adf5fe2865c 100644
--- a/gdb/gnulib/import/m4/glob.m4
+++ b/gnulib/import/m4/glob.m4
diff --git a/gdb/gnulib/import/m4/gnulib-cache.m4 b/gnulib/import/m4/gnulib-cache.m4
index 4cbd1a76fa4..4cbd1a76fa4 100644
--- a/gdb/gnulib/import/m4/gnulib-cache.m4
+++ b/gnulib/import/m4/gnulib-cache.m4
diff --git a/gdb/gnulib/import/m4/gnulib-common.m4 b/gnulib/import/m4/gnulib-common.m4
index f8454c8a014..f8454c8a014 100644
--- a/gdb/gnulib/import/m4/gnulib-common.m4
+++ b/gnulib/import/m4/gnulib-common.m4
diff --git a/gdb/gnulib/import/m4/gnulib-comp.m4 b/gnulib/import/m4/gnulib-comp.m4
index 1700bdd3cf0..1700bdd3cf0 100644
--- a/gdb/gnulib/import/m4/gnulib-comp.m4
+++ b/gnulib/import/m4/gnulib-comp.m4
diff --git a/gdb/gnulib/import/m4/gnulib-tool.m4 b/gnulib/import/m4/gnulib-tool.m4
index 0d2ee444b4f..0d2ee444b4f 100644
--- a/gdb/gnulib/import/m4/gnulib-tool.m4
+++ b/gnulib/import/m4/gnulib-tool.m4
diff --git a/gdb/gnulib/import/m4/hard-locale.m4 b/gnulib/import/m4/hard-locale.m4
index 4661bfc5acc..4661bfc5acc 100644
--- a/gdb/gnulib/import/m4/hard-locale.m4
+++ b/gnulib/import/m4/hard-locale.m4
diff --git a/gdb/gnulib/import/m4/include_next.m4 b/gnulib/import/m4/include_next.m4
index db0f2c0795c..db0f2c0795c 100644
--- a/gdb/gnulib/import/m4/include_next.m4
+++ b/gnulib/import/m4/include_next.m4
diff --git a/gdb/gnulib/import/m4/inet_ntop.m4 b/gnulib/import/m4/inet_ntop.m4
index 26464c34acb..26464c34acb 100644
--- a/gdb/gnulib/import/m4/inet_ntop.m4
+++ b/gnulib/import/m4/inet_ntop.m4
diff --git a/gdb/gnulib/import/m4/inttypes-pri.m4 b/gnulib/import/m4/inttypes-pri.m4
index ae20183db42..ae20183db42 100644
--- a/gdb/gnulib/import/m4/inttypes-pri.m4
+++ b/gnulib/import/m4/inttypes-pri.m4
diff --git a/gdb/gnulib/import/m4/inttypes.m4 b/gnulib/import/m4/inttypes.m4
index 61cdb1a8483..61cdb1a8483 100644
--- a/gdb/gnulib/import/m4/inttypes.m4
+++ b/gnulib/import/m4/inttypes.m4
diff --git a/gdb/gnulib/import/m4/isnand.m4 b/gnulib/import/m4/isnand.m4
index bcf3840dbc2..bcf3840dbc2 100644
--- a/gdb/gnulib/import/m4/isnand.m4
+++ b/gnulib/import/m4/isnand.m4
diff --git a/gdb/gnulib/import/m4/isnanl.m4 b/gnulib/import/m4/isnanl.m4
index 9766e47201c..9766e47201c 100644
--- a/gdb/gnulib/import/m4/isnanl.m4
+++ b/gnulib/import/m4/isnanl.m4
diff --git a/gdb/gnulib/import/m4/largefile.m4 b/gnulib/import/m4/largefile.m4
index 8bbdfaac1db..8bbdfaac1db 100644
--- a/gdb/gnulib/import/m4/largefile.m4
+++ b/gnulib/import/m4/largefile.m4
diff --git a/gdb/gnulib/import/m4/limits-h.m4 b/gnulib/import/m4/limits-h.m4
index 31fdf0a779e..31fdf0a779e 100644
--- a/gdb/gnulib/import/m4/limits-h.m4
+++ b/gnulib/import/m4/limits-h.m4
diff --git a/gdb/gnulib/import/m4/localcharset.m4 b/gnulib/import/m4/localcharset.m4
index 22c311b9858..22c311b9858 100644
--- a/gdb/gnulib/import/m4/localcharset.m4
+++ b/gnulib/import/m4/localcharset.m4
diff --git a/gdb/gnulib/import/m4/locale-fr.m4 b/gnulib/import/m4/locale-fr.m4
index 92896a0391d..92896a0391d 100644
--- a/gdb/gnulib/import/m4/locale-fr.m4
+++ b/gnulib/import/m4/locale-fr.m4
diff --git a/gdb/gnulib/import/m4/locale-ja.m4 b/gnulib/import/m4/locale-ja.m4
index f222a086963..f222a086963 100644
--- a/gdb/gnulib/import/m4/locale-ja.m4
+++ b/gnulib/import/m4/locale-ja.m4
diff --git a/gdb/gnulib/import/m4/locale-zh.m4 b/gnulib/import/m4/locale-zh.m4
index 2271f7783bc..2271f7783bc 100644
--- a/gdb/gnulib/import/m4/locale-zh.m4
+++ b/gnulib/import/m4/locale-zh.m4
diff --git a/gdb/gnulib/import/m4/longlong.m4 b/gnulib/import/m4/longlong.m4
index 36d8b124212..36d8b124212 100644
--- a/gdb/gnulib/import/m4/longlong.m4
+++ b/gnulib/import/m4/longlong.m4
diff --git a/gdb/gnulib/import/m4/lstat.m4 b/gnulib/import/m4/lstat.m4
index e143d5c8b58..e143d5c8b58 100644
--- a/gdb/gnulib/import/m4/lstat.m4
+++ b/gnulib/import/m4/lstat.m4
diff --git a/gdb/gnulib/import/m4/malloc.m4 b/gnulib/import/m4/malloc.m4
index c393690e27d..c393690e27d 100644
--- a/gdb/gnulib/import/m4/malloc.m4
+++ b/gnulib/import/m4/malloc.m4
diff --git a/gdb/gnulib/import/m4/malloca.m4 b/gnulib/import/m4/malloca.m4
index b368b20e50d..b368b20e50d 100644
--- a/gdb/gnulib/import/m4/malloca.m4
+++ b/gnulib/import/m4/malloca.m4
diff --git a/gdb/gnulib/import/m4/math_h.m4 b/gnulib/import/m4/math_h.m4
index 35d07ee5f54..35d07ee5f54 100644
--- a/gdb/gnulib/import/m4/math_h.m4
+++ b/gnulib/import/m4/math_h.m4
diff --git a/gdb/gnulib/import/m4/mbrtowc.m4 b/gnulib/import/m4/mbrtowc.m4
index d370fccf06d..d370fccf06d 100644
--- a/gdb/gnulib/import/m4/mbrtowc.m4
+++ b/gnulib/import/m4/mbrtowc.m4
diff --git a/gdb/gnulib/import/m4/mbsinit.m4 b/gnulib/import/m4/mbsinit.m4
index 88f08367a26..88f08367a26 100644
--- a/gdb/gnulib/import/m4/mbsinit.m4
+++ b/gnulib/import/m4/mbsinit.m4
diff --git a/gdb/gnulib/import/m4/mbsrtowcs.m4 b/gnulib/import/m4/mbsrtowcs.m4
index 3b5dc6ea0e6..3b5dc6ea0e6 100644
--- a/gdb/gnulib/import/m4/mbsrtowcs.m4
+++ b/gnulib/import/m4/mbsrtowcs.m4
diff --git a/gdb/gnulib/import/m4/mbstate_t.m4 b/gnulib/import/m4/mbstate_t.m4
index 0a8eae25469..0a8eae25469 100644
--- a/gdb/gnulib/import/m4/mbstate_t.m4
+++ b/gnulib/import/m4/mbstate_t.m4
diff --git a/gdb/gnulib/import/m4/memchr.m4 b/gnulib/import/m4/memchr.m4
index 25d32f0ec99..25d32f0ec99 100644
--- a/gdb/gnulib/import/m4/memchr.m4
+++ b/gnulib/import/m4/memchr.m4
diff --git a/gdb/gnulib/import/m4/memmem.m4 b/gnulib/import/m4/memmem.m4
index 981ede76b40..981ede76b40 100644
--- a/gdb/gnulib/import/m4/memmem.m4
+++ b/gnulib/import/m4/memmem.m4
diff --git a/gdb/gnulib/import/m4/mempcpy.m4 b/gnulib/import/m4/mempcpy.m4
index 6991f29f033..6991f29f033 100644
--- a/gdb/gnulib/import/m4/mempcpy.m4
+++ b/gnulib/import/m4/mempcpy.m4
diff --git a/gdb/gnulib/import/m4/memrchr.m4 b/gnulib/import/m4/memrchr.m4
index 6e7df5c6d54..6e7df5c6d54 100644
--- a/gdb/gnulib/import/m4/memrchr.m4
+++ b/gnulib/import/m4/memrchr.m4
diff --git a/gdb/gnulib/import/m4/mkdir.m4 b/gnulib/import/m4/mkdir.m4
index 574092bb258..574092bb258 100644
--- a/gdb/gnulib/import/m4/mkdir.m4
+++ b/gnulib/import/m4/mkdir.m4
diff --git a/gdb/gnulib/import/m4/mkdtemp.m4 b/gnulib/import/m4/mkdtemp.m4
index a2edd395005..a2edd395005 100644
--- a/gdb/gnulib/import/m4/mkdtemp.m4
+++ b/gnulib/import/m4/mkdtemp.m4
diff --git a/gdb/gnulib/import/m4/mkostemp.m4 b/gnulib/import/m4/mkostemp.m4
index 1f44a0390aa..1f44a0390aa 100644
--- a/gdb/gnulib/import/m4/mkostemp.m4
+++ b/gnulib/import/m4/mkostemp.m4
diff --git a/gdb/gnulib/import/m4/mmap-anon.m4 b/gnulib/import/m4/mmap-anon.m4
index 853c89dc9b5..853c89dc9b5 100644
--- a/gdb/gnulib/import/m4/mmap-anon.m4
+++ b/gnulib/import/m4/mmap-anon.m4
diff --git a/gdb/gnulib/import/m4/mode_t.m4 b/gnulib/import/m4/mode_t.m4
index 0cd40dba493..0cd40dba493 100644
--- a/gdb/gnulib/import/m4/mode_t.m4
+++ b/gnulib/import/m4/mode_t.m4
diff --git a/gdb/gnulib/import/m4/msvc-inval.m4 b/gnulib/import/m4/msvc-inval.m4
index f5e4c89309e..f5e4c89309e 100644
--- a/gdb/gnulib/import/m4/msvc-inval.m4
+++ b/gnulib/import/m4/msvc-inval.m4
diff --git a/gdb/gnulib/import/m4/msvc-nothrow.m4 b/gnulib/import/m4/msvc-nothrow.m4
index 58f5c0bc205..58f5c0bc205 100644
--- a/gdb/gnulib/import/m4/msvc-nothrow.m4
+++ b/gnulib/import/m4/msvc-nothrow.m4
diff --git a/gdb/gnulib/import/m4/multiarch.m4 b/gnulib/import/m4/multiarch.m4
index 43b5d057508..43b5d057508 100644
--- a/gdb/gnulib/import/m4/multiarch.m4
+++ b/gnulib/import/m4/multiarch.m4
diff --git a/gdb/gnulib/import/m4/netinet_in_h.m4 b/gnulib/import/m4/netinet_in_h.m4
index 93dcc689478..93dcc689478 100644
--- a/gdb/gnulib/import/m4/netinet_in_h.m4
+++ b/gnulib/import/m4/netinet_in_h.m4
diff --git a/gdb/gnulib/import/m4/nocrash.m4 b/gnulib/import/m4/nocrash.m4
index d8dd8f13a12..d8dd8f13a12 100644
--- a/gdb/gnulib/import/m4/nocrash.m4
+++ b/gnulib/import/m4/nocrash.m4
diff --git a/gdb/gnulib/import/m4/off_t.m4 b/gnulib/import/m4/off_t.m4
index 282751b47b4..282751b47b4 100644
--- a/gdb/gnulib/import/m4/off_t.m4
+++ b/gnulib/import/m4/off_t.m4
diff --git a/gdb/gnulib/import/m4/onceonly.m4 b/gnulib/import/m4/onceonly.m4
index c0c9e2c8100..c0c9e2c8100 100644
--- a/gdb/gnulib/import/m4/onceonly.m4
+++ b/gnulib/import/m4/onceonly.m4
diff --git a/gdb/gnulib/import/m4/open.m4 b/gnulib/import/m4/open.m4
index 53d30381dd7..53d30381dd7 100644
--- a/gdb/gnulib/import/m4/open.m4
+++ b/gnulib/import/m4/open.m4
diff --git a/gdb/gnulib/import/m4/openat.m4 b/gnulib/import/m4/openat.m4
index fdeb1de6a3d..fdeb1de6a3d 100644
--- a/gdb/gnulib/import/m4/openat.m4
+++ b/gnulib/import/m4/openat.m4
diff --git a/gdb/gnulib/import/m4/opendir.m4 b/gnulib/import/m4/opendir.m4
index ffaa6ae3baa..ffaa6ae3baa 100644
--- a/gdb/gnulib/import/m4/opendir.m4
+++ b/gnulib/import/m4/opendir.m4
diff --git a/gdb/gnulib/import/m4/pathmax.m4 b/gnulib/import/m4/pathmax.m4
index 6f8e59a1a24..6f8e59a1a24 100644
--- a/gdb/gnulib/import/m4/pathmax.m4
+++ b/gnulib/import/m4/pathmax.m4
diff --git a/gdb/gnulib/import/m4/rawmemchr.m4 b/gnulib/import/m4/rawmemchr.m4
index d3ccb7eb389..d3ccb7eb389 100644
--- a/gdb/gnulib/import/m4/rawmemchr.m4
+++ b/gnulib/import/m4/rawmemchr.m4
diff --git a/gdb/gnulib/import/m4/readdir.m4 b/gnulib/import/m4/readdir.m4
index eda3acf73dc..eda3acf73dc 100644
--- a/gdb/gnulib/import/m4/readdir.m4
+++ b/gnulib/import/m4/readdir.m4
diff --git a/gdb/gnulib/import/m4/readlink.m4 b/gnulib/import/m4/readlink.m4
index ede0378b481..ede0378b481 100644
--- a/gdb/gnulib/import/m4/readlink.m4
+++ b/gnulib/import/m4/readlink.m4
diff --git a/gdb/gnulib/import/m4/realloc.m4 b/gnulib/import/m4/realloc.m4
index fc2282544dd..fc2282544dd 100644
--- a/gdb/gnulib/import/m4/realloc.m4
+++ b/gnulib/import/m4/realloc.m4
diff --git a/gdb/gnulib/import/m4/rename.m4 b/gnulib/import/m4/rename.m4
index fbcc758d5a6..fbcc758d5a6 100644
--- a/gdb/gnulib/import/m4/rename.m4
+++ b/gnulib/import/m4/rename.m4
diff --git a/gdb/gnulib/import/m4/rewinddir.m4 b/gnulib/import/m4/rewinddir.m4
index 0d3d6c619de..0d3d6c619de 100644
--- a/gdb/gnulib/import/m4/rewinddir.m4
+++ b/gnulib/import/m4/rewinddir.m4
diff --git a/gdb/gnulib/import/m4/rmdir.m4 b/gnulib/import/m4/rmdir.m4
index ebb3b5db196..ebb3b5db196 100644
--- a/gdb/gnulib/import/m4/rmdir.m4
+++ b/gnulib/import/m4/rmdir.m4
diff --git a/gdb/gnulib/import/m4/save-cwd.m4 b/gnulib/import/m4/save-cwd.m4
index d6e24100072..d6e24100072 100644
--- a/gdb/gnulib/import/m4/save-cwd.m4
+++ b/gnulib/import/m4/save-cwd.m4
diff --git a/gdb/gnulib/import/m4/secure_getenv.m4 b/gnulib/import/m4/secure_getenv.m4
index 3983173603a..3983173603a 100644
--- a/gdb/gnulib/import/m4/secure_getenv.m4
+++ b/gnulib/import/m4/secure_getenv.m4
diff --git a/gdb/gnulib/import/m4/setenv.m4 b/gnulib/import/m4/setenv.m4
index 5d49aba60dd..5d49aba60dd 100644
--- a/gdb/gnulib/import/m4/setenv.m4
+++ b/gnulib/import/m4/setenv.m4
diff --git a/gdb/gnulib/import/m4/signal_h.m4 b/gnulib/import/m4/signal_h.m4
index bcfd7b4be30..bcfd7b4be30 100644
--- a/gdb/gnulib/import/m4/signal_h.m4
+++ b/gnulib/import/m4/signal_h.m4
diff --git a/gdb/gnulib/import/m4/socklen.m4 b/gnulib/import/m4/socklen.m4
index 634c43a35c1..634c43a35c1 100644
--- a/gdb/gnulib/import/m4/socklen.m4
+++ b/gnulib/import/m4/socklen.m4
diff --git a/gdb/gnulib/import/m4/sockpfaf.m4 b/gnulib/import/m4/sockpfaf.m4
index dce8b8f01e3..dce8b8f01e3 100644
--- a/gdb/gnulib/import/m4/sockpfaf.m4
+++ b/gnulib/import/m4/sockpfaf.m4
diff --git a/gdb/gnulib/import/m4/ssize_t.m4 b/gnulib/import/m4/ssize_t.m4
index 3e7b9e6e024..3e7b9e6e024 100644
--- a/gdb/gnulib/import/m4/ssize_t.m4
+++ b/gnulib/import/m4/ssize_t.m4
diff --git a/gdb/gnulib/import/m4/stat.m4 b/gnulib/import/m4/stat.m4
index a794975de9c..a794975de9c 100644
--- a/gdb/gnulib/import/m4/stat.m4
+++ b/gnulib/import/m4/stat.m4
diff --git a/gdb/gnulib/import/m4/stdalign.m4 b/gnulib/import/m4/stdalign.m4
index 49980cd636e..49980cd636e 100644
--- a/gdb/gnulib/import/m4/stdalign.m4
+++ b/gnulib/import/m4/stdalign.m4
diff --git a/gdb/gnulib/import/m4/stdbool.m4 b/gnulib/import/m4/stdbool.m4
index 2a9b1db86f3..2a9b1db86f3 100644
--- a/gdb/gnulib/import/m4/stdbool.m4
+++ b/gnulib/import/m4/stdbool.m4
diff --git a/gdb/gnulib/import/m4/stddef_h.m4 b/gnulib/import/m4/stddef_h.m4
index c045c65f9f8..c045c65f9f8 100644
--- a/gdb/gnulib/import/m4/stddef_h.m4
+++ b/gnulib/import/m4/stddef_h.m4
diff --git a/gdb/gnulib/import/m4/stdint.m4 b/gnulib/import/m4/stdint.m4
index 05b6ab7846b..05b6ab7846b 100644
--- a/gdb/gnulib/import/m4/stdint.m4
+++ b/gnulib/import/m4/stdint.m4
diff --git a/gdb/gnulib/import/m4/stdio_h.m4 b/gnulib/import/m4/stdio_h.m4
index eaa25a01d49..eaa25a01d49 100644
--- a/gdb/gnulib/import/m4/stdio_h.m4
+++ b/gnulib/import/m4/stdio_h.m4
diff --git a/gdb/gnulib/import/m4/stdlib_h.m4 b/gnulib/import/m4/stdlib_h.m4
index 3999068153d..3999068153d 100644
--- a/gdb/gnulib/import/m4/stdlib_h.m4
+++ b/gnulib/import/m4/stdlib_h.m4
diff --git a/gdb/gnulib/import/m4/strchrnul.m4 b/gnulib/import/m4/strchrnul.m4
index ac5c2117dc5..ac5c2117dc5 100644
--- a/gdb/gnulib/import/m4/strchrnul.m4
+++ b/gnulib/import/m4/strchrnul.m4
diff --git a/gdb/gnulib/import/m4/strdup.m4 b/gnulib/import/m4/strdup.m4
index ff7060abd38..ff7060abd38 100644
--- a/gdb/gnulib/import/m4/strdup.m4
+++ b/gnulib/import/m4/strdup.m4
diff --git a/gdb/gnulib/import/m4/strerror.m4 b/gnulib/import/m4/strerror.m4
index e286594b585..e286594b585 100644
--- a/gdb/gnulib/import/m4/strerror.m4
+++ b/gnulib/import/m4/strerror.m4
diff --git a/gdb/gnulib/import/m4/string_h.m4 b/gnulib/import/m4/string_h.m4
index 0c5ec6f9a09..0c5ec6f9a09 100644
--- a/gdb/gnulib/import/m4/string_h.m4
+++ b/gnulib/import/m4/string_h.m4
diff --git a/gdb/gnulib/import/m4/strstr.m4 b/gnulib/import/m4/strstr.m4
index bfe4c8590d9..bfe4c8590d9 100644
--- a/gdb/gnulib/import/m4/strstr.m4
+++ b/gnulib/import/m4/strstr.m4
diff --git a/gdb/gnulib/import/m4/strtok_r.m4 b/gnulib/import/m4/strtok_r.m4
index d010307bbc8..d010307bbc8 100644
--- a/gdb/gnulib/import/m4/strtok_r.m4
+++ b/gnulib/import/m4/strtok_r.m4
diff --git a/gdb/gnulib/import/m4/sys_socket_h.m4 b/gnulib/import/m4/sys_socket_h.m4
index ae500c76053..ae500c76053 100644
--- a/gdb/gnulib/import/m4/sys_socket_h.m4
+++ b/gnulib/import/m4/sys_socket_h.m4
diff --git a/gdb/gnulib/import/m4/sys_stat_h.m4 b/gnulib/import/m4/sys_stat_h.m4
index 3d43b6f5ef2..3d43b6f5ef2 100644
--- a/gdb/gnulib/import/m4/sys_stat_h.m4
+++ b/gnulib/import/m4/sys_stat_h.m4
diff --git a/gdb/gnulib/import/m4/sys_time_h.m4 b/gnulib/import/m4/sys_time_h.m4
index 3061a9c185f..3061a9c185f 100644
--- a/gdb/gnulib/import/m4/sys_time_h.m4
+++ b/gnulib/import/m4/sys_time_h.m4
diff --git a/gdb/gnulib/import/m4/sys_types_h.m4 b/gnulib/import/m4/sys_types_h.m4
index 159b005b3d4..159b005b3d4 100644
--- a/gdb/gnulib/import/m4/sys_types_h.m4
+++ b/gnulib/import/m4/sys_types_h.m4
diff --git a/gdb/gnulib/import/m4/sys_uio_h.m4 b/gnulib/import/m4/sys_uio_h.m4
index d4d967fd576..d4d967fd576 100644
--- a/gdb/gnulib/import/m4/sys_uio_h.m4
+++ b/gnulib/import/m4/sys_uio_h.m4
diff --git a/gdb/gnulib/import/m4/tempname.m4 b/gnulib/import/m4/tempname.m4
index acf4c8d07c0..acf4c8d07c0 100644
--- a/gdb/gnulib/import/m4/tempname.m4
+++ b/gnulib/import/m4/tempname.m4
diff --git a/gdb/gnulib/import/m4/time_h.m4 b/gnulib/import/m4/time_h.m4
index eb2a631e2ce..eb2a631e2ce 100644
--- a/gdb/gnulib/import/m4/time_h.m4
+++ b/gnulib/import/m4/time_h.m4
diff --git a/gdb/gnulib/import/m4/unistd-safer.m4 b/gnulib/import/m4/unistd-safer.m4
index ceb5cc66bbf..ceb5cc66bbf 100644
--- a/gdb/gnulib/import/m4/unistd-safer.m4
+++ b/gnulib/import/m4/unistd-safer.m4
diff --git a/gdb/gnulib/import/m4/unistd_h.m4 b/gnulib/import/m4/unistd_h.m4
index 544dadb4122..544dadb4122 100644
--- a/gdb/gnulib/import/m4/unistd_h.m4
+++ b/gnulib/import/m4/unistd_h.m4
diff --git a/gdb/gnulib/import/m4/warn-on-use.m4 b/gnulib/import/m4/warn-on-use.m4
index 08440ec593b..08440ec593b 100644
--- a/gdb/gnulib/import/m4/warn-on-use.m4
+++ b/gnulib/import/m4/warn-on-use.m4
diff --git a/gdb/gnulib/import/m4/wchar_h.m4 b/gnulib/import/m4/wchar_h.m4
index 16017a59fbb..16017a59fbb 100644
--- a/gdb/gnulib/import/m4/wchar_h.m4
+++ b/gnulib/import/m4/wchar_h.m4
diff --git a/gdb/gnulib/import/m4/wchar_t.m4 b/gnulib/import/m4/wchar_t.m4
index 2db8c3f2f62..2db8c3f2f62 100644
--- a/gdb/gnulib/import/m4/wchar_t.m4
+++ b/gnulib/import/m4/wchar_t.m4
diff --git a/gdb/gnulib/import/m4/wctype_h.m4 b/gnulib/import/m4/wctype_h.m4
index accc001ca3e..accc001ca3e 100644
--- a/gdb/gnulib/import/m4/wctype_h.m4
+++ b/gnulib/import/m4/wctype_h.m4
diff --git a/gdb/gnulib/import/m4/wint_t.m4 b/gnulib/import/m4/wint_t.m4
index 8ff2a5b5a28..8ff2a5b5a28 100644
--- a/gdb/gnulib/import/m4/wint_t.m4
+++ b/gnulib/import/m4/wint_t.m4
diff --git a/gdb/gnulib/import/malloc.c b/gnulib/import/malloc.c
index e9b01d26153..e9b01d26153 100644
--- a/gdb/gnulib/import/malloc.c
+++ b/gnulib/import/malloc.c
diff --git a/gdb/gnulib/import/malloca.c b/gnulib/import/malloca.c
index a6132775b16..a6132775b16 100644
--- a/gdb/gnulib/import/malloca.c
+++ b/gnulib/import/malloca.c
diff --git a/gdb/gnulib/import/malloca.h b/gnulib/import/malloca.h
index fa27a9e7a2d..fa27a9e7a2d 100644
--- a/gdb/gnulib/import/malloca.h
+++ b/gnulib/import/malloca.h
diff --git a/gdb/gnulib/import/malloca.valgrind b/gnulib/import/malloca.valgrind
index 52f0a50f57f..52f0a50f57f 100644
--- a/gdb/gnulib/import/malloca.valgrind
+++ b/gnulib/import/malloca.valgrind
diff --git a/gdb/gnulib/import/math.c b/gnulib/import/math.c
index ba2a6abd62d..ba2a6abd62d 100644
--- a/gdb/gnulib/import/math.c
+++ b/gnulib/import/math.c
diff --git a/gdb/gnulib/import/math.in.h b/gnulib/import/math.in.h
index e1dc97030fe..e1dc97030fe 100644
--- a/gdb/gnulib/import/math.in.h
+++ b/gnulib/import/math.in.h
diff --git a/gdb/gnulib/import/mbrtowc.c b/gnulib/import/mbrtowc.c
index cdd874bc5a8..cdd874bc5a8 100644
--- a/gdb/gnulib/import/mbrtowc.c
+++ b/gnulib/import/mbrtowc.c
diff --git a/gdb/gnulib/import/mbsinit.c b/gnulib/import/mbsinit.c
index 372b523ad6c..372b523ad6c 100644
--- a/gdb/gnulib/import/mbsinit.c
+++ b/gnulib/import/mbsinit.c
diff --git a/gdb/gnulib/import/mbsrtowcs-impl.h b/gnulib/import/mbsrtowcs-impl.h
index f99fa34ada9..f99fa34ada9 100644
--- a/gdb/gnulib/import/mbsrtowcs-impl.h
+++ b/gnulib/import/mbsrtowcs-impl.h
diff --git a/gdb/gnulib/import/mbsrtowcs-state.c b/gnulib/import/mbsrtowcs-state.c
index 905547a974b..905547a974b 100644
--- a/gdb/gnulib/import/mbsrtowcs-state.c
+++ b/gnulib/import/mbsrtowcs-state.c
diff --git a/gdb/gnulib/import/mbsrtowcs.c b/gnulib/import/mbsrtowcs.c
index 54bf6f71d71..54bf6f71d71 100644
--- a/gdb/gnulib/import/mbsrtowcs.c
+++ b/gnulib/import/mbsrtowcs.c
diff --git a/gdb/gnulib/import/memchr.c b/gnulib/import/memchr.c
index b565542c39a..b565542c39a 100644
--- a/gdb/gnulib/import/memchr.c
+++ b/gnulib/import/memchr.c
diff --git a/gdb/gnulib/import/memchr.valgrind b/gnulib/import/memchr.valgrind
index 60f247e10dc..60f247e10dc 100644
--- a/gdb/gnulib/import/memchr.valgrind
+++ b/gnulib/import/memchr.valgrind
diff --git a/gdb/gnulib/import/memmem.c b/gnulib/import/memmem.c
index 7d1f971355c..7d1f971355c 100644
--- a/gdb/gnulib/import/memmem.c
+++ b/gnulib/import/memmem.c
diff --git a/gdb/gnulib/import/mempcpy.c b/gnulib/import/mempcpy.c
index d579f64a0ab..d579f64a0ab 100644
--- a/gdb/gnulib/import/mempcpy.c
+++ b/gnulib/import/mempcpy.c
diff --git a/gdb/gnulib/import/memrchr.c b/gnulib/import/memrchr.c
index e6212e5c4f8..e6212e5c4f8 100644
--- a/gdb/gnulib/import/memrchr.c
+++ b/gnulib/import/memrchr.c
diff --git a/gdb/gnulib/import/mkdir.c b/gnulib/import/mkdir.c
index 59bdea132cf..59bdea132cf 100644
--- a/gdb/gnulib/import/mkdir.c
+++ b/gnulib/import/mkdir.c
diff --git a/gdb/gnulib/import/mkdtemp.c b/gnulib/import/mkdtemp.c
index c1b05fd8ada..c1b05fd8ada 100644
--- a/gdb/gnulib/import/mkdtemp.c
+++ b/gnulib/import/mkdtemp.c
diff --git a/gdb/gnulib/import/mkostemp.c b/gnulib/import/mkostemp.c
index 31c3e4837fc..31c3e4837fc 100644
--- a/gdb/gnulib/import/mkostemp.c
+++ b/gnulib/import/mkostemp.c
diff --git a/gdb/gnulib/import/msvc-inval.c b/gnulib/import/msvc-inval.c
index baaf39eda1f..baaf39eda1f 100644
--- a/gdb/gnulib/import/msvc-inval.c
+++ b/gnulib/import/msvc-inval.c
diff --git a/gdb/gnulib/import/msvc-inval.h b/gnulib/import/msvc-inval.h
index 027c94972a5..027c94972a5 100644
--- a/gdb/gnulib/import/msvc-inval.h
+++ b/gnulib/import/msvc-inval.h
diff --git a/gdb/gnulib/import/msvc-nothrow.c b/gnulib/import/msvc-nothrow.c
index ba75bbfb27f..ba75bbfb27f 100644
--- a/gdb/gnulib/import/msvc-nothrow.c
+++ b/gnulib/import/msvc-nothrow.c
diff --git a/gdb/gnulib/import/msvc-nothrow.h b/gnulib/import/msvc-nothrow.h
index 3493b84a86a..3493b84a86a 100644
--- a/gdb/gnulib/import/msvc-nothrow.h
+++ b/gnulib/import/msvc-nothrow.h
diff --git a/gdb/gnulib/import/netinet_in.in.h b/gnulib/import/netinet_in.in.h
index 54e1ec04cd0..54e1ec04cd0 100644
--- a/gdb/gnulib/import/netinet_in.in.h
+++ b/gnulib/import/netinet_in.in.h
diff --git a/gdb/gnulib/import/open.c b/gnulib/import/open.c
index e9c312069e1..e9c312069e1 100644
--- a/gdb/gnulib/import/open.c
+++ b/gnulib/import/open.c
diff --git a/gdb/gnulib/import/openat-die.c b/gnulib/import/openat-die.c
index 7ab38604ea8..7ab38604ea8 100644
--- a/gdb/gnulib/import/openat-die.c
+++ b/gnulib/import/openat-die.c
diff --git a/gdb/gnulib/import/openat-priv.h b/gnulib/import/openat-priv.h
index ed763db5c0d..ed763db5c0d 100644
--- a/gdb/gnulib/import/openat-priv.h
+++ b/gnulib/import/openat-priv.h
diff --git a/gdb/gnulib/import/openat-proc.c b/gnulib/import/openat-proc.c
index 1712340a002..1712340a002 100644
--- a/gdb/gnulib/import/openat-proc.c
+++ b/gnulib/import/openat-proc.c
diff --git a/gdb/gnulib/import/openat.c b/gnulib/import/openat.c
index acbf7e323ea..acbf7e323ea 100644
--- a/gdb/gnulib/import/openat.c
+++ b/gnulib/import/openat.c
diff --git a/gdb/gnulib/import/openat.h b/gnulib/import/openat.h
index edee6c56554..edee6c56554 100644
--- a/gdb/gnulib/import/openat.h
+++ b/gnulib/import/openat.h
diff --git a/gdb/gnulib/import/opendir.c b/gnulib/import/opendir.c
index a135fd834a8..a135fd834a8 100644
--- a/gdb/gnulib/import/opendir.c
+++ b/gnulib/import/opendir.c
diff --git a/gdb/gnulib/import/pathmax.h b/gnulib/import/pathmax.h
index aee22f86400..aee22f86400 100644
--- a/gdb/gnulib/import/pathmax.h
+++ b/gnulib/import/pathmax.h
diff --git a/gdb/gnulib/import/pipe-safer.c b/gnulib/import/pipe-safer.c
index fc6144e5ea1..fc6144e5ea1 100644
--- a/gdb/gnulib/import/pipe-safer.c
+++ b/gnulib/import/pipe-safer.c
diff --git a/gdb/gnulib/import/rawmemchr.c b/gnulib/import/rawmemchr.c
index dbe01bd550b..dbe01bd550b 100644
--- a/gdb/gnulib/import/rawmemchr.c
+++ b/gnulib/import/rawmemchr.c
diff --git a/gdb/gnulib/import/rawmemchr.valgrind b/gnulib/import/rawmemchr.valgrind
index 63639236803..63639236803 100644
--- a/gdb/gnulib/import/rawmemchr.valgrind
+++ b/gnulib/import/rawmemchr.valgrind
diff --git a/gdb/gnulib/import/readdir.c b/gnulib/import/readdir.c
index 76b7e9d819b..76b7e9d819b 100644
--- a/gdb/gnulib/import/readdir.c
+++ b/gnulib/import/readdir.c
diff --git a/gdb/gnulib/import/readlink.c b/gnulib/import/readlink.c
index e6c3925e4d4..e6c3925e4d4 100644
--- a/gdb/gnulib/import/readlink.c
+++ b/gnulib/import/readlink.c
diff --git a/gdb/gnulib/import/realloc.c b/gnulib/import/realloc.c
index 83cb44ee3e3..83cb44ee3e3 100644
--- a/gdb/gnulib/import/realloc.c
+++ b/gnulib/import/realloc.c
diff --git a/gdb/gnulib/import/ref-add.sin b/gnulib/import/ref-add.sin
index 42d3ab0d83b..42d3ab0d83b 100644
--- a/gdb/gnulib/import/ref-add.sin
+++ b/gnulib/import/ref-add.sin
diff --git a/gdb/gnulib/import/ref-del.sin b/gnulib/import/ref-del.sin
index c77b33ba7e4..c77b33ba7e4 100644
--- a/gdb/gnulib/import/ref-del.sin
+++ b/gnulib/import/ref-del.sin
diff --git a/gdb/gnulib/import/rename.c b/gnulib/import/rename.c
index e1d169ad22e..e1d169ad22e 100644
--- a/gdb/gnulib/import/rename.c
+++ b/gnulib/import/rename.c
diff --git a/gdb/gnulib/import/rewinddir.c b/gnulib/import/rewinddir.c
index 2a70e7fe29c..2a70e7fe29c 100644
--- a/gdb/gnulib/import/rewinddir.c
+++ b/gnulib/import/rewinddir.c
diff --git a/gdb/gnulib/import/rmdir.c b/gnulib/import/rmdir.c
index 4949df28188..4949df28188 100644
--- a/gdb/gnulib/import/rmdir.c
+++ b/gnulib/import/rmdir.c
diff --git a/gdb/gnulib/import/same-inode.h b/gnulib/import/same-inode.h
index bf45635d11b..bf45635d11b 100644
--- a/gdb/gnulib/import/same-inode.h
+++ b/gnulib/import/same-inode.h
diff --git a/gdb/gnulib/import/save-cwd.c b/gnulib/import/save-cwd.c
index 27cb7507fe1..27cb7507fe1 100644
--- a/gdb/gnulib/import/save-cwd.c
+++ b/gnulib/import/save-cwd.c
diff --git a/gdb/gnulib/import/save-cwd.h b/gnulib/import/save-cwd.h
index dbb598d603a..dbb598d603a 100644
--- a/gdb/gnulib/import/save-cwd.h
+++ b/gnulib/import/save-cwd.h
diff --git a/gdb/gnulib/import/secure_getenv.c b/gnulib/import/secure_getenv.c
index 88a60dc33c3..88a60dc33c3 100644
--- a/gdb/gnulib/import/secure_getenv.c
+++ b/gnulib/import/secure_getenv.c
diff --git a/gdb/gnulib/import/setenv.c b/gnulib/import/setenv.c
index 85c32cb224b..85c32cb224b 100644
--- a/gdb/gnulib/import/setenv.c
+++ b/gnulib/import/setenv.c
diff --git a/gdb/gnulib/import/signal.in.h b/gnulib/import/signal.in.h
index ab0a049f8bc..ab0a049f8bc 100644
--- a/gdb/gnulib/import/signal.in.h
+++ b/gnulib/import/signal.in.h
diff --git a/gdb/gnulib/import/stat.c b/gnulib/import/stat.c
index 62e9e0bb064..62e9e0bb064 100644
--- a/gdb/gnulib/import/stat.c
+++ b/gnulib/import/stat.c
diff --git a/gdb/gnulib/import/stdalign.in.h b/gnulib/import/stdalign.in.h
index 12f8a15b316..12f8a15b316 100644
--- a/gdb/gnulib/import/stdalign.in.h
+++ b/gnulib/import/stdalign.in.h
diff --git a/gdb/gnulib/import/stdbool.in.h b/gnulib/import/stdbool.in.h
index 7ecf203e750..7ecf203e750 100644
--- a/gdb/gnulib/import/stdbool.in.h
+++ b/gnulib/import/stdbool.in.h
diff --git a/gdb/gnulib/import/stddef.in.h b/gnulib/import/stddef.in.h
index f4c4a1070d5..f4c4a1070d5 100644
--- a/gdb/gnulib/import/stddef.in.h
+++ b/gnulib/import/stddef.in.h
diff --git a/gdb/gnulib/import/stdint.in.h b/gnulib/import/stdint.in.h
index c86ab096289..c86ab096289 100644
--- a/gdb/gnulib/import/stdint.in.h
+++ b/gnulib/import/stdint.in.h
diff --git a/gdb/gnulib/import/stdio.in.h b/gnulib/import/stdio.in.h
index 9b313656c57..9b313656c57 100644
--- a/gdb/gnulib/import/stdio.in.h
+++ b/gnulib/import/stdio.in.h
diff --git a/gdb/gnulib/import/stdlib.in.h b/gnulib/import/stdlib.in.h
index 8f803a2ea31..8f803a2ea31 100644
--- a/gdb/gnulib/import/stdlib.in.h
+++ b/gnulib/import/stdlib.in.h
diff --git a/gdb/gnulib/import/str-two-way.h b/gnulib/import/str-two-way.h
index 0fe31614b55..0fe31614b55 100644
--- a/gdb/gnulib/import/str-two-way.h
+++ b/gnulib/import/str-two-way.h
diff --git a/gdb/gnulib/import/strchrnul.c b/gnulib/import/strchrnul.c
index 1482a77d830..1482a77d830 100644
--- a/gdb/gnulib/import/strchrnul.c
+++ b/gnulib/import/strchrnul.c
diff --git a/gdb/gnulib/import/strchrnul.valgrind b/gnulib/import/strchrnul.valgrind
index b14fa1304d7..b14fa1304d7 100644
--- a/gdb/gnulib/import/strchrnul.valgrind
+++ b/gnulib/import/strchrnul.valgrind
diff --git a/gdb/gnulib/import/strdup.c b/gnulib/import/strdup.c
index 81eb2260ceb..81eb2260ceb 100644
--- a/gdb/gnulib/import/strdup.c
+++ b/gnulib/import/strdup.c
diff --git a/gdb/gnulib/import/streq.h b/gnulib/import/streq.h
index 234f07568d3..234f07568d3 100644
--- a/gdb/gnulib/import/streq.h
+++ b/gnulib/import/streq.h
diff --git a/gdb/gnulib/import/strerror-override.c b/gnulib/import/strerror-override.c
index 9bc9b189510..9bc9b189510 100644
--- a/gdb/gnulib/import/strerror-override.c
+++ b/gnulib/import/strerror-override.c
diff --git a/gdb/gnulib/import/strerror-override.h b/gnulib/import/strerror-override.h
index 5264fd5f395..5264fd5f395 100644
--- a/gdb/gnulib/import/strerror-override.h
+++ b/gnulib/import/strerror-override.h
diff --git a/gdb/gnulib/import/strerror.c b/gnulib/import/strerror.c
index 45c763391c1..45c763391c1 100644
--- a/gdb/gnulib/import/strerror.c
+++ b/gnulib/import/strerror.c
diff --git a/gdb/gnulib/import/string.in.h b/gnulib/import/string.in.h
index b3213c4c1ab..b3213c4c1ab 100644
--- a/gdb/gnulib/import/string.in.h
+++ b/gnulib/import/string.in.h
diff --git a/gdb/gnulib/import/stripslash.c b/gnulib/import/stripslash.c
index 0453e36cc6f..0453e36cc6f 100644
--- a/gdb/gnulib/import/stripslash.c
+++ b/gnulib/import/stripslash.c
diff --git a/gdb/gnulib/import/strnlen1.c b/gnulib/import/strnlen1.c
index f5e0ffcf807..f5e0ffcf807 100644
--- a/gdb/gnulib/import/strnlen1.c
+++ b/gnulib/import/strnlen1.c
diff --git a/gdb/gnulib/import/strnlen1.h b/gnulib/import/strnlen1.h
index d3cd7c19536..d3cd7c19536 100644
--- a/gdb/gnulib/import/strnlen1.h
+++ b/gnulib/import/strnlen1.h
diff --git a/gdb/gnulib/import/strstr.c b/gnulib/import/strstr.c
index 60cd3e322bc..60cd3e322bc 100644
--- a/gdb/gnulib/import/strstr.c
+++ b/gnulib/import/strstr.c
diff --git a/gdb/gnulib/import/strtok_r.c b/gnulib/import/strtok_r.c
index 3531634db5a..3531634db5a 100644
--- a/gdb/gnulib/import/strtok_r.c
+++ b/gnulib/import/strtok_r.c
diff --git a/gdb/gnulib/import/sys_socket.c b/gnulib/import/sys_socket.c
index 3b261da039f..3b261da039f 100644
--- a/gdb/gnulib/import/sys_socket.c
+++ b/gnulib/import/sys_socket.c
diff --git a/gdb/gnulib/import/sys_socket.in.h b/gnulib/import/sys_socket.in.h
index a627dd4c883..a627dd4c883 100644
--- a/gdb/gnulib/import/sys_socket.in.h
+++ b/gnulib/import/sys_socket.in.h
diff --git a/gdb/gnulib/import/sys_stat.in.h b/gnulib/import/sys_stat.in.h
index 72d9537420c..72d9537420c 100644
--- a/gdb/gnulib/import/sys_stat.in.h
+++ b/gnulib/import/sys_stat.in.h
diff --git a/gdb/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h
index d535a6a48b2..d535a6a48b2 100644
--- a/gdb/gnulib/import/sys_time.in.h
+++ b/gnulib/import/sys_time.in.h
diff --git a/gdb/gnulib/import/sys_types.in.h b/gnulib/import/sys_types.in.h
index 8ab05453829..8ab05453829 100644
--- a/gdb/gnulib/import/sys_types.in.h
+++ b/gnulib/import/sys_types.in.h
diff --git a/gdb/gnulib/import/sys_uio.in.h b/gnulib/import/sys_uio.in.h
index e70663fda5a..e70663fda5a 100644
--- a/gdb/gnulib/import/sys_uio.in.h
+++ b/gnulib/import/sys_uio.in.h
diff --git a/gdb/gnulib/import/tempname.c b/gnulib/import/tempname.c
index b1e9880f7b6..b1e9880f7b6 100644
--- a/gdb/gnulib/import/tempname.c
+++ b/gnulib/import/tempname.c
diff --git a/gdb/gnulib/import/tempname.h b/gnulib/import/tempname.h
index be01c514365..be01c514365 100644
--- a/gdb/gnulib/import/tempname.h
+++ b/gnulib/import/tempname.h
diff --git a/gdb/gnulib/import/time.in.h b/gnulib/import/time.in.h
index 865c1141196..865c1141196 100644
--- a/gdb/gnulib/import/time.in.h
+++ b/gnulib/import/time.in.h
diff --git a/gdb/gnulib/import/unistd--.h b/gnulib/import/unistd--.h
index bd1d0fb2527..bd1d0fb2527 100644
--- a/gdb/gnulib/import/unistd--.h
+++ b/gnulib/import/unistd--.h
diff --git a/gdb/gnulib/import/unistd-safer.h b/gnulib/import/unistd-safer.h
index c8179ce3761..c8179ce3761 100644
--- a/gdb/gnulib/import/unistd-safer.h
+++ b/gnulib/import/unistd-safer.h
diff --git a/gdb/gnulib/import/unistd.c b/gnulib/import/unistd.c
index 72bad1c0527..72bad1c0527 100644
--- a/gdb/gnulib/import/unistd.c
+++ b/gnulib/import/unistd.c
diff --git a/gdb/gnulib/import/unistd.in.h b/gnulib/import/unistd.in.h
index c3af07ad219..c3af07ad219 100644
--- a/gdb/gnulib/import/unistd.in.h
+++ b/gnulib/import/unistd.in.h
diff --git a/gdb/gnulib/import/unsetenv.c b/gnulib/import/unsetenv.c
index 836874475e9..836874475e9 100644
--- a/gdb/gnulib/import/unsetenv.c
+++ b/gnulib/import/unsetenv.c
diff --git a/gdb/gnulib/import/verify.h b/gnulib/import/verify.h
index 5c8381d2906..5c8381d2906 100644
--- a/gdb/gnulib/import/verify.h
+++ b/gnulib/import/verify.h
diff --git a/gdb/gnulib/import/wchar.in.h b/gnulib/import/wchar.in.h
index 75fb9f0254a..75fb9f0254a 100644
--- a/gdb/gnulib/import/wchar.in.h
+++ b/gnulib/import/wchar.in.h
diff --git a/gdb/gnulib/import/wctype-h.c b/gnulib/import/wctype-h.c
index bb5f847e330..bb5f847e330 100644
--- a/gdb/gnulib/import/wctype-h.c
+++ b/gnulib/import/wctype-h.c
diff --git a/gdb/gnulib/import/wctype.in.h b/gnulib/import/wctype.in.h
index 37b3d8ebf13..37b3d8ebf13 100644
--- a/gdb/gnulib/import/wctype.in.h
+++ b/gnulib/import/wctype.in.h
diff --git a/gdb/gnulib/patches/0001-Fix-PR-gdb-23558-Use-system-s-getcwd-when-cross-comp.patch b/gnulib/patches/0001-Fix-PR-gdb-23558-Use-system-s-getcwd-when-cross-comp.patch
index 1d8cdf6b901..1d8cdf6b901 100644
--- a/gdb/gnulib/patches/0001-Fix-PR-gdb-23558-Use-system-s-getcwd-when-cross-comp.patch
+++ b/gnulib/patches/0001-Fix-PR-gdb-23558-Use-system-s-getcwd-when-cross-comp.patch
diff --git a/gdb/gnulib/patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch b/gnulib/patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch
index 35f917fac49..35f917fac49 100644
--- a/gdb/gnulib/patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch
+++ b/gnulib/patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch
diff --git a/gdb/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh
index b321ac0823b..fb79b23c531 100755
--- a/gdb/gnulib/update-gnulib.sh
+++ b/gnulib/update-gnulib.sh
@@ -173,7 +173,7 @@ apply_patches "patches/0001-Fix-PR-gdb-23558-Use-system-s-getcwd-when-cross-comp
 apply_patches "patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch"
 
 # Regenerate all necessary files...
-aclocal -Iimport/m4 &&
+aclocal -Iimport/m4 -I../config &&
 autoconf &&
 autoheader &&
 automake