Index: ../src/gcc/genattrtab.c
===================================================================
--- ../src/gcc/genattrtab.c	(revision 237184)
+++ ../src/gcc/genattrtab.c	(working copy)
@@ -111,7 +111,7 @@
 #include "errors.h"
 #include "read-md.h"
 #include "gensupport.h"
-#include "fnmatch.h"
+#include <fnmatch.h>
 
 #define DEBUG 0
 
Index: ../src/gcc/genautomata.c
===================================================================
--- ../src/gcc/genautomata.c	(revision 237184)
+++ ../src/gcc/genautomata.c	(working copy)
@@ -114,7 +114,7 @@
 #include "gensupport.h"
 
 #include <math.h>
-#include "fnmatch.h"
+#include <fnmatch.h>
 
 #ifndef CHAR_BIT
 #define CHAR_BIT 8
Index: src/gcc/Makefile.in
===================================================================
--- src/gcc/Makefile.in (revision 237184)
+++ src/gcc/Makefile.in (working copy)
@@ -2549,10 +2556,10 @@
   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h $(READ_MD_H) $(GENSUPPORT_H)
 build/genattrtab.o : genattrtab.c $(RTL_BASE_H) $(OBSTACK_H)           \
   $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) errors.h $(GGC_H)      \
-  $(READ_MD_H) $(GENSUPPORT_H) $(FNMATCH_H)
+  $(READ_MD_H) $(GENSUPPORT_H)
 build/genautomata.o : genautomata.c $(RTL_BASE_H) $(OBSTACK_H)         \
   $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) errors.h $(VEC_H)      \
-  $(HASHTAB_H) $(GENSUPPORT_H) $(FNMATCH_H)
+  $(HASHTAB_H) $(GENSUPPORT_H) 
 build/gencheck.o : gencheck.c all-tree.def $(BCONFIG_H) $(GTM_H)       \
        $(SYSTEM_H) coretypes.h tree.def c-family/c-common.def          \
        $(lang_tree_files) gimple.def
Index: src/gnulib/update-gnulib.sh
===================================================================
--- src/gnulib/update-gnulib.sh (nonexistent)
+++ src/gnulib/update-gnulib.sh (working copy)
@@ -31,6 +31,7 @@
 # The list of gnulib modules we are importing in GCC.
 IMPORTED_GNULIB_MODULES="\
     obstack \
+    fnmatch \
 "