diff --git a/configure b/configure
index 2a739d3efb6..427a10d892c 100755
--- a/configure
+++ b/configure
@@ -16262,7 +16262,8 @@ done
 
 
 
-for ac_header in sys/mman.h sys/param.h sys/resource.h sys/time.h
+
+for ac_header in sys/mman.h sys/param.h sys/resource.h sys/time.h sys/uio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -18905,7 +18906,8 @@ done
 
 
 
-for ac_func in setjmp longjmp sigsetjmp siglongjmp
+
+for ac_func in setjmp longjmp sigsetjmp siglongjmp writev
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in
index b38ee62439b..5e166463f35 100644
--- a/include/llvm/Config/config.h.in
+++ b/include/llvm/Config/config.h.in
@@ -440,6 +440,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#undef HAVE_SYS_UIO_H
+
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 
@@ -467,6 +470,9 @@
 /* Define to 1 if you have the <windows.h> header file. */
 #undef HAVE_WINDOWS_H
 
+/* Define to 1 if you have the `writev' function. */
+#undef HAVE_WRITEV
+
 /* Define if the xdot.py program is available */
 #undef HAVE_XDOT_PY