Skip to content

Commit 02840ca

Browse files
nnethercotennethercote
committed
Remove no_integrated_as mode.
Specifically, remove both `-Z no_integrated_as` and `TargetOptions::no_integrated_as`. The latter was only used for the `msp430_none_elf` platform, for which it's no longer required.
1 parent 62c6006 commit 02840ca

File tree

8 files changed

+26
-129
lines changed

8 files changed

+26
-129
lines changed

‎src/librustc_codegen_llvm/back/write.rs

+25-38
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ use crate::ModuleLlvm;
1616
use log::debug;
1717
use rustc::bug;
1818
use rustc::ty::TyCtxt;
19-
use rustc_codegen_ssa::back::write::{
20-
run_assembler, BitcodeSection, CodegenContext, EmitObj, ModuleConfig,
21-
};
19+
use rustc_codegen_ssa::back::write::{BitcodeSection, CodegenContext, EmitObj, ModuleConfig};
2220
use rustc_codegen_ssa::traits::*;
2321
use rustc_codegen_ssa::{CompiledModule, ModuleCodegen, RLIB_BYTECODE_EXTENSION};
2422
use rustc_data_structures::small_c_str::SmallCStr;
@@ -734,53 +732,41 @@ pub(crate) unsafe fn codegen(
734732
})?;
735733
}
736734

