Skip to content

Commit 6a3dd30

Browse files
committed
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.
2 parents 8f678ae + cbd143f commit 6a3dd30

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/librustc/driver/driver.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,7 @@ pub fn phase_5_run_llvm_passes(sess: Session,
337337
// segmented stacks are enabled. However, unwind info directives in assembly
338338
// output are OK, so we generate assembly first and then run it through
339339
// an external assembler.
340-
// Same for Android.
341-
if (sess.targ_cfg.os == session::OsAndroid ||
342-
sess.targ_cfg.os == session::OsWin32) &&
340+
if sess.targ_cfg.os == session::OsWin32 &&
343341
(sess.opts.output_type == link::output_type_object ||
344342
sess.opts.output_type == link::output_type_exe) {
345343
let output_type = link::output_type_assembly;

0 commit comments

Comments
 (0)