2012-04-19 Pedro Alves <palves@redhat.com>

	gdb/
	* gnulib/: Move whole directory ...
	* gnulib/import/: ... here, and re-rerun gnulib-tool to adjust.
	* Makefile.in (LIBGNU, INCGNU, GNULIB_H, CLEANDIRS)
	(REQUIRED_SUBDIRS, all-lib, gnulib/Makefile, ACLOCAL_AMFLAGS)
	(aclocal_m4_deps): Adjust.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
	* configure.ac: Adjust AC_OUTPUT output.

	gdbserver/
	* Makefile.in (LIBGNU, INCGNU): Adjust.
	(GNULIB_FLAGS_TO_PASS, GNULIB_H): Adjust.
	(all, install-only, uninstall, clean-info, all-lib, clean)
	(maintainer-clean, Makefile, gnulib/Makefile): Adjust.
	* configure.ac: Adjust AC_OUTPUT output.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

45 files changed, 165 insertions, 144 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aa53ada..8888fb5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2012-04-19  Pedro Alves  <palves@redhat.com>
+
+	* gnulib/: Move whole directory ...
+	* gnulib/import/: ... here, and re-rerun gnulib-tool to adjust.
+	* Makefile.in (LIBGNU, INCGNU, GNULIB_H, CLEANDIRS)
+	(REQUIRED_SUBDIRS, all-lib, gnulib/Makefile, ACLOCAL_AMFLAGS)
+	(aclocal_m4_deps): Adjust.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+	* configure.ac: Adjust AC_OUTPUT output.
+
 2012-04-19  Yao Qi  <yao@codesourcery.com>
 
 	* Makefile.in (SFILES): Add common/vec.c and remove vec.c.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 19e46a1..ed3e9f5 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -170,12 +170,12 @@ INTL_CFLAGS = @INCINTL@
 GDB_DATADIR = @GDB_DATADIR@
 
 # Helper code from gnulib.
-LIBGNU = gnulib/libgnu.a
-INCGNU = -I$(srcdir)/gnulib -Ignulib
+LIBGNU = gnulib/import/libgnu.a
+INCGNU = -I$(srcdir)/gnulib/import -Ignulib/import
 
 # Generated headers in the gnulib directory.  These must be listed
 # so that they are generated before other files are compiled.
-GNULIB_H = gnulib/string.h @GNULIB_STDINT_H@
+GNULIB_H = gnulib/import/string.h @GNULIB_STDINT_H@
 
 #
 # CLI sub directory definitons
@@ -916,13 +916,13 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 TSOBS = inflow.o
 
 SUBDIRS = doc @subdirs@ data-directory
-CLEANDIRS = $(SUBDIRS) gnulib 
+CLEANDIRS = $(SUBDIRS) gnulib/import
 
 # 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 | data-directory
+REQUIRED_SUBDIRS = doc | testsuite | gnulib/import | data-directory
 
 # For now, shortcut the "configure GDB for fewer languages" stuff.
 YYFILES = c-exp.c \
@@ -1162,8 +1162,8 @@ gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
 
 # Convenience rule to handle recursion.
 $(LIBGNU) $(GNULIB_H): all-lib
-all-lib: gnulib/Makefile
-	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=gnulib subdir_do
+all-lib: gnulib/import/Makefile
+	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=gnulib/import subdir_do
 .PHONY: all-lib
 
 # Convenience rule to handle recursion.
@@ -1273,8 +1273,8 @@ Makefile: Makefile.in config.status @frags@
 	  CONFIG_HEADERS= \
 	  $(SHELL) config.status
 
-gnulib/Makefile: gnulib/Makefile.in config.status @frags@
-	CONFIG_FILES="gnulib/Makefile" \
+gnulib/import/Makefile: gnulib/import/Makefile.in config.status @frags@
+	CONFIG_FILES="gnulib/import/Makefile" \
 	  CONFIG_COMMANDS="depfiles" \
 	  CONFIG_HEADERS= \
 	  CONFIG_LINKS= \
@@ -1302,31 +1302,31 @@ config.status: $(srcdir)/configure configure.tgt configure.host
 	$(SHELL) config.status --recheck
 
 ACLOCAL = aclocal
-ACLOCAL_AMFLAGS = -I gnulib/m4 -I ../config
+ACLOCAL_AMFLAGS = -I gnulib/import/m4 -I ../config
 aclocal_m4_deps = \
 	configure.ac \
