summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-10-04 21:40:54 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-10-04 21:40:54 +0000
commitdc9fe0af85e88d6cd10049aae5ba8731b59ce958 (patch)
tree0a92e1975d319d03869a9759c5247ed876b29934
parent9076c0fffbc1323db78b789f040b30295a3cfcf0 (diff)
downloadbcm5719-llvm-dc9fe0af85e88d6cd10049aae5ba8731b59ce958.tar.gz
bcm5719-llvm-dc9fe0af85e88d6cd10049aae5ba8731b59ce958.zip
Fix object file writing in llvm-lto on Windows.
We were writing in text mode. Patch by Greg Bedwell. llvm-svn: 191985
-rw-r--r--llvm/test/LTO/cfi_endproc.ll3
-rw-r--r--llvm/test/LTO/lit.local.cfg2
-rw-r--r--llvm/tools/llvm-lto/llvm-lto.cpp3
3 files changed, 3 insertions, 5 deletions
diff --git a/llvm/test/LTO/cfi_endproc.ll b/llvm/test/LTO/cfi_endproc.ll
index acfaf5a8009..d8818d226e0 100644
--- a/llvm/test/LTO/cfi_endproc.ll
+++ b/llvm/test/LTO/cfi_endproc.ll
@@ -4,9 +4,6 @@
; RUN: llvm-lto -o %t3 -exported-symbol=main %t1
; RUN: llvm-nm %t3 | FileCheck %s -check-prefix=EXPORT
-; FIXME: we can now build LTO on windows, debug why this fails.
-; XFAIL: win32
-
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/LTO/lit.local.cfg b/llvm/test/LTO/lit.local.cfg
index f61943a77af..7a70736aeac 100644
--- a/llvm/test/LTO/lit.local.cfg
+++ b/llvm/test/LTO/lit.local.cfg
@@ -2,5 +2,5 @@ targets = set(config.root.targets_to_build.split())
if not 'X86' in targets:
config.unsupported = True
-if config.root.host_os in ['Cygwin', 'MingW', 'Windows']:
+if config.root.host_os in ['Cygwin']:
config.unsupported = True
diff --git a/llvm/tools/llvm-lto/llvm-lto.cpp b/llvm/tools/llvm-lto/llvm-lto.cpp
index 1d03fa62a87..bce903fa160 100644
--- a/llvm/tools/llvm-lto/llvm-lto.cpp
+++ b/llvm/tools/llvm-lto/llvm-lto.cpp
@@ -136,7 +136,8 @@ int main(int argc, char **argv) {
return 1;
}
- raw_fd_ostream FileStream(OutputFilename.c_str(), ErrorInfo);
+ raw_fd_ostream FileStream(OutputFilename.c_str(), ErrorInfo,
+ sys::fs::F_Binary);
if (!ErrorInfo.empty()) {
errs() << argv[0] << ": error opening the file '" << OutputFilename
<< "': " << ErrorInfo << "\n";
OpenPOWER on IntegriCloud