737-
let config_emit_object_code = matches!(config.emit_obj, EmitObj::ObjectCode(_));
738-
739-
if config.emit_asm || (config_emit_object_code && config.no_integrated_as) {
735+
if config.emit_asm {
740736
let _timer = cgcx
741737
.prof
742738
.generic_activity_with_arg("LLVM_module_codegen_emit_asm", &module.name[..]);
743739
let path = cgcx.output_filenames.temp_path(OutputType::Assembly, module_name);
744740

745-
// We can't use the same module for asm and binary output, because that triggers
746-
// various errors like invalid IR or broken binaries, so we might have to clone the
747-
// module to produce the asm output
748-
let llmod = if config_emit_object_code { llvm::LLVMCloneModule(llmod) } else { llmod };
741+
// We can't use the same module for asm and object code output,
742+
// because that triggers various errors like invalid IR or broken
743+
// binaries. So we must clone the module to produce the asm output
744+
// if we are also producing object code.
745+
let llmod = if let EmitObj::ObjectCode(_) = config.emit_obj {
746+
llvm::LLVMCloneModule(llmod)
747+
} else {
748+
llmod
749+
};
749750
with_codegen(tm, llmod, config.no_builtins, |cpm| {
750751
write_output_file(diag_handler, tm, cpm, llmod, &path, llvm::FileType::AssemblyFile)
751752
})?;
752753
}
753754

754755
match config.emit_obj {
755756
EmitObj::ObjectCode(_) => {
756-
if !config.no_integrated_as {
757-
let _timer = cgcx.prof.generic_activity_with_arg(
758-
"LLVM_module_codegen_emit_obj",
759-
&module.name[..],
760-
);
761-
with_codegen(tm, llmod, config.no_builtins, |cpm| {
762-
write_output_file(
763-
diag_handler,
764-
tm,
765-
cpm,
766-
llmod,
767-
&obj_out,
768-
llvm::FileType::ObjectFile,
769-
)
770-
})?;
771-
} else {
772-
let _timer = cgcx.prof.generic_activity_with_arg(
773-
"LLVM_module_codegen_asm_to_obj",
774-
&module.name[..],
775-
);
776-
let assembly =
777-
cgcx.output_filenames.temp_path(OutputType::Assembly, module_name);
778-
run_assembler(cgcx, diag_handler, &assembly, &obj_out);
779-
780-
if !config.emit_asm && !cgcx.save_temps {
781-
drop(fs::remove_file(&assembly));
782-
}
783-
}
757+
let _timer = cgcx
758+
.prof
759+
.generic_activity_with_arg("LLVM_module_codegen_emit_obj", &module.name[..]);
760+
with_codegen(tm, llmod, config.no_builtins, |cpm| {
761+
write_output_file(
762+
diag_handler,
763+
tm,
764+
cpm,
765+
llmod,
766+
&obj_out,
767+
llvm::FileType::ObjectFile,
768+
)
769+
})?;
784770
}
785771

786772
EmitObj::Bitcode => {
@@ -802,6 +788,7 @@ pub(crate) unsafe fn codegen(
802788

803789
drop(handlers);
804790
}
791+
805792
Ok(module.into_compiled_module(
806793
config.emit_obj != EmitObj::None,
807794
config.emit_bc,

‎src/librustc_codegen_ssa/back/write.rs

+1-65
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
use super::command::Command;
2-
use super::link::{self, get_linker, remove};
1+
use super::link::{self, remove};
32
use super::linker::LinkerInfo;
43
use super::lto::{self, SerializedModule};
54
use super::symbol_export::symbol_name_for_instance_in_crate;
@@ -116,7 +115,6 @@ pub struct ModuleConfig {
116115
pub merge_functions: bool,
117116
pub inline_threshold: Option<usize>,
118117
pub new_llvm_pass_manager: Option<bool>,
119-
pub no_integrated_as: bool,
120118
}
121119

122120
impl ModuleConfig {
@@ -140,7 +138,6 @@ impl ModuleConfig {
140138
emit_ir: false,
141139
emit_asm: false,
142140
emit_obj: EmitObj::None,
143-
no_integrated_as: false,
144141

145142
verify_llvm_ir: false,
146143
no_prepopulate_passes: false,
@@ -202,12 +199,6 @@ impl ModuleConfig {
202199
}
203200
}
204201

205-
/// Assembler name and command used by codegen when no_integrated_as is enabled
206-
pub struct AssemblerCommand {
207-
name: PathBuf,
208-
cmd: Command,
209-
}
210-
211202
// HACK(eddyb) work around `#[derive]` producing wrong bounds for `Clone`.
212203
pub struct TargetMachineFactory<B: WriteBackendMethods>(
213204
pub Arc<dyn Fn() -> Result<B::TargetMachine, String> + Send + Sync>,
@@ -260,8 +251,6 @@ pub struct CodegenContext<B: WriteBackendMethods> {
260251
pub cgu_reuse_tracker: CguReuseTracker,
261252
// Channel back to the main control thread to send messages to
262253
pub coordinator_send: Sender<Box<dyn Any + Send>>,
263-
// The assembler command if no_integrated_as option is enabled, None otherwise
264-
pub assembler_cmd: Option<Arc<AssemblerCommand>>,
265254
}
266255

267256
impl<B: WriteBackendMethods> CodegenContext<B> {
@@ -415,9 +404,6 @@ pub fn start_async_codegen<B: ExtraBackendMethods>(
415404

416405
modules_config.emit_pre_lto_bc = need_pre_lto_bitcode_for_incr_comp(sess);
417406

418-
modules_config.no_integrated_as =
419-
tcx.sess.opts.cg.no_integrated_as || tcx.sess.target.target.options.no_integrated_as;
420-
421407
for output_type in sess.opts.output_types.keys() {
422408
match *output_type {
423409
OutputType::Bitcode => {
@@ -1030,17 +1016,6 @@ fn start_executing_work<B: ExtraBackendMethods>(
10301016
each_linked_rlib_for_lto.push((cnum, path.to_path_buf()));
10311017
}));
10321018

1033-
let assembler_cmd = if modules_config.no_integrated_as {
1034-
// HACK: currently we use linker (gcc) as our assembler
1035-
let (linker, flavor) = link::linker_and_flavor(sess);
1036-
1037-
let (name, mut cmd) = get_linker(sess, &linker, flavor);
1038-
cmd.args(&sess.target.target.options.asm_args);
1039-
Some(Arc::new(AssemblerCommand { name, cmd }))
1040-
} else {
1041-
None
1042-
};
1043-
10441019
let ol = if tcx.sess.opts.debugging_opts.no_codegen
10451020
|| !tcx.sess.opts.output_types.should_codegen()
10461021
{
@@ -1076,7 +1051,6 @@ fn start_executing_work<B: ExtraBackendMethods>(
10761051
target_pointer_width: tcx.sess.target.target.target_pointer_width.clone(),
10771052
target_arch: tcx.sess.target.target.arch.clone(),
10781053
debuginfo: tcx.sess.opts.debuginfo,
1079-
assembler_cmd,
10801054
};
10811055

10821056
// This is the "main loop" of parallel work happening for parallel codegen.
@@ -1610,44 +1584,6 @@ fn spawn_work<B: ExtraBackendMethods>(cgcx: CodegenContext<B>, work: WorkItem<B>
16101584
});
16111585
}
16121586

1613-
pub fn run_assembler<B: ExtraBackendMethods>(
1614-
cgcx: &CodegenContext<B>,
1615-
handler: &Handler,
1616-
assembly: &Path,
1617-
object: &Path,
1618-
) {
1619-
let assembler = cgcx.assembler_cmd.as_ref().expect("cgcx.assembler_cmd is missing?");
1620-
1621-
let pname = &assembler.name;
1622-
let mut cmd = assembler.cmd.clone();
1623-
cmd.arg("-c").arg("-o").arg(object).arg(assembly);
1624-
debug!("{:?}", cmd);
1625-
1626-
match cmd.output() {
1627-
Ok(prog) => {
1628-
if !prog.status.success() {
1629-
let mut note = prog.stderr.clone();
1630-
note.extend_from_slice(&prog.stdout);
1631-
1632-
handler
1633-
.struct_err(&format!(
1634-
"linking with `{}` failed: {}",
1635-
pname.display(),
1636-
prog.status
1637-
))
1638-
.note(&format!("{:?}", &cmd))
1639-
.note(str::from_utf8(&note[..]).unwrap())
1640-
.emit();
1641-
handler.abort_if_errors();
1642-
}
1643-
}
1644-
Err(e) => {
1645-
handler.err(&format!("could not exec the linker `{}`: {}", pname.display(), e));
1646-
handler.abort_if_errors();
1647-
}
1648-
}
1649-
}
1650-
16511587
enum SharedEmitterMessage {
16521588
Diagnostic(Diagnostic),
16531589
InlineAsmError(u32, String),

‎src/librustc_interface/tests.rs

-4
Original file line numberDiff line numberDiff line change
@@ -451,10 +451,6 @@ fn test_codegen_options_tracking_hash() {
451451
opts.cg.prefer_dynamic = true;
452452
assert!(reference.dep_tracking_hash() != opts.dep_tracking_hash());
453453

454-
opts = reference.clone();
455-
opts.cg.no_integrated_as = true;
456-
assert!(reference.dep_tracking_hash() != opts.dep_tracking_hash());
457-
458454
opts = reference.clone();
459455
opts.cg.no_redzone = Some(true);
460456
assert!(reference.dep_tracking_hash() != opts.dep_tracking_hash());

‎src/librustc_session/options.rs

-2
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,6 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options,
665665
"use soft float ABI (*eabihf targets only)"),
666666
prefer_dynamic: bool = (false, parse_bool, [TRACKED],
667667
"prefer dynamic linking to static linking"),
668-
no_integrated_as: bool = (false, parse_bool, [TRACKED],
669-
"use an external assembler rather than LLVM's integrated one"),
670668
no_redzone: Option<bool> = (None, parse_opt_bool, [TRACKED],
671669
"disable the use of the redzone"),
672670
relocation_model: Option<String> = (None, parse_opt_string, [TRACKED],

‎src/librustc_target/spec/mod.rs

-8
Original file line numberDiff line numberDiff line change
@@ -712,11 +712,6 @@ pub struct TargetOptions {
712712
// will 'just work'.
713713
pub obj_is_bitcode: bool,
714714

715-
// LLVM can't produce object files for this target. Instead, we'll make LLVM
716-
// emit assembly and then use `gcc` to turn that assembly into an object
717-
// file
718-
pub no_integrated_as: bool,
719-
720715
/// Don't use this field; instead use the `.min_atomic_width()` method.
721716
pub min_atomic_width: Option<u64>,
722717

@@ -872,7 +867,6 @@ impl Default for TargetOptions {
872867
allow_asm: true,
873868
has_elf_tls: false,
874869
obj_is_bitcode: false,
875-
no_integrated_as: false,
876870
min_atomic_width: None,
877871
max_atomic_width: None,
878872
atomic_cas: true,
@@ -1187,7 +1181,6 @@ impl Target {
11871181
key!(main_needs_argc_argv, bool);
11881182
key!(has_elf_tls, bool);
11891183
key!(obj_is_bitcode, bool);
1190-
key!(no_integrated_as, bool);
11911184
key!(max_atomic_width, Option<u64>);
11921185
key!(min_atomic_width, Option<u64>);
11931186
key!(atomic_cas, bool);
@@ -1415,7 +1408,6 @@ impl ToJson for Target {
14151408
target_option_val!(main_needs_argc_argv);
14161409
target_option_val!(has_elf_tls);
14171410
target_option_val!(obj_is_bitcode);
1418-
target_option_val!(no_integrated_as);
14191411
target_option_val!(min_atomic_width);
14201412
target_option_val!(max_atomic_width);
14211413
target_option_val!(atomic_cas);

‎src/librustc_target/spec/msp430_none_elf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ pub fn target() -> TargetResult {
2222
// dependency on this specific gcc.
2323
asm_args: vec!["-mcpu=msp430".to_string()],
2424
linker: Some("msp430-elf-gcc".to_string()),
25-
no_integrated_as: true,
2625

2726
// There are no atomic CAS instructions available in the MSP430
2827
// instruction set, and the LLVM backend doesn't currently support

‎src/test/run-make-fulldeps/no-integrated-as/Makefile

-8
This file was deleted.

‎src/test/run-make-fulldeps/no-integrated-as/hello.rs

-3
This file was deleted.

0 commit comments

Comments
 (0)