Skip to content

Commit

Permalink
auto merge of #8931 : ILyoan/rust/turnoff_android_ndk_asm, r=thestinger
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Sep 2, 2013
2 parents 8f678ae + cbd143f commit 6a3dd30
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/librustc/driver/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6a3dd30

Please sign in to comment.