-	gnulib/m4/00gnulib.m4 \
-	gnulib/m4/extensions.m4 \
-	gnulib/m4/gnulib-cache.m4 \
-	gnulib/m4/gnulib-common.m4 \
-	gnulib/m4/gnulib-comp.m4 \
-	gnulib/m4/gnulib-tool.m4 \
-	gnulib/m4/include_next.m4 \
-	gnulib/m4/inttypes.m4 \
-	gnulib/m4/inttypes-pri.m4 \
-	gnulib/m4/longlong.m4 \
-	gnulib/m4/memchr.m4 \
-	gnulib/m4/memmem.m4 \
-	gnulib/m4/mmap-anon.m4 \
-	gnulib/m4/multiarch.m4 \
-	gnulib/m4/onceonly.m4 \
-	gnulib/m4/stddef_h.m4 \
-	gnulib/m4/stdint.m4 \
-	gnulib/m4/string_h.m4 \
-	gnulib/m4/warn-on-use.m4 \
-	gnulib/m4/wchar_h.m4 \
-	gnulib/m4/wchar_t.m4 \
-	gnulib/m4/wint_t.m4 \
+	gnulib/import/m4/00gnulib.m4 \
+	gnulib/import/m4/extensions.m4 \
+	gnulib/import/m4/gnulib-cache.m4 \
+	gnulib/import/m4/gnulib-common.m4 \
+	gnulib/import/m4/gnulib-comp.m4 \
+	gnulib/import/m4/gnulib-tool.m4 \
+	gnulib/import/m4/include_next.m4 \
+	gnulib/import/m4/inttypes.m4 \
+	gnulib/import/m4/inttypes-pri.m4 \
+	gnulib/import/m4/longlong.m4 \
+	gnulib/import/m4/memchr.m4 \
+	gnulib/import/m4/memmem.m4 \
+	gnulib/import/m4/mmap-anon.m4 \
+	gnulib/import/m4/multiarch.m4 \
+	gnulib/import/m4/onceonly.m4 \
+	gnulib/import/m4/stddef_h.m4 \
+	gnulib/import/m4/stdint.m4 \
+	gnulib/import/m4/string_h.m4 \
+	gnulib/import/m4/warn-on-use.m4 \
+	gnulib/import/m4/wchar_h.m4 \
+	gnulib/import/m4/wchar_t.m4 \
+	gnulib/import/m4/wint_t.m4 \
 	../config/extensions.m4 \
 	../config/lead-dot.m4 \
 	../config/proginstall.m4 \
diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
index 64b160d..627245c 100644
--- a/gdb/aclocal.m4
+++ b/gdb/aclocal.m4
@@ -971,22 +971,22 @@ AC_SUBST([am__untar])
 m4_include([../config/largefile.m4])
 m4_include([../config/lead-dot.m4])
 m4_include([../config/plugins.m4])
-m4_include([gnulib/m4/00gnulib.m4])
-m4_include([gnulib/m4/extensions.m4])
-m4_include([gnulib/m4/gnulib-common.m4])
-m4_include([gnulib/m4/gnulib-comp.m4])
-m4_include([gnulib/m4/include_next.m4])
-m4_include([gnulib/m4/inttypes-pri.m4])
-m4_include([gnulib/m4/inttypes.m4])
-m4_include([gnulib/m4/longlong.m4])
-m4_include([gnulib/m4/memchr.m4])
-m4_include([gnulib/m4/memmem.m4])
-m4_include([gnulib/m4/mmap-anon.m4])
-m4_include([gnulib/m4/multiarch.m4])
-m4_include([gnulib/m4/onceonly.m4])
-m4_include([gnulib/m4/stddef_h.m4])
-m4_include([gnulib/m4/stdint.m4])
-m4_include([gnulib/m4/string_h.m4])
-m4_include([gnulib/m4/warn-on-use.m4])
-m4_include([gnulib/m4/wchar_t.m4])
+m4_include([gnulib/import/m4/00gnulib.m4])
+m4_include([gnulib/import/m4/extensions.m4])
+m4_include([gnulib/import/m4/gnulib-common.m4])
+m4_include([gnulib/import/m4/gnulib-comp.m4])
+m4_include([gnulib/import/m4/include_next.m4])
+m4_include([gnulib/import/m4/inttypes-pri.m4])
+m4_include([gnulib/import/m4/inttypes.m4])
+m4_include([gnulib/import/m4/longlong.m4])
+m4_include([gnulib/import/m4/memchr.m4])
+m4_include([gnulib/import/m4/memmem.m4])
+m4_include([gnulib/import/m4/mmap-anon.m4])
+m4_include([gnulib/import/m4/multiarch.m4])
+m4_include([gnulib/import/m4/onceonly.m4])
+m4_include([gnulib/import/m4/stddef_h.m4])
+m4_include([gnulib/import/m4/stdint.m4])
+m4_include([gnulib/import/m4/string_h.m4])
+m4_include([gnulib/import/m4/warn-on-use.m4])
+m4_include([gnulib/import/m4/wchar_t.m4])
 m4_include([acinclude.m4])
