diff options
| author | bors <bors@rust-lang.org> | 2013-09-02 00:20:44 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-02 00:20:44 -0700 |
| commit | 6a3dd30afe64f2d9f10a68ebc178ce22d8c90075 (patch) | |
| tree | eed11f7388121fc50ff9f4c448775e4cb996b49c /src | |
| parent | 8f678ae688df430a44306bd171bccafaca97c398 (diff) | |
| parent | cbd143f966ad7df855da95ad901513b82d1993c9 (diff) | |
| download | rust-6a3dd30afe64f2d9f10a68ebc178ce22d8c90075.tar.gz rust-6a3dd30afe64f2d9f10a68ebc178ce22d8c90075.zip | |
auto merge of #8931 : ILyoan/rust/turnoff_android_ndk_asm, r=thestinger
Now we don't need android ndk to generate unwind info for arm target thanks to LLVM upgrade. This fix removes the ndk asm pass.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/driver/driver.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index e4d3ca4baef..e381b0af47a 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -337,9 +337,7 @@ pub fn phase_5_run_llvm_passes(sess: Session, // segmented stacks are enabled. However, unwind info directives in assembly // output are OK, so we generate assembly first and then run it through // an external assembler. - // Same for Android. - if (sess.targ_cfg.os == session::OsAndroid || - sess.targ_cfg.os == session::OsWin32) && + if sess.targ_cfg.os == session::OsWin32 && (sess.opts.output_type == link::output_type_object || sess.opts.output_type == link::output_type_exe) { let output_type = link::output_type_assembly; |