diff options
| author | Nicholas Nethercote <nnethercote@mozilla.com> | 2020-03-24 14:06:47 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <nnethercote@mozilla.com> | 2020-03-27 11:59:10 +1100 |
| commit | 02840ca8ab3a1eddda05bc2cbc9df62213fa2b3d (patch) | |
| tree | bc5af73894e1b4c8bd5c3d87b1960a94cf708bb7 /src/librustc_target | |
| parent | 62c6006450d8bd33a351673c1f969846d768aab4 (diff) | |
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.
Diffstat (limited to 'src/librustc_target')
| -rw-r--r-- | src/librustc_target/spec/mod.rs | 8 | ||||
| -rw-r--r-- | src/librustc_target/spec/msp430_none_elf.rs | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs index 6d688c12977..1bc2bf12fad 100644 --- a/src/librustc_target/spec/mod.rs +++ b/src/librustc_target/spec/mod.rs @@ -712,11 +712,6 @@ pub struct TargetOptions { // will 'just work'. pub obj_is_bitcode: bool, - // LLVM can't produce object files for this target. Instead, we'll make LLVM - // emit assembly and then use `gcc` to turn that assembly into an object - // file - pub no_integrated_as: bool, - /// Don't use this field; instead use the `.min_atomic_width()` method. pub min_atomic_width: Option<u64>, @@ -872,7 +867,6 @@ impl Default for TargetOptions { allow_asm: true, has_elf_tls: false, obj_is_bitcode: false, - no_integrated_as: false, min_atomic_width: None, max_atomic_width: None, atomic_cas: true, @@ -1187,7 +1181,6 @@ impl Target { key!(main_needs_argc_argv, bool); key!(has_elf_tls, bool); key!(obj_is_bitcode, bool); - key!(no_integrated_as, bool); key!(max_atomic_width, Option<u64>); key!(min_atomic_width, Option<u64>); key!(atomic_cas, bool); @@ -1415,7 +1408,6 @@ impl ToJson for Target { target_option_val!(main_needs_argc_argv); target_option_val!(has_elf_tls); target_option_val!(obj_is_bitcode); - target_option_val!(no_integrated_as); target_option_val!(min_atomic_width); target_option_val!(max_atomic_width); target_option_val!(atomic_cas); diff --git a/src/librustc_target/spec/msp430_none_elf.rs b/src/librustc_target/spec/msp430_none_elf.rs index e05a18e76d2..9a90ac7ccec 100644 --- a/src/librustc_target/spec/msp430_none_elf.rs +++ b/src/librustc_target/spec/msp430_none_elf.rs @@ -22,7 +22,6 @@ pub fn target() -> TargetResult { // dependency on this specific gcc. asm_args: vec!["-mcpu=msp430".to_string()], linker: Some("msp430-elf-gcc".to_string()), - no_integrated_as: true, // There are no atomic CAS instructions available in the MSP430 // instruction set, and the LLVM backend doesn't currently support |