diff --git a/gdb/configure b/gdb/configure
index 75b62bd..17c410e 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -6988,7 +6988,7 @@ fi
   gl_cond_libtool=false
   gl_libdeps=
   gl_ltlibdeps=
-  gl_m4_base='gnulib/m4'
+  gl_m4_base='gnulib/import/m4'
 
 
 
@@ -6998,7 +6998,7 @@ fi
 
 
 
-  gl_source_base='gnulib'
+  gl_source_base='gnulib/import'
 
 
 
@@ -16833,7 +16833,7 @@ ac_config_links="$ac_config_links $ac_config_links_1"
 $as_echo "#define GDB_DEFAULT_HOST_CHARSET \"UTF-8\"" >>confdefs.h
 
 
-ac_config_files="$ac_config_files Makefile gdb-gdb.gdb doc/Makefile gnulib/Makefile data-directory/Makefile"
+ac_config_files="$ac_config_files Makefile gdb-gdb.gdb doc/Makefile gnulib/import/Makefile data-directory/Makefile"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -17609,7 +17609,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "gdb-gdb.gdb") CONFIG_FILES="$CONFIG_FILES gdb-gdb.gdb" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "gnulib/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/Makefile" ;;
+    "gnulib/import/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/import/Makefile" ;;
     "data-directory/Makefile") CONFIG_FILES="$CONFIG_FILES data-directory/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 03cd666..2fa2519 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2242,7 +2242,7 @@ dnl  At the moment, we just assume it's UTF-8.
 AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8",
           [Define to be a string naming the default host character set.])
 
-AC_OUTPUT(Makefile gdb-gdb.gdb doc/Makefile gnulib/Makefile data-directory/Makefile,
+AC_OUTPUT(Makefile gdb-gdb.gdb doc/Makefile gnulib/import/Makefile data-directory/Makefile,
 [
 case x$CONFIG_HEADERS in
 xconfig.h:config.in)
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a7aa722..90db8e6 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,15 @@
 2012-04-19  Pedro Alves  <palves@redhat.com>
 
+	* Makefile.in (LIBGNU, INCGNU): Adjust.
+	(GNULIB_FLAGS_TO_PASS, GNULIB_H): Adjust.
+	(all, install-only, uninstall, clean-info, all-lib, clean)
+	(maintainer-clean, Makefile, gnulib/Makefile): Adjust.
+	* configure.ac: Adjust AC_OUTPUT output.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2012-04-19  Pedro Alves  <palves@redhat.com>
+
 	* Makefile.in (generated_files): New.
 	(server_h): Remove the explicit dependency on config.h, and depend
 	on $generated_files.
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 4f0ba19..cbeccef 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -76,20 +76,20 @@ ustlibs = @ustlibs@
 ustinc = @ustinc@
 
 # gnulib
-LIBGNU = gnulib/libgnu.a
-INCGNU = -I$(srcdir)/../gnulib -Ignulib
+LIBGNU = gnulib/import/libgnu.a
+INCGNU = -I$(srcdir)/../gnulib/import -Ignulib/import
 
 # We build gnulib directly under the gdbserver build directory, but
 # its sources don't live directly under gdbserver's source directory.
 # Tweak $srcdir and VPATH to make that work.
 GNULIB_FLAGS_TO_PASS = \
 	"top_srcdir=$(abs_top_srcdir)/.." \
-	"srcdir=$(abs_srcdir)/../gnulib" \
-	"VPATH=$(abs_top_srcdir)/../gnulib:$(abs_top_srcdir)"
+	"srcdir=$(abs_srcdir)/../gnulib/import" \
+	"VPATH=$(abs_top_srcdir)/../gnulib/import:$(abs_top_srcdir)"
 
 # Generated headers in the gnulib directory.  These must be listed
 # so that they are generated before other files are compiled.
-GNULIB_H = gnulib/string.h @GNULIB_STDINT_H@
+GNULIB_H = gnulib/import/string.h @GNULIB_STDINT_H@
 
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
@@ -216,7 +216,7 @@ generated_files = config.h $(GNULIB_H)
 	${CC} -c ${INTERNAL_CFLAGS} $<
 
 all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries)
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
 
 # Traditionally "install" depends on "all".  But it may be useful
 # not to; for example, if the user has made some trivial change to a
@@ -237,13 +237,13 @@ install-only:
 	$(INSTALL_PROGRAM) gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT); \
 	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(man1dir); \
 	$(INSTALL_DATA) $(srcdir)/gdbserver.1 $(DESTDIR)$(man1dir)/$$n.1
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) install
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) install
 
 uninstall: force
 	n=`echo gdbserver | sed '$(program_transform_name)'`; \
 	if [ x$$n = x ]; then n=gdbserver; else true; fi; \
 	rm -f $(DESTDIR)/$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(man1dir)/$$n.1
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) uninstall
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) uninstall
 
 installcheck:
 check:
