Skip to content

Commit 5317525

Browse files
committed
---
yaml --- r: 130515 b: refs/heads/try c: e29aa14 h: refs/heads/master i: 130513: ddcab16 130511: 8f775a6 v: v3
1 parent 25c5d83 commit 5317525

File tree

8 files changed

+512
-507
lines changed

8 files changed

+512
-507
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: c964cb229bd342bdeb0b4506c3a6d32b03e575f6
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 67b97ab6d2b7de9b69fd97dc171fcf8feec932ff
5-
refs/heads/try: 0ab27b1d5b68d3bc3c727895e5219ce254c685ad
5+
refs/heads/try: e29aa1430bb45d18a5d3fcc5f3b7d20e99a57758
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/back/link.rs

Lines changed: 2 additions & 476 deletions
Large diffs are not rendered by default.

branches/try/src/librustc/back/lto.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
use super::link;
12+
use super::write;
1213
use driver::session;
1314
use driver::config;
1415
use llvm;
@@ -119,9 +120,9 @@ pub fn run(sess: &session::Session, llmod: ModuleRef,
119120
if !llvm::LLVMRustLinkInExternalBitcode(llmod,
120121
ptr as *const libc::c_char,
121122
bc_decoded.len() as libc::size_t) {
122-
link::llvm_err(sess,
123-
format!("failed to load bc of `{}`",
124-
name.as_slice()));
123+
write::llvm_err(sess,
124+
format!("failed to load bc of `{}`",
125+
name.as_slice()));
125126
}
126127
});
127128
}

0 commit comments

Comments
 (0)