bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove forces_embed_bitcode

Browse source
This commit is contained in:
DianQK 2024-11-20 22:54:46 +08:00
parent 3a23669787
commit 7cc5feea4d
No known key found for this signature in database
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_codegen_ssa/src/back/write.rs
View file

@ -432,11 +432,9 @@ struct CompiledModules {
fn need_bitcode_in_object(tcx: TyCtxt<'_>) -> bool { fn need_bitcode_in_object(tcx: TyCtxt<'_>) -> bool {
let sess = tcx.sess; let sess = tcx.sess;
let requested_for_rlib = sess.opts.cg.embed_bitcode sess.opts.cg.embed_bitcode
&& tcx.crate_types().contains(&CrateType::Rlib) && tcx.crate_types().contains(&CrateType::Rlib)
&& sess.opts.output_types.contains_key(&OutputType::Exe); && sess.opts.output_types.contains_key(&OutputType::Exe)
let forced_by_target = sess.target.forces_embed_bitcode;
requested_for_rlib || forced_by_target
} }
fn need_pre_lto_bitcode_for_incr_comp(sess: &Session) -> bool { fn need_pre_lto_bitcode_for_incr_comp(sess: &Session) -> bool {

5
compiler/rustc_target/src/spec/mod.rs
View file

@ -2327,8 +2327,6 @@ pub struct TargetOptions {
/// If we give emcc .o files that are actually .bc files it /// If we give emcc .o files that are actually .bc files it
/// will 'just work'. /// will 'just work'.
pub obj_is_bitcode: bool, pub obj_is_bitcode: bool,
/// Whether the target requires that emitted object code includes bitcode.
pub forces_embed_bitcode: bool,
/// Content of the LLVM cmdline section associated with embedded bitcode. /// Content of the LLVM cmdline section associated with embedded bitcode.
pub bitcode_llvm_cmdline: StaticCow<str>, pub bitcode_llvm_cmdline: StaticCow<str>,
@ -2671,7 +2669,6 @@ impl Default for TargetOptions {
allow_asm: true, allow_asm: true,
has_thread_local: false, has_thread_local: false,
obj_is_bitcode: false, obj_is_bitcode: false,
forces_embed_bitcode: false,
bitcode_llvm_cmdline: "".into(), bitcode_llvm_cmdline: "".into(),
min_atomic_width: None, min_atomic_width: None,
max_atomic_width: None, max_atomic_width: None,
@ -3412,7 +3409,6 @@ impl Target {
key!(main_needs_argc_argv, bool); key!(main_needs_argc_argv, bool);
key!(has_thread_local, bool); key!(has_thread_local, bool);
key!(obj_is_bitcode, bool); key!(obj_is_bitcode, bool);
key!(forces_embed_bitcode, bool);
key!(bitcode_llvm_cmdline); key!(bitcode_llvm_cmdline);
key!(max_atomic_width, Option<u64>); key!(max_atomic_width, Option<u64>);
key!(min_atomic_width, Option<u64>); key!(min_atomic_width, Option<u64>);
@ -3687,7 +3683,6 @@ impl ToJson for Target {
target_option_val!(main_needs_argc_argv); target_option_val!(main_needs_argc_argv);
target_option_val!(has_thread_local); target_option_val!(has_thread_local);
target_option_val!(obj_is_bitcode); target_option_val!(obj_is_bitcode);
target_option_val!(forces_embed_bitcode);
target_option_val!(bitcode_llvm_cmdline); target_option_val!(bitcode_llvm_cmdline);
target_option_val!(min_atomic_width); target_option_val!(min_atomic_width);
target_option_val!(max_atomic_width); target_option_val!(max_atomic_width);