@@ -253,7 +253,7 @@ install-pdf:
 html:
 install-html:
 clean-info: force
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
 
 gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU)
 	rm -f gdbserver$(EXEEXT)
@@ -261,8 +261,8 @@ gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU)
 	$(LIBGNU) $(GDBSERVER_LIBS) $(XM_CLIBS)
 
 $(LIBGNU) $(GNULIB_H): all-lib
-all-lib: gnulib/Makefile
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
+all-lib: gnulib/import/Makefile
+	@cd gnulib/import/; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
 
 .PHONY: all-lib
 
@@ -320,11 +320,11 @@ clean:
 	rm -f i386-mmx.c i386-mmx-linux.c
 	rm -f x32.c x32-linux.c
 	rm -f x32-avx.c x32-avx-linux.c
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) clean
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) clean
 
 maintainer-clean realclean distclean: clean
 	rm -f nm.h tm.h xm.h config.h stamp-h config.log
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
 	rm -f Makefile config.status
 
 config.h: stamp-h ; @true
@@ -334,11 +334,11 @@ stamp-h: config.in config.status
 Makefile: Makefile.in config.status
 	CONFIG_HEADERS="" $(SHELL) ./config.status
 
-gnulib/Makefile: $(srcdir)/../gnulib/Makefile.in config.status
+gnulib/import/Makefile: $(srcdir)/../gnulib/import/Makefile.in config.status
 	  CONFIG_COMMANDS="depfiles" \
 	  CONFIG_HEADERS= \
 	  CONFIG_LINKS= \
-	  $(SHELL) config.status "gnulib/Makefile"
+	  $(SHELL) config.status "gnulib/import/Makefile"
 
 config.status: configure configure.srv
 	$(SHELL) ./config.status --recheck
diff --git a/gdb/gdbserver/aclocal.m4 b/gdb/gdbserver/aclocal.m4
index d23f9db..7ecd5ba 100644
--- a/gdb/gdbserver/aclocal.m4
+++ b/gdb/gdbserver/aclocal.m4
@@ -989,22 +989,22 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([../gnulib/m4/00gnulib.m4])
-m4_include([../gnulib/m4/extensions.m4])
-m4_include([../gnulib/m4/gnulib-common.m4])
-m4_include([../gnulib/m4/gnulib-comp.m4])
-m4_include([../gnulib/m4/include_next.m4])
-m4_include([../gnulib/m4/inttypes-pri.m4])
-m4_include([../gnulib/m4/inttypes.m4])
-m4_include([../gnulib/m4/longlong.m4])
-m4_include([../gnulib/m4/memchr.m4])
-m4_include([../gnulib/m4/memmem.m4])
-m4_include([../gnulib/m4/mmap-anon.m4])
-m4_include([../gnulib/m4/multiarch.m4])
-m4_include([../gnulib/m4/onceonly.m4])
-m4_include([../gnulib/m4/stddef_h.m4])
-m4_include([../gnulib/m4/stdint.m4])
-m4_include([../gnulib/m4/string_h.m4])
-m4_include([../gnulib/m4/warn-on-use.m4])
-m4_include([../gnulib/m4/wchar_t.m4])
+m4_include([../gnulib/import/m4/00gnulib.m4])
+m4_include([../gnulib/import/m4/extensions.m4])
+m4_include([../gnulib/import/m4/gnulib-common.m4])
+m4_include([../gnulib/import/m4/gnulib-comp.m4])
+m4_include([../gnulib/import/m4/include_next.m4])
+m4_include([../gnulib/import/m4/inttypes-pri.m4])
+m4_include([../gnulib/import/m4/inttypes.m4])
+m4_include([../gnulib/import/m4/longlong.m4])
+m4_include([../gnulib/import/m4/memchr.m4])
+m4_include([../gnulib/import/m4/memmem.m4])
+m4_include([../gnulib/import/m4/mmap-anon.m4])
+m4_include([../gnulib/import/m4/multiarch.m4])
+m4_include([../gnulib/import/m4/onceonly.m4])
+m4_include([../gnulib/import/m4/stddef_h.m4])
+m4_include([../gnulib/import/m4/stdint.m4])
+m4_include([../gnulib/import/m4/string_h.m4])
+m4_include([../gnulib/import/m4/warn-on-use.m4])
+m4_include([../gnulib/import/m4/wchar_t.m4])
 m4_include([acinclude.m4])
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index cdd54f1..ff43ef9 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -7848,7 +7848,7 @@ fi
   gl_cond_libtool=false
   gl_libdeps=
   gl_ltlibdeps=
-  gl_m4_base='gnulib/m4'
+  gl_m4_base='gnulib/import/m4'
 
 
 
@@ -7858,7 +7858,7 @@ fi
 
 
 
-  gl_source_base='gnulib'
+  gl_source_base='gnulib/import'
 
 
 
