diff --git a/libgo/config.h.in b/libgo/config.h.in
index 1126790..25b8ab8 100644
--- a/libgo/config.h.in
+++ b/libgo/config.h.in
@@ -36,6 +36,10 @@
 /* Define to 1 if you have the `cosl' function. */
 #undef HAVE_COSL
 
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
@@ -159,6 +163,9 @@
 /* Define to 1 if you have the `mknodat' function. */
 #undef HAVE_MKNODAT
 
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
 /* Define to 1 if you have the <netinet/icmp6.h> header file. */
 #undef HAVE_NETINET_ICMP6_H
 
@@ -249,6 +256,9 @@
 /* Define to 1 if you have the `strsignal' function. */
 #undef HAVE_STRSIGNAL
 
+/* Define to 1 if `d_type' is a member of `struct dirent'. */
+#undef HAVE_STRUCT_DIRENT_D_TYPE
+
 /* Define to 1 if <math.h> defines struct exception */
 #undef HAVE_STRUCT_EXCEPTION
 
@@ -261,6 +271,10 @@
 /* Define to 1 if you have the <syscall.h> header file. */
 #undef HAVE_SYSCALL_H
 
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
 /* Define to 1 if you have the <sys/epoll.h> header file. */
 #undef HAVE_SYS_EPOLL_H
 
@@ -279,6 +293,10 @@
 /* Define to 1 if you have the <sys/mount.h> header file. */
 #undef HAVE_SYS_MOUNT_H
 
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
 /* Define to 1 if you have the <sys/prctl.h> header file. */
 #undef HAVE_SYS_PRCTL_H
 
diff --git a/libgo/go/os/dir_gccgo_c.c b/libgo/go/os/dir_gccgo_c.c
index 2ced9c8..66b9be1 100644
--- a/libgo/go/os/dir_gccgo_c.c
+++ b/libgo/go/os/dir_gccgo_c.c
@@ -10,7 +10,7 @@
   __asm__ (GOSYM_PREFIX "os.direntType");
 
 unsigned char
-direntType (struct dirent *p)
+direntType (struct dirent *p __attribute__((unused)))
 {
 #ifndef HAVE_STRUCT_DIRENT_D_TYPE
   return 'U';