diff options
| author | bors <bors@rust-lang.org> | 2019-05-20 00:37:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-20 00:37:48 +0000 |
| commit | 128b4c8035fc788b78157d4e1975cda0f25ce599 (patch) | |
| tree | 2821ec0ae0c94f2b83d5cf37c68c0ad95220d549 /src/librustc_codegen_ssa | |
| parent | a5000c5098d08d9240d875fcb4231533fb922ead (diff) | |
| parent | 614ffe56c6a0a3bf0dc649388d5cb7d6a3f0d0c1 (diff) | |
| download | rust-128b4c8035fc788b78157d4e1975cda0f25ce599.tar.gz rust-128b4c8035fc788b78157d4e1975cda0f25ce599.zip | |
Auto merge of #60969 - Centril:rollup-3j71mqj, r=Centril
Rollup of 6 pull requests Successful merges: - #60590 (Test interaction of unions with non-zero/niche-filling optimization) - #60745 (Perform constant propagation into terminators) - #60895 (Enable thumbv7a-pc-windows-msvc target build end to end in rust/master) - #60908 (Fix lints handling in rustdoc) - #60960 (Stop using gensyms in HIR lowering) - #60962 (Fix data types indication) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/back/write.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/librustc_codegen_ssa/back/write.rs b/src/librustc_codegen_ssa/back/write.rs index 6320d8a671d..1c793996c83 100644 --- a/src/librustc_codegen_ssa/back/write.rs +++ b/src/librustc_codegen_ssa/back/write.rs @@ -248,6 +248,7 @@ pub struct CodegenContext<B: WriteBackendMethods> { pub tm_factory: TargetMachineFactory<B>, pub msvc_imps_needed: bool, pub target_pointer_width: String, + pub target_arch: String, pub debuginfo: config::DebugInfo, // Number of cgus excluding the allocator/metadata modules @@ -1103,6 +1104,7 @@ fn start_executing_work<B: ExtraBackendMethods>( total_cgus, msvc_imps_needed: msvc_imps_needed(tcx), target_pointer_width: tcx.sess.target.target.target_pointer_width.clone(), + target_arch: tcx.sess.target.target.arch.clone(), debuginfo: tcx.sess.opts.debuginfo, assembler_cmd, }; |