@@ -9125,7 +9125,7 @@ if test x"$STDINT_H" != x; then
 fi
 
 
-ac_config_files="$ac_config_files Makefile gnulib/Makefile:${srcdir}/../gnulib/Makefile.in"
+ac_config_files="$ac_config_files Makefile gnulib/import/Makefile:${srcdir}/../gnulib/import/Makefile.in"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -9886,7 +9886,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "gnulib/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/Makefile:${srcdir}/../gnulib/Makefile.in" ;;
+    "gnulib/import/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/import/Makefile:${srcdir}/../gnulib/import/Makefile.in" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index 96a5f2d..ebbe571 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -450,7 +450,7 @@ if test x"$STDINT_H" != x; then
 fi
 AC_SUBST(GNULIB_STDINT_H)
 
-AC_OUTPUT(Makefile gnulib/Makefile:${srcdir}/../gnulib/Makefile.in,
+AC_OUTPUT(Makefile gnulib/import/Makefile:${srcdir}/../gnulib/import/Makefile.in,
 [case x$CONFIG_HEADERS in
 xconfig.h:config.in)
 echo > stamp-h ;;
diff --git a/gdb/gnulib/Makefile.am b/gdb/gnulib/import/Makefile.am
index f323921..c50c582 100644
--- a/gdb/gnulib/Makefile.am
+++ b/gdb/gnulib/import/Makefile.am
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/import --m4-base=gnulib/import/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
@@ -122,17 +122,17 @@ BUILT_SOURCES += arg-nonnull.h
 # The arg-nonnull.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
 # off.
-arg-nonnull.h: $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h
+arg-nonnull.h: $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h \
+	  < $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h \
 	  > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
 
 ARG_NONNULL_H=arg-nonnull.h
 
-EXTRA_DIST += $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h
+EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
 
 ## end   gnulib module snippet/arg-nonnull
 
@@ -146,17 +146,17 @@ EXTRA_DIST += $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h
 BUILT_SOURCES += c++defs.h
 # The c++defs.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/gnulib/extra/snippet/c++defs.h
+c++defs.h: $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/c++defs.h \
+	  < $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h \
 	  > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += c++defs.h c++defs.h-t
 
 CXXDEFS_H=c++defs.h
 
-EXTRA_DIST += $(top_srcdir)/gnulib/extra/snippet/c++defs.h
+EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h
 
 ## end   gnulib module snippet/c++defs
 
@@ -166,17 +166,17 @@ BUILT_SOURCES += warn-on-use.h
 # The warn-on-use.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
 # off.
-warn-on-use.h: $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h
+warn-on-use.h: $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h \
+	  < $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h \
 	  > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
 
 WARN_ON_USE_H=warn-on-use.h
 
-EXTRA_DIST += $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h
+EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h
 
 ## end   gnulib module snippet/warn-on-use
 
@@ -363,7 +363,7 @@ EXTRA_DIST += string.in.h
 ## begin gnulib module update-copyright
 
 
-EXTRA_DIST += $(top_srcdir)/gnulib/extra/update-copyright
+EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/update-copyright
 
 ## end   gnulib module update-copyright
 
diff --git a/gdb/gnulib/Makefile.in b/gdb/gnulib/import/Makefile.in
index 49972e1..206725d 100644
--- a/gdb/gnulib/Makefile.in
+++ b/gdb/gnulib/import/Makefile.in
@@ -36,7 +36,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/import --m4-base=gnulib/import/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
 
 
 
@@ -60,32 +60,32 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = gnulib
+subdir = gnulib/import
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/largefile.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/plugins.m4 \
-	$(top_srcdir)/gnulib/m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib/m4/extensions.m4 \
-	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
-	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
-	$(top_srcdir)/gnulib/m4/include_next.m4 \
-	$(top_srcdir)/gnulib/m4/inttypes-pri.m4 \
-	$(top_srcdir)/gnulib/m4/inttypes.m4 \
-	$(top_srcdir)/gnulib/m4/longlong.m4 \
-	$(top_srcdir)/gnulib/m4/memchr.m4 \
-	$(top_srcdir)/gnulib/m4/memmem.m4 \
-	$(top_srcdir)/gnulib/m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib/m4/multiarch.m4 \
-	$(top_srcdir)/gnulib/m4/onceonly.m4 \
-	$(top_srcdir)/gnulib/m4/stddef_h.m4 \
-	$(top_srcdir)/gnulib/m4/stdint.m4 \
-	$(top_srcdir)/gnulib/m4/string_h.m4 \
-	$(top_srcdir)/gnulib/m4/warn-on-use.m4 \
-	$(top_srcdir)/gnulib/m4/wchar_t.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/../bfd/bfd.m4 \
+	$(top_srcdir)/gnulib/import/m4/00gnulib.m4 \
+	$(top_srcdir)/gnulib/import/m4/extensions.m4 \
+	$(top_srcdir)/gnulib/import/m4/gnulib-common.m4 \
+	$(top_srcdir)/gnulib/import/m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib/import/m4/include_next.m4 \
+	$(top_srcdir)/gnulib/import/m4/inttypes-pri.m4 \
+	$(top_srcdir)/gnulib/import/m4/inttypes.m4 \
+	$(top_srcdir)/gnulib/import/m4/longlong.m4 \
+	$(top_srcdir)/gnulib/import/m4/memchr.m4 \
+	$(top_srcdir)/gnulib/import/m4/memmem.m4 \
+	$(top_srcdir)/gnulib/import/m4/mmap-anon.m4 \
+	$(top_srcdir)/gnulib/import/m4/multiarch.m4 \
+	$(top_srcdir)/gnulib/import/m4/onceonly.m4 \
+	$(top_srcdir)/gnulib/import/m4/stddef_h.m4 \
+	$(top_srcdir)/gnulib/import/m4/stdint.m4 \
+	$(top_srcdir)/gnulib/import/m4/string_h.m4 \
+	$(top_srcdir)/gnulib/import/m4/warn-on-use.m4 \
+	$(top_srcdir)/gnulib/import/m4/wchar_t.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/../bfd/bfd.m4 \
 	$(top_srcdir)/../config/acinclude.m4 \
 	$(top_srcdir)/../config/override.m4 \
 	$(top_srcdir)/../config/gettext-sister.m4 \
@@ -504,11 +504,11 @@ noinst_LIBRARIES = libgnu.a
 noinst_LTLIBRARIES = 
 EXTRA_DIST = m4/gnulib-cache.m4 inttypes.in.h memchr.c memchr.valgrind \
 	memmem.c str-two-way.h \
-	$(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h \
-	$(top_srcdir)/gnulib/extra/snippet/c++defs.h \
-	$(top_srcdir)/gnulib/extra/snippet/warn-on-use.h stddef.in.h \
-	stdint.in.h string.in.h \
-	$(top_srcdir)/gnulib/extra/update-copyright
+	$(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h \
+	$(top_srcdir)/gnulib/import/extra/snippet/c++defs.h \
+	$(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h \
+	stddef.in.h stdint.in.h string.in.h \
+	$(top_srcdir)/gnulib/import/extra/update-copyright
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
@@ -553,9 +553,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gnulib/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gnulib/import/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits gnulib/Makefile
+	  $(AUTOMAKE) --gnits gnulib/import/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -973,27 +973,27 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
 # The arg-nonnull.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
 # off.
-arg-nonnull.h: $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h
+arg-nonnull.h: $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h \
+	  < $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h \
 	  > $@-t && \
 	mv $@-t $@
 # The c++defs.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/gnulib/extra/snippet/c++defs.h
+c++defs.h: $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/c++defs.h \
+	  < $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h \
 	  > $@-t && \
 	mv $@-t $@
 # The warn-on-use.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
 # off.
-warn-on-use.h: $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h
+warn-on-use.h: $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h \
+	  < $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h \
 	  > $@-t && \
 	mv $@-t $@
 
diff --git a/gdb/gnulib/dummy.c b/gdb/gnulib/import/dummy.c
index 6e4b76e..6e4b76e 100644
--- a/gdb/gnulib/dummy.c
+++ b/gdb/gnulib/import/dummy.c
diff --git a/gdb/gnulib/extra/snippet/arg-nonnull.h b/gdb/gnulib/import/extra/snippet/arg-nonnull.h
index 3a9dd26..3a9dd26 100644
--- a/gdb/gnulib/extra/snippet/arg-nonnull.h
+++ b/gdb/gnulib/import/extra/snippet/arg-nonnull.h
diff --git a/gdb/gnulib/extra/snippet/c++defs.h b/gdb/gnulib/import/extra/snippet/c++defs.h
index 96da94b..96da94b 100644
--- a/gdb/gnulib/extra/snippet/c++defs.h
+++ b/gdb/gnulib/import/extra/snippet/c++defs.h
diff --git a/gdb/gnulib/extra/snippet/warn-on-use.h b/gdb/gnulib/import/extra/snippet/warn-on-use.h
index d4cb94f..d4cb94f 100644
--- a/gdb/gnulib/extra/snippet/warn-on-use.h
+++ b/gdb/gnulib/import/extra/snippet/warn-on-use.h
diff --git a/gdb/gnulib/extra/update-copyright b/gdb/gnulib/import/extra/update-copyright
index 082b749..082b749 100755..100644
--- a/gdb/gnulib/extra/update-copyright
+++ b/gdb/gnulib/import/extra/update-copyright
diff --git a/gdb/gnulib/inttypes.in.h b/gdb/gnulib/import/inttypes.in.h
index b9da2b5..b9da2b5 100644
--- a/gdb/gnulib/inttypes.in.h
+++ b/gdb/gnulib/import/inttypes.in.h
diff --git a/gdb/gnulib/m4/00gnulib.m4 b/gdb/gnulib/import/m4/00gnulib.m4
index d978cb8..d978cb8 100644
--- a/gdb/gnulib/m4/00gnulib.m4
+++ b/gdb/gnulib/import/m4/00gnulib.m4
diff --git a/gdb/gnulib/m4/extensions.m4 b/gdb/gnulib/import/m4/extensions.m4
index 0bfaef6..0bfaef6 100644
--- a/gdb/gnulib/m4/extensions.m4
+++ b/gdb/gnulib/import/m4/extensions.m4
diff --git a/gdb/gnulib/m4/gnulib-cache.m4 b/gdb/gnulib/import/m4/gnulib-cache.m4
index f77cd65..9815128 100644
--- a/gdb/gnulib/m4/gnulib-cache.m4
+++ b/gdb/gnulib/import/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/import --m4-base=gnulib/import/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -37,8 +37,8 @@ gl_MODULES([
   update-copyright
 ])
 gl_AVOID([])
-gl_SOURCE_BASE([gnulib])
-gl_M4_BASE([gnulib/m4])
+gl_SOURCE_BASE([gnulib/import])
+gl_M4_BASE([gnulib/import/m4])
 gl_PO_BASE([])
 gl_DOC_BASE([doc])
 gl_TESTS_BASE([tests])
diff --git a/gdb/gnulib/m4/gnulib-common.m4 b/gdb/gnulib/import/m4/gnulib-common.m4
index ae4d254..ae4d254 100644
--- a/gdb/gnulib/m4/gnulib-common.m4
+++ b/gdb/gnulib/import/m4/gnulib-common.m4
diff --git a/gdb/gnulib/m4/gnulib-comp.m4 b/gdb/gnulib/import/m4/gnulib-comp.m4
index dbcdfc0..bde90d3 100644
--- a/gdb/gnulib/m4/gnulib-comp.m4
+++ b/gdb/gnulib/import/m4/gnulib-comp.m4
@@ -64,14 +64,14 @@ AC_DEFUN([gl_INIT],
   gl_cond_libtool=false
   gl_libdeps=
   gl_ltlibdeps=
-  gl_m4_base='gnulib/m4'
+  gl_m4_base='gnulib/import/m4'
   m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
   m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
   m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
   m4_pushdef([gl_LIBSOURCES_LIST], [])
   m4_pushdef([gl_LIBSOURCES_DIR], [])
   gl_COMMON
-  gl_source_base='gnulib'
+  gl_source_base='gnulib/import'
 gl_INTTYPES_H
 gl_INTTYPES_INCOMPLETE
 gl_FUNC_MEMCHR
@@ -197,7 +197,7 @@ AC_DEFUN([gl_REPLACE_FUNCS], [
 AC_DEFUN([gl_LIBSOURCES], [
   m4_foreach([_gl_NAME], [$1], [
     m4_if(_gl_NAME, [alloca.c], [], [
-      m4_define([gl_LIBSOURCES_DIR], [gnulib])
+      m4_define([gl_LIBSOURCES_DIR], [gnulib/import])
       m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
     ])
   ])
diff --git a/gdb/gnulib/m4/gnulib-tool.m4 b/gdb/gnulib/import/m4/gnulib-tool.m4
index a09ffc1..a09ffc1 100644
--- a/gdb/gnulib/m4/gnulib-tool.m4
+++ b/gdb/gnulib/import/m4/gnulib-tool.m4
diff --git a/gdb/gnulib/m4/include_next.m4 b/gdb/gnulib/import/m4/include_next.m4
index a60a261..a60a261 100644
--- a/gdb/gnulib/m4/include_next.m4
+++ b/gdb/gnulib/import/m4/include_next.m4
diff --git a/gdb/gnulib/m4/inttypes-pri.m4 b/gdb/gnulib/import/m4/inttypes-pri.m4
index 977206f..977206f 100644
--- a/gdb/gnulib/m4/inttypes-pri.m4
+++ b/gdb/gnulib/import/m4/inttypes-pri.m4
diff --git a/gdb/gnulib/m4/inttypes.m4 b/gdb/gnulib/import/m4/inttypes.m4
index eec4f41..eec4f41 100644
--- a/gdb/gnulib/m4/inttypes.m4
+++ b/gdb/gnulib/import/m4/inttypes.m4
diff --git a/gdb/gnulib/m4/longlong.m4 b/gdb/gnulib/import/m4/longlong.m4
index b9c65c7..b9c65c7 100644
--- a/gdb/gnulib/m4/longlong.m4
+++ b/gdb/gnulib/import/m4/longlong.m4
diff --git a/gdb/gnulib/m4/memchr.m4 b/gdb/gnulib/import/m4/memchr.m4
index 0040294..0040294 100644
--- a/gdb/gnulib/m4/memchr.m4
+++ b/gdb/gnulib/import/m4/memchr.m4
diff --git a/gdb/gnulib/m4/memmem.m4 b/gdb/gnulib/import/m4/memmem.m4
index eebe94c..eebe94c 100644
--- a/gdb/gnulib/m4/memmem.m4
+++ b/gdb/gnulib/import/m4/memmem.m4
diff --git a/gdb/gnulib/m4/mmap-anon.m4 b/gdb/gnulib/import/m4/mmap-anon.m4
index 4613cbe..4613cbe 100644
--- a/gdb/gnulib/m4/mmap-anon.m4
+++ b/gdb/gnulib/import/m4/mmap-anon.m4
diff --git a/gdb/gnulib/m4/multiarch.m4 b/gdb/gnulib/import/m4/multiarch.m4
index b424dce..b424dce 100644
--- a/gdb/gnulib/m4/multiarch.m4
+++ b/gdb/gnulib/import/m4/multiarch.m4
diff --git a/gdb/gnulib/m4/onceonly.m4 b/gdb/gnulib/import/m4/onceonly.m4
index 275d73c..275d73c 100644
--- a/gdb/gnulib/m4/onceonly.m4
+++ b/gdb/gnulib/import/m4/onceonly.m4
diff --git a/gdb/gnulib/m4/stddef_h.m4 b/gdb/gnulib/import/m4/stddef_h.m4
index cc11609..cc11609 100644
--- a/gdb/gnulib/m4/stddef_h.m4
+++ b/gdb/gnulib/import/m4/stddef_h.m4
diff --git a/gdb/gnulib/m4/stdint.m4 b/gdb/gnulib/import/m4/stdint.m4
index 28d342e..28d342e 100644
--- a/gdb/gnulib/m4/stdint.m4
+++ b/gdb/gnulib/import/m4/stdint.m4
diff --git a/gdb/gnulib/m4/string_h.m4 b/gdb/gnulib/import/m4/string_h.m4
index 5677e09..5677e09 100644
--- a/gdb/gnulib/m4/string_h.m4
+++ b/gdb/gnulib/import/m4/string_h.m4
diff --git a/gdb/gnulib/m4/warn-on-use.m4 b/gdb/gnulib/import/m4/warn-on-use.m4
index a77802e..a77802e 100644
--- a/gdb/gnulib/m4/warn-on-use.m4
+++ b/gdb/gnulib/import/m4/warn-on-use.m4
diff --git a/gdb/gnulib/m4/wchar_t.m4 b/gdb/gnulib/import/m4/wchar_t.m4
index 534735d..534735d 100644
--- a/gdb/gnulib/m4/wchar_t.m4
+++ b/gdb/gnulib/import/m4/wchar_t.m4
diff --git a/gdb/gnulib/memchr.c b/gdb/gnulib/import/memchr.c
index b8fb0ef..b8fb0ef 100644
--- a/gdb/gnulib/memchr.c
+++ b/gdb/gnulib/import/memchr.c
diff --git a/gdb/gnulib/memchr.valgrind b/gdb/gnulib/import/memchr.valgrind
index 60f247e..60f247e 100644
--- a/gdb/gnulib/memchr.valgrind
+++ b/gdb/gnulib/import/memchr.valgrind
diff --git a/gdb/gnulib/memmem.c b/gdb/gnulib/import/memmem.c
index 29ffcc0..29ffcc0 100644
--- a/gdb/gnulib/memmem.c
+++ b/gdb/gnulib/import/memmem.c
diff --git a/gdb/gnulib/stddef.in.h b/gdb/gnulib/import/stddef.in.h
index 17fcaea..17fcaea 100644
--- a/gdb/gnulib/stddef.in.h
+++ b/gdb/gnulib/import/stddef.in.h
diff --git a/gdb/gnulib/stdint.in.h b/gdb/gnulib/import/stdint.in.h
index 8e4c822..8e4c822 100644
--- a/gdb/gnulib/stdint.in.h
+++ b/gdb/gnulib/import/stdint.in.h
diff --git a/gdb/gnulib/str-two-way.h b/gdb/gnulib/import/str-two-way.h
index af8f77b..af8f77b 100644
--- a/gdb/gnulib/str-two-way.h
+++ b/gdb/gnulib/import/str-two-way.h
diff --git a/gdb/gnulib/string.in.h b/gdb/gnulib/import/string.in.h
index f8d7520..f8d7520 100644
--- a/gdb/gnulib/string.in.h
+++ b/gdb/gnulib/import/string.in.h