diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
index 3e5ce04d755e..92fa8b50a15e 100644
--- a/llvm/lib/Support/raw_ostream.cpp
+++ b/llvm/lib/Support/raw_ostream.cpp
@@ -27,6 +27,11 @@
 #include <cerrno>
 #include <sys/stat.h>
 
+// <fcntl.h> may provide O_BINARY.
+#if defined(HAVE_FCNTL_H)
+# include <fcntl.h>
+#endif
+
 #if defined(HAVE_UNISTD_H)
 # include <unistd.h>
 #endif
diff --git a/llvm/test/Object/check_binary_output.ll b/llvm/test/Object/check_binary_output.ll
index 02b52a3601ca..567f18e65ba5 100644
--- a/llvm/test/Object/check_binary_output.ll
+++ b/llvm/test/Object/check_binary_output.ll
@@ -1,7 +1,4 @@
 ; This is not an assembly file, this is just to run the test.
 ; The test verifies that llvm-ar produces a binary output.
 
-; FIXME: They malform LF into CRLF. Investigating.
-; XFAIL: mingw32,win32
-
 ;RUN: llvm-ar p %p/Inputs/GNU.a very_long_bytecode_file_name.bc | cmp -s %p/Inputs/very_long_bytecode_file_name.bc -