Move gnulib to top level

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/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
@@ -1900,12 +1887,6 @@  ifneq ($(CODESIGN_CERT),)
 	$(ECHO_SIGN) $(CODESIGN) -s $(CODESIGN_CERT) gdb$(EXEEXT)
 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
@@ -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/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/gdb/gnulib/Makefile.in b/gnulib/Makefile.in
similarity index 98%
rename from gdb/gnulib/Makefile.in
rename to 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/gdb/gnulib/aclocal-m4-deps.mk b/gnulib/aclocal-m4-deps.mk
similarity index 100%
rename from gdb/gnulib/aclocal-m4-deps.mk
rename to gnulib/aclocal-m4-deps.mk
diff --git a/gdb/gnulib/aclocal.m4 b/gnulib/aclocal.m4
similarity index 72%
rename from gdb/gnulib/aclocal.m4
rename to 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
similarity index 100%
rename from gdb/gnulib/config.in
rename to gnulib/config.in
diff --git a/gdb/gnulib/configure b/gnulib/configure
similarity index 98%
rename from gdb/gnulib/configure
rename to 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
similarity index 97%
rename from gdb/gnulib/configure.ac
rename to 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
similarity index 100%
rename from gdb/gnulib/import/Makefile.am
rename to gnulib/import/Makefile.am
diff --git a/gdb/gnulib/import/Makefile.in b/gnulib/import/Makefile.in
similarity index 100%
rename from gdb/gnulib/import/Makefile.in
rename to gnulib/import/Makefile.in
diff --git a/gdb/gnulib/import/alloca.c b/gnulib/import/alloca.c
similarity index 100%
rename from gdb/gnulib/import/alloca.c
rename to gnulib/import/alloca.c
diff --git a/gdb/gnulib/import/alloca.in.h b/gnulib/import/alloca.in.h
similarity index 100%
rename from gdb/gnulib/import/alloca.in.h
rename to gnulib/import/alloca.in.h
diff --git a/gdb/gnulib/import/arpa_inet.in.h b/gnulib/import/arpa_inet.in.h
similarity index 100%
rename from gdb/gnulib/import/arpa_inet.in.h
rename to gnulib/import/arpa_inet.in.h
diff --git a/gdb/gnulib/import/assure.h b/gnulib/import/assure.h
similarity index 100%
rename from gdb/gnulib/import/assure.h
rename to gnulib/import/assure.h
diff --git a/gdb/gnulib/import/at-func.c b/gnulib/import/at-func.c
similarity index 100%
rename from gdb/gnulib/import/at-func.c
rename to gnulib/import/at-func.c
diff --git a/gdb/gnulib/import/basename-lgpl.c b/gnulib/import/basename-lgpl.c
similarity index 100%
rename from gdb/gnulib/import/basename-lgpl.c
rename to gnulib/import/basename-lgpl.c
diff --git a/gdb/gnulib/import/canonicalize-lgpl.c b/gnulib/import/canonicalize-lgpl.c
similarity index 100%
rename from gdb/gnulib/import/canonicalize-lgpl.c
rename to gnulib/import/canonicalize-lgpl.c
diff --git a/gdb/gnulib/import/chdir-long.c b/gnulib/import/chdir-long.c
similarity index 100%
rename from gdb/gnulib/import/chdir-long.c
rename to gnulib/import/chdir-long.c
diff --git a/gdb/gnulib/import/chdir-long.h b/gnulib/import/chdir-long.h
similarity index 100%
rename from gdb/gnulib/import/chdir-long.h
rename to gnulib/import/chdir-long.h
diff --git a/gdb/gnulib/import/cloexec.c b/gnulib/import/cloexec.c
similarity index 100%
rename from gdb/gnulib/import/cloexec.c
rename to gnulib/import/cloexec.c
diff --git a/gdb/gnulib/import/cloexec.h b/gnulib/import/cloexec.h
similarity index 100%
rename from gdb/gnulib/import/cloexec.h
rename to gnulib/import/cloexec.h
diff --git a/gdb/gnulib/import/close.c b/gnulib/import/close.c
similarity index 100%
rename from gdb/gnulib/import/close.c
rename to gnulib/import/close.c
diff --git a/gdb/gnulib/import/closedir.c b/gnulib/import/closedir.c
similarity index 100%
rename from gdb/gnulib/import/closedir.c
rename to gnulib/import/closedir.c
diff --git a/gdb/gnulib/import/config.charset b/gnulib/import/config.charset
similarity index 100%
rename from gdb/gnulib/import/config.charset
rename to gnulib/import/config.charset
diff --git a/gdb/gnulib/import/dirent-private.h b/gnulib/import/dirent-private.h
similarity index 100%
rename from gdb/gnulib/import/dirent-private.h
rename to gnulib/import/dirent-private.h
diff --git a/gdb/gnulib/import/dirent.in.h b/gnulib/import/dirent.in.h
similarity index 100%
rename from gdb/gnulib/import/dirent.in.h
rename to gnulib/import/dirent.in.h
diff --git a/gdb/gnulib/import/dirfd.c b/gnulib/import/dirfd.c
similarity index 100%
rename from gdb/gnulib/import/dirfd.c
rename to gnulib/import/dirfd.c
diff --git a/gdb/gnulib/import/dirname-lgpl.c b/gnulib/import/dirname-lgpl.c
similarity index 100%
rename from gdb/gnulib/import/dirname-lgpl.c
rename to gnulib/import/dirname-lgpl.c
diff --git a/gdb/gnulib/import/dirname.h b/gnulib/import/dirname.h
similarity index 100%
rename from gdb/gnulib/import/dirname.h
rename to gnulib/import/dirname.h
diff --git a/gdb/gnulib/import/dosname.h b/gnulib/import/dosname.h
similarity index 100%
rename from gdb/gnulib/import/dosname.h
rename to gnulib/import/dosname.h
diff --git a/gdb/gnulib/import/dup-safer.c b/gnulib/import/dup-safer.c
similarity index 100%
rename from gdb/gnulib/import/dup-safer.c
rename to gnulib/import/dup-safer.c
diff --git a/gdb/gnulib/import/dup.c b/gnulib/import/dup.c
similarity index 100%
rename from gdb/gnulib/import/dup.c
rename to gnulib/import/dup.c
diff --git a/gdb/gnulib/import/dup2.c b/gnulib/import/dup2.c
similarity index 100%
rename from gdb/gnulib/import/dup2.c
rename to gnulib/import/dup2.c
diff --git a/gdb/gnulib/import/errno.in.h b/gnulib/import/errno.in.h
similarity index 100%
rename from gdb/gnulib/import/errno.in.h
rename to gnulib/import/errno.in.h
diff --git a/gdb/gnulib/import/error.c b/gnulib/import/error.c
similarity index 100%
rename from gdb/gnulib/import/error.c
rename to gnulib/import/error.c
diff --git a/gdb/gnulib/import/error.h b/gnulib/import/error.h
similarity index 100%
rename from gdb/gnulib/import/error.h
rename to gnulib/import/error.h
diff --git a/gdb/gnulib/import/exitfail.c b/gnulib/import/exitfail.c
similarity index 100%
rename from gdb/gnulib/import/exitfail.c
rename to gnulib/import/exitfail.c
diff --git a/gdb/gnulib/import/exitfail.h b/gnulib/import/exitfail.h
similarity index 100%
rename from gdb/gnulib/import/exitfail.h
rename to gnulib/import/exitfail.h
diff --git a/gdb/gnulib/import/extra/snippet/_Noreturn.h b/gnulib/import/extra/snippet/_Noreturn.h
similarity index 100%
rename from gdb/gnulib/import/extra/snippet/_Noreturn.h
rename to 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
similarity index 100%
rename from gdb/gnulib/import/extra/snippet/arg-nonnull.h
rename to 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
similarity index 100%
rename from gdb/gnulib/import/extra/snippet/c++defs.h
rename to 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
similarity index 100%
rename from gdb/gnulib/import/extra/snippet/warn-on-use.h
rename to gnulib/import/extra/snippet/warn-on-use.h
diff --git a/gdb/gnulib/import/extra/update-copyright b/gnulib/import/extra/update-copyright
similarity index 100%
rename from gdb/gnulib/import/extra/update-copyright
rename to gnulib/import/extra/update-copyright
diff --git a/gdb/gnulib/import/fchdir.c b/gnulib/import/fchdir.c
similarity index 100%
rename from gdb/gnulib/import/fchdir.c
rename to gnulib/import/fchdir.c
diff --git a/gdb/gnulib/import/fcntl.c b/gnulib/import/fcntl.c
similarity index 100%
rename from gdb/gnulib/import/fcntl.c
rename to gnulib/import/fcntl.c
diff --git a/gdb/gnulib/import/fcntl.in.h b/gnulib/import/fcntl.in.h
similarity index 100%
rename from gdb/gnulib/import/fcntl.in.h
rename to gnulib/import/fcntl.in.h
diff --git a/gdb/gnulib/import/fd-hook.c b/gnulib/import/fd-hook.c
similarity index 100%
rename from gdb/gnulib/import/fd-hook.c
rename to gnulib/import/fd-hook.c
diff --git a/gdb/gnulib/import/fd-hook.h b/gnulib/import/fd-hook.h
similarity index 100%
rename from gdb/gnulib/import/fd-hook.h
rename to gnulib/import/fd-hook.h
diff --git a/gdb/gnulib/import/fd-safer.c b/gnulib/import/fd-safer.c
similarity index 100%
rename from gdb/gnulib/import/fd-safer.c
rename to gnulib/import/fd-safer.c
diff --git a/gdb/gnulib/import/fdopendir.c b/gnulib/import/fdopendir.c
similarity index 100%
rename from gdb/gnulib/import/fdopendir.c
rename to gnulib/import/fdopendir.c
diff --git a/gdb/gnulib/import/filename.h b/gnulib/import/filename.h
similarity index 100%
rename from gdb/gnulib/import/filename.h
rename to gnulib/import/filename.h
diff --git a/gdb/gnulib/import/filenamecat-lgpl.c b/gnulib/import/filenamecat-lgpl.c
similarity index 100%
rename from gdb/gnulib/import/filenamecat-lgpl.c
rename to gnulib/import/filenamecat-lgpl.c
diff --git a/gdb/gnulib/import/filenamecat.h b/gnulib/import/filenamecat.h
similarity index 100%
rename from gdb/gnulib/import/filenamecat.h
rename to gnulib/import/filenamecat.h
diff --git a/gdb/gnulib/import/flexmember.h b/gnulib/import/flexmember.h
similarity index 100%
rename from gdb/gnulib/import/flexmember.h
rename to gnulib/import/flexmember.h
diff --git a/gdb/gnulib/import/float+.h b/gnulib/import/float+.h
similarity index 100%
rename from gdb/gnulib/import/float+.h
rename to gnulib/import/float+.h
diff --git a/gdb/gnulib/import/float.c b/gnulib/import/float.c
similarity index 100%
rename from gdb/gnulib/import/float.c
rename to gnulib/import/float.c
diff --git a/gdb/gnulib/import/float.in.h b/gnulib/import/float.in.h
similarity index 100%
rename from gdb/gnulib/import/float.in.h
rename to gnulib/import/float.in.h
diff --git a/gdb/gnulib/import/fnmatch.c b/gnulib/import/fnmatch.c
similarity index 100%
rename from gdb/gnulib/import/fnmatch.c
rename to gnulib/import/fnmatch.c
diff --git a/gdb/gnulib/import/fnmatch.in.h b/gnulib/import/fnmatch.in.h
similarity index 100%
rename from gdb/gnulib/import/fnmatch.in.h
rename to gnulib/import/fnmatch.in.h
diff --git a/gdb/gnulib/import/fnmatch_loop.c b/gnulib/import/fnmatch_loop.c
similarity index 100%
rename from gdb/gnulib/import/fnmatch_loop.c
rename to gnulib/import/fnmatch_loop.c
diff --git a/gdb/gnulib/import/fpucw.h b/gnulib/import/fpucw.h
similarity index 100%
rename from gdb/gnulib/import/fpucw.h
rename to gnulib/import/fpucw.h
diff --git a/gdb/gnulib/import/frexp.c b/gnulib/import/frexp.c
similarity index 100%
rename from gdb/gnulib/import/frexp.c
rename to gnulib/import/frexp.c
diff --git a/gdb/gnulib/import/frexpl.c b/gnulib/import/frexpl.c
similarity index 100%
rename from gdb/gnulib/import/frexpl.c
rename to gnulib/import/frexpl.c
diff --git a/gdb/gnulib/import/fstat.c b/gnulib/import/fstat.c
similarity index 100%
rename from gdb/gnulib/import/fstat.c
rename to gnulib/import/fstat.c
diff --git a/gdb/gnulib/import/fstatat.c b/gnulib/import/fstatat.c
similarity index 100%
rename from gdb/gnulib/import/fstatat.c
rename to gnulib/import/fstatat.c
diff --git a/gdb/gnulib/import/getcwd-lgpl.c b/gnulib/import/getcwd-lgpl.c
similarity index 100%
rename from gdb/gnulib/import/getcwd-lgpl.c
rename to gnulib/import/getcwd-lgpl.c
diff --git a/gdb/gnulib/import/getcwd.c b/gnulib/import/getcwd.c
similarity index 100%
rename from gdb/gnulib/import/getcwd.c
rename to gnulib/import/getcwd.c
diff --git a/gdb/gnulib/import/getdtablesize.c b/gnulib/import/getdtablesize.c
similarity index 100%
rename from gdb/gnulib/import/getdtablesize.c
rename to gnulib/import/getdtablesize.c
diff --git a/gdb/gnulib/import/getlogin_r.c b/gnulib/import/getlogin_r.c
similarity index 100%
rename from gdb/gnulib/import/getlogin_r.c
rename to gnulib/import/getlogin_r.c
diff --git a/gdb/gnulib/import/getprogname.c b/gnulib/import/getprogname.c
similarity index 100%
rename from gdb/gnulib/import/getprogname.c
rename to gnulib/import/getprogname.c
diff --git a/gdb/gnulib/import/getprogname.h b/gnulib/import/getprogname.h
similarity index 100%
rename from gdb/gnulib/import/getprogname.h
rename to gnulib/import/getprogname.h
diff --git a/gdb/gnulib/import/gettext.h b/gnulib/import/gettext.h
similarity index 100%
rename from gdb/gnulib/import/gettext.h
rename to gnulib/import/gettext.h
diff --git a/gdb/gnulib/import/gettimeofday.c b/gnulib/import/gettimeofday.c
similarity index 100%
rename from gdb/gnulib/import/gettimeofday.c
rename to gnulib/import/gettimeofday.c
diff --git a/gdb/gnulib/import/glob-libc.h b/gnulib/import/glob-libc.h
similarity index 100%
rename from gdb/gnulib/import/glob-libc.h
rename to gnulib/import/glob-libc.h
diff --git a/gdb/gnulib/import/glob.c b/gnulib/import/glob.c
similarity index 100%
rename from gdb/gnulib/import/glob.c
rename to gnulib/import/glob.c
diff --git a/gdb/gnulib/import/glob.in.h b/gnulib/import/glob.in.h
similarity index 100%
rename from gdb/gnulib/import/glob.in.h
rename to gnulib/import/glob.in.h
diff --git a/gdb/gnulib/import/hard-locale.c b/gnulib/import/hard-locale.c
similarity index 100%
rename from gdb/gnulib/import/hard-locale.c
rename to gnulib/import/hard-locale.c
diff --git a/gdb/gnulib/import/hard-locale.h b/gnulib/import/hard-locale.h
similarity index 100%
rename from gdb/gnulib/import/hard-locale.h
rename to gnulib/import/hard-locale.h
diff --git a/gdb/gnulib/import/inet_ntop.c b/gnulib/import/inet_ntop.c
similarity index 100%
rename from gdb/gnulib/import/inet_ntop.c
rename to gnulib/import/inet_ntop.c
diff --git a/gdb/gnulib/import/intprops.h b/gnulib/import/intprops.h
similarity index 100%
rename from gdb/gnulib/import/intprops.h
rename to gnulib/import/intprops.h
diff --git a/gdb/gnulib/import/inttypes.in.h b/gnulib/import/inttypes.in.h
similarity index 100%
rename from gdb/gnulib/import/inttypes.in.h
rename to gnulib/import/inttypes.in.h
diff --git a/gdb/gnulib/import/isnan.c b/gnulib/import/isnan.c
similarity index 100%
rename from gdb/gnulib/import/isnan.c
rename to gnulib/import/isnan.c
diff --git a/gdb/gnulib/import/isnand-nolibm.h b/gnulib/import/isnand-nolibm.h
similarity index 100%
rename from gdb/gnulib/import/isnand-nolibm.h
rename to gnulib/import/isnand-nolibm.h
diff --git a/gdb/gnulib/import/isnand.c b/gnulib/import/isnand.c
similarity index 100%
rename from gdb/gnulib/import/isnand.c
rename to gnulib/import/isnand.c
diff --git a/gdb/gnulib/import/isnanl-nolibm.h b/gnulib/import/isnanl-nolibm.h
similarity index 100%
rename from gdb/gnulib/import/isnanl-nolibm.h
rename to gnulib/import/isnanl-nolibm.h
diff --git a/gdb/gnulib/import/isnanl.c b/gnulib/import/isnanl.c
similarity index 100%
rename from gdb/gnulib/import/isnanl.c
rename to gnulib/import/isnanl.c
diff --git a/gdb/gnulib/import/itold.c b/gnulib/import/itold.c
similarity index 100%
rename from gdb/gnulib/import/itold.c
rename to gnulib/import/itold.c
diff --git a/gdb/gnulib/import/limits.in.h b/gnulib/import/limits.in.h
similarity index 100%
rename from gdb/gnulib/import/limits.in.h
rename to gnulib/import/limits.in.h
diff --git a/gdb/gnulib/import/localcharset.c b/gnulib/import/localcharset.c
similarity index 100%
rename from gdb/gnulib/import/localcharset.c
rename to gnulib/import/localcharset.c
diff --git a/gdb/gnulib/import/localcharset.h b/gnulib/import/localcharset.h
similarity index 100%
rename from gdb/gnulib/import/localcharset.h
rename to gnulib/import/localcharset.h
diff --git a/gdb/gnulib/import/lstat.c b/gnulib/import/lstat.c
similarity index 100%
rename from gdb/gnulib/import/lstat.c
rename to gnulib/import/lstat.c
diff --git a/gdb/gnulib/import/m4/00gnulib.m4 b/gnulib/import/m4/00gnulib.m4
similarity index 100%
rename from gdb/gnulib/import/m4/00gnulib.m4
rename to gnulib/import/m4/00gnulib.m4
diff --git a/gdb/gnulib/import/m4/absolute-header.m4 b/gnulib/import/m4/absolute-header.m4
similarity index 100%
rename from gdb/gnulib/import/m4/absolute-header.m4
rename to gnulib/import/m4/absolute-header.m4
diff --git a/gdb/gnulib/import/m4/alloca.m4 b/gnulib/import/m4/alloca.m4
similarity index 100%
rename from gdb/gnulib/import/m4/alloca.m4
rename to gnulib/import/m4/alloca.m4
diff --git a/gdb/gnulib/import/m4/arpa_inet_h.m4 b/gnulib/import/m4/arpa_inet_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/arpa_inet_h.m4
rename to gnulib/import/m4/arpa_inet_h.m4
diff --git a/gdb/gnulib/import/m4/canonicalize.m4 b/gnulib/import/m4/canonicalize.m4
similarity index 100%
rename from gdb/gnulib/import/m4/canonicalize.m4
rename to gnulib/import/m4/canonicalize.m4
diff --git a/gdb/gnulib/import/m4/chdir-long.m4 b/gnulib/import/m4/chdir-long.m4
similarity index 100%
rename from gdb/gnulib/import/m4/chdir-long.m4
rename to gnulib/import/m4/chdir-long.m4
diff --git a/gdb/gnulib/import/m4/close.m4 b/gnulib/import/m4/close.m4
similarity index 100%
rename from gdb/gnulib/import/m4/close.m4
rename to gnulib/import/m4/close.m4
diff --git a/gdb/gnulib/import/m4/closedir.m4 b/gnulib/import/m4/closedir.m4
similarity index 100%
rename from gdb/gnulib/import/m4/closedir.m4
rename to gnulib/import/m4/closedir.m4
diff --git a/gdb/gnulib/import/m4/codeset.m4 b/gnulib/import/m4/codeset.m4
similarity index 100%
rename from gdb/gnulib/import/m4/codeset.m4
rename to gnulib/import/m4/codeset.m4
diff --git a/gdb/gnulib/import/m4/configmake.m4 b/gnulib/import/m4/configmake.m4
similarity index 100%
rename from gdb/gnulib/import/m4/configmake.m4
rename to gnulib/import/m4/configmake.m4
diff --git a/gdb/gnulib/import/m4/d-ino.m4 b/gnulib/import/m4/d-ino.m4
similarity index 100%
rename from gdb/gnulib/import/m4/d-ino.m4
rename to gnulib/import/m4/d-ino.m4
diff --git a/gdb/gnulib/import/m4/d-type.m4 b/gnulib/import/m4/d-type.m4
similarity index 100%
rename from gdb/gnulib/import/m4/d-type.m4
rename to gnulib/import/m4/d-type.m4
diff --git a/gdb/gnulib/import/m4/dirent_h.m4 b/gnulib/import/m4/dirent_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/dirent_h.m4
rename to gnulib/import/m4/dirent_h.m4
diff --git a/gdb/gnulib/import/m4/dirfd.m4 b/gnulib/import/m4/dirfd.m4
similarity index 100%
rename from gdb/gnulib/import/m4/dirfd.m4
rename to gnulib/import/m4/dirfd.m4
diff --git a/gdb/gnulib/import/m4/dirname.m4 b/gnulib/import/m4/dirname.m4
similarity index 100%
rename from gdb/gnulib/import/m4/dirname.m4
rename to gnulib/import/m4/dirname.m4
diff --git a/gdb/gnulib/import/m4/double-slash-root.m4 b/gnulib/import/m4/double-slash-root.m4
similarity index 100%
rename from gdb/gnulib/import/m4/double-slash-root.m4
rename to gnulib/import/m4/double-slash-root.m4
diff --git a/gdb/gnulib/import/m4/dup.m4 b/gnulib/import/m4/dup.m4
similarity index 100%
rename from gdb/gnulib/import/m4/dup.m4
rename to gnulib/import/m4/dup.m4
diff --git a/gdb/gnulib/import/m4/dup2.m4 b/gnulib/import/m4/dup2.m4
similarity index 100%
rename from gdb/gnulib/import/m4/dup2.m4
rename to gnulib/import/m4/dup2.m4
diff --git a/gdb/gnulib/import/m4/eealloc.m4 b/gnulib/import/m4/eealloc.m4
similarity index 100%
rename from gdb/gnulib/import/m4/eealloc.m4
rename to gnulib/import/m4/eealloc.m4
diff --git a/gdb/gnulib/import/m4/environ.m4 b/gnulib/import/m4/environ.m4
similarity index 100%
rename from gdb/gnulib/import/m4/environ.m4
rename to gnulib/import/m4/environ.m4
diff --git a/gdb/gnulib/import/m4/errno_h.m4 b/gnulib/import/m4/errno_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/errno_h.m4
rename to gnulib/import/m4/errno_h.m4
diff --git a/gdb/gnulib/import/m4/error.m4 b/gnulib/import/m4/error.m4
similarity index 100%
rename from gdb/gnulib/import/m4/error.m4
rename to gnulib/import/m4/error.m4
diff --git a/gdb/gnulib/import/m4/exponentd.m4 b/gnulib/import/m4/exponentd.m4
similarity index 100%
rename from gdb/gnulib/import/m4/exponentd.m4
rename to gnulib/import/m4/exponentd.m4
diff --git a/gdb/gnulib/import/m4/exponentl.m4 b/gnulib/import/m4/exponentl.m4
similarity index 100%
rename from gdb/gnulib/import/m4/exponentl.m4
rename to gnulib/import/m4/exponentl.m4
diff --git a/gdb/gnulib/import/m4/extensions.m4 b/gnulib/import/m4/extensions.m4
similarity index 100%
rename from gdb/gnulib/import/m4/extensions.m4
rename to gnulib/import/m4/extensions.m4
diff --git a/gdb/gnulib/import/m4/extern-inline.m4 b/gnulib/import/m4/extern-inline.m4
similarity index 100%
rename from gdb/gnulib/import/m4/extern-inline.m4
rename to gnulib/import/m4/extern-inline.m4
diff --git a/gdb/gnulib/import/m4/fchdir.m4 b/gnulib/import/m4/fchdir.m4
similarity index 100%
rename from gdb/gnulib/import/m4/fchdir.m4
rename to gnulib/import/m4/fchdir.m4
diff --git a/gdb/gnulib/import/m4/fcntl-o.m4 b/gnulib/import/m4/fcntl-o.m4
similarity index 100%
rename from gdb/gnulib/import/m4/fcntl-o.m4
rename to gnulib/import/m4/fcntl-o.m4
diff --git a/gdb/gnulib/import/m4/fcntl.m4 b/gnulib/import/m4/fcntl.m4
similarity index 100%
rename from gdb/gnulib/import/m4/fcntl.m4
rename to gnulib/import/m4/fcntl.m4
diff --git a/gdb/gnulib/import/m4/fcntl_h.m4 b/gnulib/import/m4/fcntl_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/fcntl_h.m4
rename to gnulib/import/m4/fcntl_h.m4
diff --git a/gdb/gnulib/import/m4/fdopendir.m4 b/gnulib/import/m4/fdopendir.m4
similarity index 100%
rename from gdb/gnulib/import/m4/fdopendir.m4
rename to gnulib/import/m4/fdopendir.m4
diff --git a/gdb/gnulib/import/m4/filenamecat.m4 b/gnulib/import/m4/filenamecat.m4
similarity index 100%
rename from gdb/gnulib/import/m4/filenamecat.m4
rename to gnulib/import/m4/filenamecat.m4
diff --git a/gdb/gnulib/import/m4/flexmember.m4 b/gnulib/import/m4/flexmember.m4
similarity index 100%
rename from gdb/gnulib/import/m4/flexmember.m4
rename to gnulib/import/m4/flexmember.m4
diff --git a/gdb/gnulib/import/m4/float_h.m4 b/gnulib/import/m4/float_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/float_h.m4
rename to gnulib/import/m4/float_h.m4
diff --git a/gdb/gnulib/import/m4/fnmatch.m4 b/gnulib/import/m4/fnmatch.m4
similarity index 100%
rename from gdb/gnulib/import/m4/fnmatch.m4
rename to gnulib/import/m4/fnmatch.m4
diff --git a/gdb/gnulib/import/m4/fpieee.m4 b/gnulib/import/m4/fpieee.m4
similarity index 100%
rename from gdb/gnulib/import/m4/fpieee.m4
rename to gnulib/import/m4/fpieee.m4
diff --git a/gdb/gnulib/import/m4/frexp.m4 b/gnulib/import/m4/frexp.m4
similarity index 100%
rename from gdb/gnulib/import/m4/frexp.m4
rename to gnulib/import/m4/frexp.m4
diff --git a/gdb/gnulib/import/m4/frexpl.m4 b/gnulib/import/m4/frexpl.m4
similarity index 100%
rename from gdb/gnulib/import/m4/frexpl.m4
rename to gnulib/import/m4/frexpl.m4
diff --git a/gdb/gnulib/import/m4/fstat.m4 b/gnulib/import/m4/fstat.m4
similarity index 100%
rename from gdb/gnulib/import/m4/fstat.m4
rename to gnulib/import/m4/fstat.m4
diff --git a/gdb/gnulib/import/m4/fstatat.m4 b/gnulib/import/m4/fstatat.m4
similarity index 100%
rename from gdb/gnulib/import/m4/fstatat.m4
rename to gnulib/import/m4/fstatat.m4
diff --git a/gdb/gnulib/import/m4/getcwd-abort-bug.m4 b/gnulib/import/m4/getcwd-abort-bug.m4
similarity index 100%
rename from gdb/gnulib/import/m4/getcwd-abort-bug.m4
rename to 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
similarity index 100%
rename from gdb/gnulib/import/m4/getcwd-path-max.m4
rename to gnulib/import/m4/getcwd-path-max.m4
diff --git a/gdb/gnulib/import/m4/getcwd.m4 b/gnulib/import/m4/getcwd.m4
similarity index 100%
rename from gdb/gnulib/import/m4/getcwd.m4
rename to gnulib/import/m4/getcwd.m4
diff --git a/gdb/gnulib/import/m4/getdtablesize.m4 b/gnulib/import/m4/getdtablesize.m4
similarity index 100%
rename from gdb/gnulib/import/m4/getdtablesize.m4
rename to gnulib/import/m4/getdtablesize.m4
diff --git a/gdb/gnulib/import/m4/getlogin_r.m4 b/gnulib/import/m4/getlogin_r.m4
similarity index 100%
rename from gdb/gnulib/import/m4/getlogin_r.m4
rename to gnulib/import/m4/getlogin_r.m4
diff --git a/gdb/gnulib/import/m4/getprogname.m4 b/gnulib/import/m4/getprogname.m4
similarity index 100%
rename from gdb/gnulib/import/m4/getprogname.m4
rename to gnulib/import/m4/getprogname.m4
diff --git a/gdb/gnulib/import/m4/gettimeofday.m4 b/gnulib/import/m4/gettimeofday.m4
similarity index 100%
rename from gdb/gnulib/import/m4/gettimeofday.m4
rename to gnulib/import/m4/gettimeofday.m4
diff --git a/gdb/gnulib/import/m4/glibc21.m4 b/gnulib/import/m4/glibc21.m4
similarity index 100%
rename from gdb/gnulib/import/m4/glibc21.m4
rename to gnulib/import/m4/glibc21.m4
diff --git a/gdb/gnulib/import/m4/glob.m4 b/gnulib/import/m4/glob.m4
similarity index 100%
rename from gdb/gnulib/import/m4/glob.m4
rename to gnulib/import/m4/glob.m4
diff --git a/gdb/gnulib/import/m4/gnulib-cache.m4 b/gnulib/import/m4/gnulib-cache.m4
similarity index 100%
rename from gdb/gnulib/import/m4/gnulib-cache.m4
rename to gnulib/import/m4/gnulib-cache.m4
diff --git a/gdb/gnulib/import/m4/gnulib-common.m4 b/gnulib/import/m4/gnulib-common.m4
similarity index 100%
rename from gdb/gnulib/import/m4/gnulib-common.m4
rename to gnulib/import/m4/gnulib-common.m4
diff --git a/gdb/gnulib/import/m4/gnulib-comp.m4 b/gnulib/import/m4/gnulib-comp.m4
similarity index 100%
rename from gdb/gnulib/import/m4/gnulib-comp.m4
rename to gnulib/import/m4/gnulib-comp.m4
diff --git a/gdb/gnulib/import/m4/gnulib-tool.m4 b/gnulib/import/m4/gnulib-tool.m4
similarity index 100%
rename from gdb/gnulib/import/m4/gnulib-tool.m4
rename to gnulib/import/m4/gnulib-tool.m4
diff --git a/gdb/gnulib/import/m4/hard-locale.m4 b/gnulib/import/m4/hard-locale.m4
similarity index 100%
rename from gdb/gnulib/import/m4/hard-locale.m4
rename to gnulib/import/m4/hard-locale.m4
diff --git a/gdb/gnulib/import/m4/include_next.m4 b/gnulib/import/m4/include_next.m4
similarity index 100%
rename from gdb/gnulib/import/m4/include_next.m4
rename to gnulib/import/m4/include_next.m4
diff --git a/gdb/gnulib/import/m4/inet_ntop.m4 b/gnulib/import/m4/inet_ntop.m4
similarity index 100%
rename from gdb/gnulib/import/m4/inet_ntop.m4
rename to gnulib/import/m4/inet_ntop.m4
diff --git a/gdb/gnulib/import/m4/inttypes-pri.m4 b/gnulib/import/m4/inttypes-pri.m4
similarity index 100%
rename from gdb/gnulib/import/m4/inttypes-pri.m4
rename to gnulib/import/m4/inttypes-pri.m4
diff --git a/gdb/gnulib/import/m4/inttypes.m4 b/gnulib/import/m4/inttypes.m4
similarity index 100%
rename from gdb/gnulib/import/m4/inttypes.m4
rename to gnulib/import/m4/inttypes.m4
diff --git a/gdb/gnulib/import/m4/isnand.m4 b/gnulib/import/m4/isnand.m4
similarity index 100%
rename from gdb/gnulib/import/m4/isnand.m4
rename to gnulib/import/m4/isnand.m4
diff --git a/gdb/gnulib/import/m4/isnanl.m4 b/gnulib/import/m4/isnanl.m4
similarity index 100%
rename from gdb/gnulib/import/m4/isnanl.m4
rename to gnulib/import/m4/isnanl.m4
diff --git a/gdb/gnulib/import/m4/largefile.m4 b/gnulib/import/m4/largefile.m4
similarity index 100%
rename from gdb/gnulib/import/m4/largefile.m4
rename to gnulib/import/m4/largefile.m4
diff --git a/gdb/gnulib/import/m4/limits-h.m4 b/gnulib/import/m4/limits-h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/limits-h.m4
rename to gnulib/import/m4/limits-h.m4
diff --git a/gdb/gnulib/import/m4/localcharset.m4 b/gnulib/import/m4/localcharset.m4
similarity index 100%
rename from gdb/gnulib/import/m4/localcharset.m4
rename to gnulib/import/m4/localcharset.m4
diff --git a/gdb/gnulib/import/m4/locale-fr.m4 b/gnulib/import/m4/locale-fr.m4
similarity index 100%
rename from gdb/gnulib/import/m4/locale-fr.m4
rename to gnulib/import/m4/locale-fr.m4
diff --git a/gdb/gnulib/import/m4/locale-ja.m4 b/gnulib/import/m4/locale-ja.m4
similarity index 100%
rename from gdb/gnulib/import/m4/locale-ja.m4
rename to gnulib/import/m4/locale-ja.m4
diff --git a/gdb/gnulib/import/m4/locale-zh.m4 b/gnulib/import/m4/locale-zh.m4
similarity index 100%
rename from gdb/gnulib/import/m4/locale-zh.m4
rename to gnulib/import/m4/locale-zh.m4
diff --git a/gdb/gnulib/import/m4/longlong.m4 b/gnulib/import/m4/longlong.m4
similarity index 100%
rename from gdb/gnulib/import/m4/longlong.m4
rename to gnulib/import/m4/longlong.m4
diff --git a/gdb/gnulib/import/m4/lstat.m4 b/gnulib/import/m4/lstat.m4
similarity index 100%
rename from gdb/gnulib/import/m4/lstat.m4
rename to gnulib/import/m4/lstat.m4
diff --git a/gdb/gnulib/import/m4/malloc.m4 b/gnulib/import/m4/malloc.m4
similarity index 100%
rename from gdb/gnulib/import/m4/malloc.m4
rename to gnulib/import/m4/malloc.m4
diff --git a/gdb/gnulib/import/m4/malloca.m4 b/gnulib/import/m4/malloca.m4
similarity index 100%
rename from gdb/gnulib/import/m4/malloca.m4
rename to gnulib/import/m4/malloca.m4
diff --git a/gdb/gnulib/import/m4/math_h.m4 b/gnulib/import/m4/math_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/math_h.m4
rename to gnulib/import/m4/math_h.m4
diff --git a/gdb/gnulib/import/m4/mbrtowc.m4 b/gnulib/import/m4/mbrtowc.m4
similarity index 100%
rename from gdb/gnulib/import/m4/mbrtowc.m4
rename to gnulib/import/m4/mbrtowc.m4
diff --git a/gdb/gnulib/import/m4/mbsinit.m4 b/gnulib/import/m4/mbsinit.m4
similarity index 100%
rename from gdb/gnulib/import/m4/mbsinit.m4
rename to gnulib/import/m4/mbsinit.m4
diff --git a/gdb/gnulib/import/m4/mbsrtowcs.m4 b/gnulib/import/m4/mbsrtowcs.m4
similarity index 100%
rename from gdb/gnulib/import/m4/mbsrtowcs.m4
rename to gnulib/import/m4/mbsrtowcs.m4
diff --git a/gdb/gnulib/import/m4/mbstate_t.m4 b/gnulib/import/m4/mbstate_t.m4
similarity index 100%
rename from gdb/gnulib/import/m4/mbstate_t.m4
rename to gnulib/import/m4/mbstate_t.m4
diff --git a/gdb/gnulib/import/m4/memchr.m4 b/gnulib/import/m4/memchr.m4
similarity index 100%
rename from gdb/gnulib/import/m4/memchr.m4
rename to gnulib/import/m4/memchr.m4
diff --git a/gdb/gnulib/import/m4/memmem.m4 b/gnulib/import/m4/memmem.m4
similarity index 100%
rename from gdb/gnulib/import/m4/memmem.m4
rename to gnulib/import/m4/memmem.m4
diff --git a/gdb/gnulib/import/m4/mempcpy.m4 b/gnulib/import/m4/mempcpy.m4
similarity index 100%
rename from gdb/gnulib/import/m4/mempcpy.m4
rename to gnulib/import/m4/mempcpy.m4
diff --git a/gdb/gnulib/import/m4/memrchr.m4 b/gnulib/import/m4/memrchr.m4
similarity index 100%
rename from gdb/gnulib/import/m4/memrchr.m4
rename to gnulib/import/m4/memrchr.m4
diff --git a/gdb/gnulib/import/m4/mkdir.m4 b/gnulib/import/m4/mkdir.m4
similarity index 100%
rename from gdb/gnulib/import/m4/mkdir.m4
rename to gnulib/import/m4/mkdir.m4
diff --git a/gdb/gnulib/import/m4/mkdtemp.m4 b/gnulib/import/m4/mkdtemp.m4
similarity index 100%
rename from gdb/gnulib/import/m4/mkdtemp.m4
rename to gnulib/import/m4/mkdtemp.m4
diff --git a/gdb/gnulib/import/m4/mkostemp.m4 b/gnulib/import/m4/mkostemp.m4
similarity index 100%
rename from gdb/gnulib/import/m4/mkostemp.m4
rename to gnulib/import/m4/mkostemp.m4
diff --git a/gdb/gnulib/import/m4/mmap-anon.m4 b/gnulib/import/m4/mmap-anon.m4
similarity index 100%
rename from gdb/gnulib/import/m4/mmap-anon.m4
rename to gnulib/import/m4/mmap-anon.m4
diff --git a/gdb/gnulib/import/m4/mode_t.m4 b/gnulib/import/m4/mode_t.m4
similarity index 100%
rename from gdb/gnulib/import/m4/mode_t.m4
rename to gnulib/import/m4/mode_t.m4
diff --git a/gdb/gnulib/import/m4/msvc-inval.m4 b/gnulib/import/m4/msvc-inval.m4
similarity index 100%
rename from gdb/gnulib/import/m4/msvc-inval.m4
rename to gnulib/import/m4/msvc-inval.m4
diff --git a/gdb/gnulib/import/m4/msvc-nothrow.m4 b/gnulib/import/m4/msvc-nothrow.m4
similarity index 100%
rename from gdb/gnulib/import/m4/msvc-nothrow.m4
rename to gnulib/import/m4/msvc-nothrow.m4
diff --git a/gdb/gnulib/import/m4/multiarch.m4 b/gnulib/import/m4/multiarch.m4
similarity index 100%
rename from gdb/gnulib/import/m4/multiarch.m4
rename to gnulib/import/m4/multiarch.m4
diff --git a/gdb/gnulib/import/m4/netinet_in_h.m4 b/gnulib/import/m4/netinet_in_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/netinet_in_h.m4
rename to gnulib/import/m4/netinet_in_h.m4
diff --git a/gdb/gnulib/import/m4/nocrash.m4 b/gnulib/import/m4/nocrash.m4
similarity index 100%
rename from gdb/gnulib/import/m4/nocrash.m4
rename to gnulib/import/m4/nocrash.m4
diff --git a/gdb/gnulib/import/m4/off_t.m4 b/gnulib/import/m4/off_t.m4
similarity index 100%
rename from gdb/gnulib/import/m4/off_t.m4
rename to gnulib/import/m4/off_t.m4
diff --git a/gdb/gnulib/import/m4/onceonly.m4 b/gnulib/import/m4/onceonly.m4
similarity index 100%
rename from gdb/gnulib/import/m4/onceonly.m4
rename to gnulib/import/m4/onceonly.m4
diff --git a/gdb/gnulib/import/m4/open.m4 b/gnulib/import/m4/open.m4
similarity index 100%
rename from gdb/gnulib/import/m4/open.m4
rename to gnulib/import/m4/open.m4
diff --git a/gdb/gnulib/import/m4/openat.m4 b/gnulib/import/m4/openat.m4
similarity index 100%
rename from gdb/gnulib/import/m4/openat.m4
rename to gnulib/import/m4/openat.m4
diff --git a/gdb/gnulib/import/m4/opendir.m4 b/gnulib/import/m4/opendir.m4
similarity index 100%
rename from gdb/gnulib/import/m4/opendir.m4
rename to gnulib/import/m4/opendir.m4
diff --git a/gdb/gnulib/import/m4/pathmax.m4 b/gnulib/import/m4/pathmax.m4
similarity index 100%
rename from gdb/gnulib/import/m4/pathmax.m4
rename to gnulib/import/m4/pathmax.m4
diff --git a/gdb/gnulib/import/m4/rawmemchr.m4 b/gnulib/import/m4/rawmemchr.m4
similarity index 100%
rename from gdb/gnulib/import/m4/rawmemchr.m4
rename to gnulib/import/m4/rawmemchr.m4
diff --git a/gdb/gnulib/import/m4/readdir.m4 b/gnulib/import/m4/readdir.m4
similarity index 100%
rename from gdb/gnulib/import/m4/readdir.m4
rename to gnulib/import/m4/readdir.m4
diff --git a/gdb/gnulib/import/m4/readlink.m4 b/gnulib/import/m4/readlink.m4
similarity index 100%
rename from gdb/gnulib/import/m4/readlink.m4
rename to gnulib/import/m4/readlink.m4
diff --git a/gdb/gnulib/import/m4/realloc.m4 b/gnulib/import/m4/realloc.m4
similarity index 100%
rename from gdb/gnulib/import/m4/realloc.m4
rename to gnulib/import/m4/realloc.m4
diff --git a/gdb/gnulib/import/m4/rename.m4 b/gnulib/import/m4/rename.m4
similarity index 100%
rename from gdb/gnulib/import/m4/rename.m4
rename to gnulib/import/m4/rename.m4
diff --git a/gdb/gnulib/import/m4/rewinddir.m4 b/gnulib/import/m4/rewinddir.m4
similarity index 100%
rename from gdb/gnulib/import/m4/rewinddir.m4
rename to gnulib/import/m4/rewinddir.m4
diff --git a/gdb/gnulib/import/m4/rmdir.m4 b/gnulib/import/m4/rmdir.m4
similarity index 100%
rename from gdb/gnulib/import/m4/rmdir.m4
rename to gnulib/import/m4/rmdir.m4
diff --git a/gdb/gnulib/import/m4/save-cwd.m4 b/gnulib/import/m4/save-cwd.m4
similarity index 100%
rename from gdb/gnulib/import/m4/save-cwd.m4
rename to gnulib/import/m4/save-cwd.m4
diff --git a/gdb/gnulib/import/m4/secure_getenv.m4 b/gnulib/import/m4/secure_getenv.m4
similarity index 100%
rename from gdb/gnulib/import/m4/secure_getenv.m4
rename to gnulib/import/m4/secure_getenv.m4
diff --git a/gdb/gnulib/import/m4/setenv.m4 b/gnulib/import/m4/setenv.m4
similarity index 100%
rename from gdb/gnulib/import/m4/setenv.m4
rename to gnulib/import/m4/setenv.m4
diff --git a/gdb/gnulib/import/m4/signal_h.m4 b/gnulib/import/m4/signal_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/signal_h.m4
rename to gnulib/import/m4/signal_h.m4
diff --git a/gdb/gnulib/import/m4/socklen.m4 b/gnulib/import/m4/socklen.m4
similarity index 100%
rename from gdb/gnulib/import/m4/socklen.m4
rename to gnulib/import/m4/socklen.m4
diff --git a/gdb/gnulib/import/m4/sockpfaf.m4 b/gnulib/import/m4/sockpfaf.m4
similarity index 100%
rename from gdb/gnulib/import/m4/sockpfaf.m4
rename to gnulib/import/m4/sockpfaf.m4
diff --git a/gdb/gnulib/import/m4/ssize_t.m4 b/gnulib/import/m4/ssize_t.m4
similarity index 100%
rename from gdb/gnulib/import/m4/ssize_t.m4
rename to gnulib/import/m4/ssize_t.m4
diff --git a/gdb/gnulib/import/m4/stat.m4 b/gnulib/import/m4/stat.m4
similarity index 100%
rename from gdb/gnulib/import/m4/stat.m4
rename to gnulib/import/m4/stat.m4
diff --git a/gdb/gnulib/import/m4/stdalign.m4 b/gnulib/import/m4/stdalign.m4
similarity index 100%
rename from gdb/gnulib/import/m4/stdalign.m4
rename to gnulib/import/m4/stdalign.m4
diff --git a/gdb/gnulib/import/m4/stdbool.m4 b/gnulib/import/m4/stdbool.m4
similarity index 100%
rename from gdb/gnulib/import/m4/stdbool.m4
rename to gnulib/import/m4/stdbool.m4
diff --git a/gdb/gnulib/import/m4/stddef_h.m4 b/gnulib/import/m4/stddef_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/stddef_h.m4
rename to gnulib/import/m4/stddef_h.m4
diff --git a/gdb/gnulib/import/m4/stdint.m4 b/gnulib/import/m4/stdint.m4
similarity index 100%
rename from gdb/gnulib/import/m4/stdint.m4
rename to gnulib/import/m4/stdint.m4
diff --git a/gdb/gnulib/import/m4/stdio_h.m4 b/gnulib/import/m4/stdio_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/stdio_h.m4
rename to gnulib/import/m4/stdio_h.m4
diff --git a/gdb/gnulib/import/m4/stdlib_h.m4 b/gnulib/import/m4/stdlib_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/stdlib_h.m4
rename to gnulib/import/m4/stdlib_h.m4
diff --git a/gdb/gnulib/import/m4/strchrnul.m4 b/gnulib/import/m4/strchrnul.m4
similarity index 100%
rename from gdb/gnulib/import/m4/strchrnul.m4
rename to gnulib/import/m4/strchrnul.m4
diff --git a/gdb/gnulib/import/m4/strdup.m4 b/gnulib/import/m4/strdup.m4
similarity index 100%
rename from gdb/gnulib/import/m4/strdup.m4
rename to gnulib/import/m4/strdup.m4
diff --git a/gdb/gnulib/import/m4/strerror.m4 b/gnulib/import/m4/strerror.m4
similarity index 100%
rename from gdb/gnulib/import/m4/strerror.m4
rename to gnulib/import/m4/strerror.m4
diff --git a/gdb/gnulib/import/m4/string_h.m4 b/gnulib/import/m4/string_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/string_h.m4
rename to gnulib/import/m4/string_h.m4
diff --git a/gdb/gnulib/import/m4/strstr.m4 b/gnulib/import/m4/strstr.m4
similarity index 100%
rename from gdb/gnulib/import/m4/strstr.m4
rename to gnulib/import/m4/strstr.m4
diff --git a/gdb/gnulib/import/m4/strtok_r.m4 b/gnulib/import/m4/strtok_r.m4
similarity index 100%
rename from gdb/gnulib/import/m4/strtok_r.m4
rename to 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
similarity index 100%
rename from gdb/gnulib/import/m4/sys_socket_h.m4
rename to 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
similarity index 100%
rename from gdb/gnulib/import/m4/sys_stat_h.m4
rename to 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
similarity index 100%
rename from gdb/gnulib/import/m4/sys_time_h.m4
rename to 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
similarity index 100%
rename from gdb/gnulib/import/m4/sys_types_h.m4
rename to 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
similarity index 100%
rename from gdb/gnulib/import/m4/sys_uio_h.m4
rename to gnulib/import/m4/sys_uio_h.m4
diff --git a/gdb/gnulib/import/m4/tempname.m4 b/gnulib/import/m4/tempname.m4
similarity index 100%
rename from gdb/gnulib/import/m4/tempname.m4
rename to gnulib/import/m4/tempname.m4
diff --git a/gdb/gnulib/import/m4/time_h.m4 b/gnulib/import/m4/time_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/time_h.m4
rename to gnulib/import/m4/time_h.m4
diff --git a/gdb/gnulib/import/m4/unistd-safer.m4 b/gnulib/import/m4/unistd-safer.m4
similarity index 100%
rename from gdb/gnulib/import/m4/unistd-safer.m4
rename to gnulib/import/m4/unistd-safer.m4
diff --git a/gdb/gnulib/import/m4/unistd_h.m4 b/gnulib/import/m4/unistd_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/unistd_h.m4
rename to 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
similarity index 100%
rename from gdb/gnulib/import/m4/warn-on-use.m4
rename to gnulib/import/m4/warn-on-use.m4
diff --git a/gdb/gnulib/import/m4/wchar_h.m4 b/gnulib/import/m4/wchar_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/wchar_h.m4
rename to gnulib/import/m4/wchar_h.m4
diff --git a/gdb/gnulib/import/m4/wchar_t.m4 b/gnulib/import/m4/wchar_t.m4
similarity index 100%
rename from gdb/gnulib/import/m4/wchar_t.m4
rename to gnulib/import/m4/wchar_t.m4
diff --git a/gdb/gnulib/import/m4/wctype_h.m4 b/gnulib/import/m4/wctype_h.m4
similarity index 100%
rename from gdb/gnulib/import/m4/wctype_h.m4
rename to gnulib/import/m4/wctype_h.m4
diff --git a/gdb/gnulib/import/m4/wint_t.m4 b/gnulib/import/m4/wint_t.m4
similarity index 100%
rename from gdb/gnulib/import/m4/wint_t.m4
rename to gnulib/import/m4/wint_t.m4
diff --git a/gdb/gnulib/import/malloc.c b/gnulib/import/malloc.c
similarity index 100%
rename from gdb/gnulib/import/malloc.c
rename to gnulib/import/malloc.c
diff --git a/gdb/gnulib/import/malloca.c b/gnulib/import/malloca.c
similarity index 100%
rename from gdb/gnulib/import/malloca.c
rename to gnulib/import/malloca.c
diff --git a/gdb/gnulib/import/malloca.h b/gnulib/import/malloca.h
similarity index 100%
rename from gdb/gnulib/import/malloca.h
rename to gnulib/import/malloca.h
diff --git a/gdb/gnulib/import/malloca.valgrind b/gnulib/import/malloca.valgrind
similarity index 100%
rename from gdb/gnulib/import/malloca.valgrind
rename to gnulib/import/malloca.valgrind
diff --git a/gdb/gnulib/import/math.c b/gnulib/import/math.c
similarity index 100%
rename from gdb/gnulib/import/math.c
rename to gnulib/import/math.c
diff --git a/gdb/gnulib/import/math.in.h b/gnulib/import/math.in.h
similarity index 100%
rename from gdb/gnulib/import/math.in.h
rename to gnulib/import/math.in.h
diff --git a/gdb/gnulib/import/mbrtowc.c b/gnulib/import/mbrtowc.c
similarity index 100%
rename from gdb/gnulib/import/mbrtowc.c
rename to gnulib/import/mbrtowc.c
diff --git a/gdb/gnulib/import/mbsinit.c b/gnulib/import/mbsinit.c
similarity index 100%
rename from gdb/gnulib/import/mbsinit.c
rename to gnulib/import/mbsinit.c
diff --git a/gdb/gnulib/import/mbsrtowcs-impl.h b/gnulib/import/mbsrtowcs-impl.h
similarity index 100%
rename from gdb/gnulib/import/mbsrtowcs-impl.h
rename to gnulib/import/mbsrtowcs-impl.h
diff --git a/gdb/gnulib/import/mbsrtowcs-state.c b/gnulib/import/mbsrtowcs-state.c
similarity index 100%
rename from gdb/gnulib/import/mbsrtowcs-state.c
rename to gnulib/import/mbsrtowcs-state.c
diff --git a/gdb/gnulib/import/mbsrtowcs.c b/gnulib/import/mbsrtowcs.c
similarity index 100%
rename from gdb/gnulib/import/mbsrtowcs.c
rename to gnulib/import/mbsrtowcs.c
diff --git a/gdb/gnulib/import/memchr.c b/gnulib/import/memchr.c
similarity index 100%
rename from gdb/gnulib/import/memchr.c
rename to gnulib/import/memchr.c
diff --git a/gdb/gnulib/import/memchr.valgrind b/gnulib/import/memchr.valgrind
similarity index 100%
rename from gdb/gnulib/import/memchr.valgrind
rename to gnulib/import/memchr.valgrind
diff --git a/gdb/gnulib/import/memmem.c b/gnulib/import/memmem.c
similarity index 100%
rename from gdb/gnulib/import/memmem.c
rename to gnulib/import/memmem.c
diff --git a/gdb/gnulib/import/mempcpy.c b/gnulib/import/mempcpy.c
similarity index 100%
rename from gdb/gnulib/import/mempcpy.c
rename to gnulib/import/mempcpy.c
diff --git a/gdb/gnulib/import/memrchr.c b/gnulib/import/memrchr.c
similarity index 100%
rename from gdb/gnulib/import/memrchr.c
rename to gnulib/import/memrchr.c
diff --git a/gdb/gnulib/import/mkdir.c b/gnulib/import/mkdir.c
similarity index 100%
rename from gdb/gnulib/import/mkdir.c
rename to gnulib/import/mkdir.c
diff --git a/gdb/gnulib/import/mkdtemp.c b/gnulib/import/mkdtemp.c
similarity index 100%
rename from gdb/gnulib/import/mkdtemp.c
rename to gnulib/import/mkdtemp.c
diff --git a/gdb/gnulib/import/mkostemp.c b/gnulib/import/mkostemp.c
similarity index 100%
rename from gdb/gnulib/import/mkostemp.c
rename to gnulib/import/mkostemp.c
diff --git a/gdb/gnulib/import/msvc-inval.c b/gnulib/import/msvc-inval.c
similarity index 100%
rename from gdb/gnulib/import/msvc-inval.c
rename to gnulib/import/msvc-inval.c
diff --git a/gdb/gnulib/import/msvc-inval.h b/gnulib/import/msvc-inval.h
similarity index 100%
rename from gdb/gnulib/import/msvc-inval.h
rename to gnulib/import/msvc-inval.h
diff --git a/gdb/gnulib/import/msvc-nothrow.c b/gnulib/import/msvc-nothrow.c
similarity index 100%
rename from gdb/gnulib/import/msvc-nothrow.c
rename to gnulib/import/msvc-nothrow.c
diff --git a/gdb/gnulib/import/msvc-nothrow.h b/gnulib/import/msvc-nothrow.h
similarity index 100%
rename from gdb/gnulib/import/msvc-nothrow.h
rename to gnulib/import/msvc-nothrow.h
diff --git a/gdb/gnulib/import/netinet_in.in.h b/gnulib/import/netinet_in.in.h
similarity index 100%
rename from gdb/gnulib/import/netinet_in.in.h
rename to gnulib/import/netinet_in.in.h
diff --git a/gdb/gnulib/import/open.c b/gnulib/import/open.c
similarity index 100%
rename from gdb/gnulib/import/open.c
rename to gnulib/import/open.c
diff --git a/gdb/gnulib/import/openat-die.c b/gnulib/import/openat-die.c
similarity index 100%
rename from gdb/gnulib/import/openat-die.c
rename to gnulib/import/openat-die.c
diff --git a/gdb/gnulib/import/openat-priv.h b/gnulib/import/openat-priv.h
similarity index 100%
rename from gdb/gnulib/import/openat-priv.h
rename to gnulib/import/openat-priv.h
diff --git a/gdb/gnulib/import/openat-proc.c b/gnulib/import/openat-proc.c
similarity index 100%
rename from gdb/gnulib/import/openat-proc.c
rename to gnulib/import/openat-proc.c
diff --git a/gdb/gnulib/import/openat.c b/gnulib/import/openat.c
similarity index 100%
rename from gdb/gnulib/import/openat.c
rename to gnulib/import/openat.c
diff --git a/gdb/gnulib/import/openat.h b/gnulib/import/openat.h
similarity index 100%
rename from gdb/gnulib/import/openat.h
rename to gnulib/import/openat.h
diff --git a/gdb/gnulib/import/opendir.c b/gnulib/import/opendir.c
similarity index 100%
rename from gdb/gnulib/import/opendir.c
rename to gnulib/import/opendir.c
diff --git a/gdb/gnulib/import/pathmax.h b/gnulib/import/pathmax.h
similarity index 100%
rename from gdb/gnulib/import/pathmax.h
rename to gnulib/import/pathmax.h
diff --git a/gdb/gnulib/import/pipe-safer.c b/gnulib/import/pipe-safer.c
similarity index 100%
rename from gdb/gnulib/import/pipe-safer.c
rename to gnulib/import/pipe-safer.c
diff --git a/gdb/gnulib/import/rawmemchr.c b/gnulib/import/rawmemchr.c
similarity index 100%
rename from gdb/gnulib/import/rawmemchr.c
rename to gnulib/import/rawmemchr.c
diff --git a/gdb/gnulib/import/rawmemchr.valgrind b/gnulib/import/rawmemchr.valgrind
similarity index 100%
rename from gdb/gnulib/import/rawmemchr.valgrind
rename to gnulib/import/rawmemchr.valgrind
diff --git a/gdb/gnulib/import/readdir.c b/gnulib/import/readdir.c
similarity index 100%
rename from gdb/gnulib/import/readdir.c
rename to gnulib/import/readdir.c
diff --git a/gdb/gnulib/import/readlink.c b/gnulib/import/readlink.c
similarity index 100%
rename from gdb/gnulib/import/readlink.c
rename to gnulib/import/readlink.c
diff --git a/gdb/gnulib/import/realloc.c b/gnulib/import/realloc.c
similarity index 100%
rename from gdb/gnulib/import/realloc.c
rename to gnulib/import/realloc.c
diff --git a/gdb/gnulib/import/ref-add.sin b/gnulib/import/ref-add.sin
similarity index 100%
rename from gdb/gnulib/import/ref-add.sin
rename to gnulib/import/ref-add.sin
diff --git a/gdb/gnulib/import/ref-del.sin b/gnulib/import/ref-del.sin
similarity index 100%
rename from gdb/gnulib/import/ref-del.sin
rename to gnulib/import/ref-del.sin
diff --git a/gdb/gnulib/import/rename.c b/gnulib/import/rename.c
similarity index 100%
rename from gdb/gnulib/import/rename.c
rename to gnulib/import/rename.c
diff --git a/gdb/gnulib/import/rewinddir.c b/gnulib/import/rewinddir.c
similarity index 100%
rename from gdb/gnulib/import/rewinddir.c
rename to gnulib/import/rewinddir.c
diff --git a/gdb/gnulib/import/rmdir.c b/gnulib/import/rmdir.c
similarity index 100%
rename from gdb/gnulib/import/rmdir.c
rename to gnulib/import/rmdir.c
diff --git a/gdb/gnulib/import/same-inode.h b/gnulib/import/same-inode.h
similarity index 100%
rename from gdb/gnulib/import/same-inode.h
rename to gnulib/import/same-inode.h
diff --git a/gdb/gnulib/import/save-cwd.c b/gnulib/import/save-cwd.c
similarity index 100%
rename from gdb/gnulib/import/save-cwd.c
rename to gnulib/import/save-cwd.c
diff --git a/gdb/gnulib/import/save-cwd.h b/gnulib/import/save-cwd.h
similarity index 100%
rename from gdb/gnulib/import/save-cwd.h
rename to gnulib/import/save-cwd.h
diff --git a/gdb/gnulib/import/secure_getenv.c b/gnulib/import/secure_getenv.c
similarity index 100%
rename from gdb/gnulib/import/secure_getenv.c
rename to gnulib/import/secure_getenv.c
diff --git a/gdb/gnulib/import/setenv.c b/gnulib/import/setenv.c
similarity index 100%
rename from gdb/gnulib/import/setenv.c
rename to gnulib/import/setenv.c
diff --git a/gdb/gnulib/import/signal.in.h b/gnulib/import/signal.in.h
similarity index 100%
rename from gdb/gnulib/import/signal.in.h
rename to gnulib/import/signal.in.h
diff --git a/gdb/gnulib/import/stat.c b/gnulib/import/stat.c
similarity index 100%
rename from gdb/gnulib/import/stat.c
rename to gnulib/import/stat.c
diff --git a/gdb/gnulib/import/stdalign.in.h b/gnulib/import/stdalign.in.h
similarity index 100%
rename from gdb/gnulib/import/stdalign.in.h
rename to gnulib/import/stdalign.in.h
diff --git a/gdb/gnulib/import/stdbool.in.h b/gnulib/import/stdbool.in.h
similarity index 100%
rename from gdb/gnulib/import/stdbool.in.h
rename to gnulib/import/stdbool.in.h
diff --git a/gdb/gnulib/import/stddef.in.h b/gnulib/import/stddef.in.h
similarity index 100%
rename from gdb/gnulib/import/stddef.in.h
rename to gnulib/import/stddef.in.h
diff --git a/gdb/gnulib/import/stdint.in.h b/gnulib/import/stdint.in.h
similarity index 100%
rename from gdb/gnulib/import/stdint.in.h
rename to gnulib/import/stdint.in.h
diff --git a/gdb/gnulib/import/stdio.in.h b/gnulib/import/stdio.in.h
similarity index 100%
rename from gdb/gnulib/import/stdio.in.h
rename to gnulib/import/stdio.in.h
diff --git a/gdb/gnulib/import/stdlib.in.h b/gnulib/import/stdlib.in.h
similarity index 100%
rename from gdb/gnulib/import/stdlib.in.h
rename to gnulib/import/stdlib.in.h
diff --git a/gdb/gnulib/import/str-two-way.h b/gnulib/import/str-two-way.h
similarity index 100%
rename from gdb/gnulib/import/str-two-way.h
rename to gnulib/import/str-two-way.h
diff --git a/gdb/gnulib/import/strchrnul.c b/gnulib/import/strchrnul.c
similarity index 100%
rename from gdb/gnulib/import/strchrnul.c
rename to gnulib/import/strchrnul.c
diff --git a/gdb/gnulib/import/strchrnul.valgrind b/gnulib/import/strchrnul.valgrind
similarity index 100%
rename from gdb/gnulib/import/strchrnul.valgrind
rename to gnulib/import/strchrnul.valgrind
diff --git a/gdb/gnulib/import/strdup.c b/gnulib/import/strdup.c
similarity index 100%
rename from gdb/gnulib/import/strdup.c
rename to gnulib/import/strdup.c
diff --git a/gdb/gnulib/import/streq.h b/gnulib/import/streq.h
similarity index 100%
rename from gdb/gnulib/import/streq.h
rename to gnulib/import/streq.h
diff --git a/gdb/gnulib/import/strerror-override.c b/gnulib/import/strerror-override.c
similarity index 100%
rename from gdb/gnulib/import/strerror-override.c
rename to gnulib/import/strerror-override.c
diff --git a/gdb/gnulib/import/strerror-override.h b/gnulib/import/strerror-override.h
similarity index 100%
rename from gdb/gnulib/import/strerror-override.h
rename to gnulib/import/strerror-override.h
diff --git a/gdb/gnulib/import/strerror.c b/gnulib/import/strerror.c
similarity index 100%
rename from gdb/gnulib/import/strerror.c
rename to gnulib/import/strerror.c
diff --git a/gdb/gnulib/import/string.in.h b/gnulib/import/string.in.h
similarity index 100%
rename from gdb/gnulib/import/string.in.h
rename to gnulib/import/string.in.h
diff --git a/gdb/gnulib/import/stripslash.c b/gnulib/import/stripslash.c
similarity index 100%
rename from gdb/gnulib/import/stripslash.c
rename to gnulib/import/stripslash.c
diff --git a/gdb/gnulib/import/strnlen1.c b/gnulib/import/strnlen1.c
similarity index 100%
rename from gdb/gnulib/import/strnlen1.c
rename to gnulib/import/strnlen1.c
diff --git a/gdb/gnulib/import/strnlen1.h b/gnulib/import/strnlen1.h
similarity index 100%
rename from gdb/gnulib/import/strnlen1.h
rename to gnulib/import/strnlen1.h
diff --git a/gdb/gnulib/import/strstr.c b/gnulib/import/strstr.c
similarity index 100%
rename from gdb/gnulib/import/strstr.c
rename to gnulib/import/strstr.c
diff --git a/gdb/gnulib/import/strtok_r.c b/gnulib/import/strtok_r.c
similarity index 100%
rename from gdb/gnulib/import/strtok_r.c
rename to gnulib/import/strtok_r.c
diff --git a/gdb/gnulib/import/sys_socket.c b/gnulib/import/sys_socket.c
similarity index 100%
rename from gdb/gnulib/import/sys_socket.c
rename to gnulib/import/sys_socket.c
diff --git a/gdb/gnulib/import/sys_socket.in.h b/gnulib/import/sys_socket.in.h
similarity index 100%
rename from gdb/gnulib/import/sys_socket.in.h
rename to gnulib/import/sys_socket.in.h
diff --git a/gdb/gnulib/import/sys_stat.in.h b/gnulib/import/sys_stat.in.h
similarity index 100%
rename from gdb/gnulib/import/sys_stat.in.h
rename to gnulib/import/sys_stat.in.h
diff --git a/gdb/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h
similarity index 100%
rename from gdb/gnulib/import/sys_time.in.h
rename to gnulib/import/sys_time.in.h
diff --git a/gdb/gnulib/import/sys_types.in.h b/gnulib/import/sys_types.in.h
similarity index 100%
rename from gdb/gnulib/import/sys_types.in.h
rename to gnulib/import/sys_types.in.h
diff --git a/gdb/gnulib/import/sys_uio.in.h b/gnulib/import/sys_uio.in.h
similarity index 100%
rename from gdb/gnulib/import/sys_uio.in.h
rename to gnulib/import/sys_uio.in.h
diff --git a/gdb/gnulib/import/tempname.c b/gnulib/import/tempname.c
similarity index 100%
rename from gdb/gnulib/import/tempname.c
rename to gnulib/import/tempname.c
diff --git a/gdb/gnulib/import/tempname.h b/gnulib/import/tempname.h
similarity index 100%
rename from gdb/gnulib/import/tempname.h
rename to gnulib/import/tempname.h
diff --git a/gdb/gnulib/import/time.in.h b/gnulib/import/time.in.h
similarity index 100%
rename from gdb/gnulib/import/time.in.h
rename to gnulib/import/time.in.h
diff --git a/gdb/gnulib/import/unistd--.h b/gnulib/import/unistd--.h
similarity index 100%
rename from gdb/gnulib/import/unistd--.h
rename to gnulib/import/unistd--.h
diff --git a/gdb/gnulib/import/unistd-safer.h b/gnulib/import/unistd-safer.h
similarity index 100%
rename from gdb/gnulib/import/unistd-safer.h
rename to gnulib/import/unistd-safer.h
diff --git a/gdb/gnulib/import/unistd.c b/gnulib/import/unistd.c
similarity index 100%
rename from gdb/gnulib/import/unistd.c
rename to gnulib/import/unistd.c
diff --git a/gdb/gnulib/import/unistd.in.h b/gnulib/import/unistd.in.h
similarity index 100%
rename from gdb/gnulib/import/unistd.in.h
rename to gnulib/import/unistd.in.h
diff --git a/gdb/gnulib/import/unsetenv.c b/gnulib/import/unsetenv.c
similarity index 100%
rename from gdb/gnulib/import/unsetenv.c
rename to gnulib/import/unsetenv.c
diff --git a/gdb/gnulib/import/verify.h b/gnulib/import/verify.h
similarity index 100%
rename from gdb/gnulib/import/verify.h
rename to gnulib/import/verify.h
diff --git a/gdb/gnulib/import/wchar.in.h b/gnulib/import/wchar.in.h
similarity index 100%
rename from gdb/gnulib/import/wchar.in.h
rename to gnulib/import/wchar.in.h
diff --git a/gdb/gnulib/import/wctype-h.c b/gnulib/import/wctype-h.c
similarity index 100%
rename from gdb/gnulib/import/wctype-h.c
rename to gnulib/import/wctype-h.c
diff --git a/gdb/gnulib/import/wctype.in.h b/gnulib/import/wctype.in.h
similarity index 100%
rename from gdb/gnulib/import/wctype.in.h
rename to 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
similarity index 100%
rename from gdb/gnulib/patches/0001-Fix-PR-gdb-23558-Use-system-s-getcwd-when-cross-comp.patch
rename to 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
similarity index 100%
rename from gdb/gnulib/patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch
rename to 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
similarity index 99%
rename from gdb/gnulib/update-gnulib.sh
rename to 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