diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-03-01 16:03:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-01 16:03:20 +0100 |
| commit | 878f3831182417d249d5ca922fd37ffc4daa477c (patch) | |
| tree | 68ec7acaced701af1cf6da1f57941c252b0fd365 /compiler/rustc_codegen_ssa/src | |
| parent | c112b70f1209db5d54c1912d88310fe226351adc (diff) | |
| parent | 4c1f51bf6ecc68fb6eb4b90ea6b0d0b027146aee (diff) | |
| download | rust-878f3831182417d249d5ca922fd37ffc4daa477c.tar.gz rust-878f3831182417d249d5ca922fd37ffc4daa477c.zip | |
Rollup merge of #137830 - LuigiPiucco:incompatible-isa-fix, r=workingjubilee
Fix link failure on AVR (incompatible ISA error) Fixes #137739. A reproducer of the issue is present there. I believe the root cause was introducing the avr-none target (which has no CPU by default) while also trying to get the ISA revision from the target spec. This commit uses the `target-cpu` option instead, which is already required to be present for the target. r? compiler cc ``@Patryk27``
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/metadata.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/metadata.rs b/compiler/rustc_codegen_ssa/src/back/metadata.rs index 236507ac0cd..3aacbcde1a7 100644 --- a/compiler/rustc_codegen_ssa/src/back/metadata.rs +++ b/compiler/rustc_codegen_ssa/src/back/metadata.rs @@ -373,7 +373,11 @@ pub(crate) fn create_object_file(sess: &Session) -> Option<write::Object<'static Architecture::Avr => { // Resolve the ISA revision and set // the appropriate EF_AVR_ARCH flag. - ef_avr_arch(&sess.target.options.cpu) + if let Some(ref cpu) = sess.opts.cg.target_cpu { + ef_avr_arch(cpu) + } else { + bug!("AVR CPU not explicitly specified") + } } Architecture::Csky => { let e_flags = match sess.target.options.abi.as_ref() { |