diff options
| author | Jubilee <workingjubilee@gmail.com> | 2024-10-04 14:11:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-04 14:11:35 -0700 |
| commit | ff57e0b24e959a08b3f67283b91c4e9e42ee89c8 (patch) | |
| tree | af576832a60c6e0992a3ce2521ef99c6c6a3a5d0 | |
| parent | 554daa007f663944b3411ea0713062c2646a006f (diff) | |
| parent | 033fdda46c55ece534fdd5aabf0c1e70bb73b1ee (diff) | |
| download | rust-ff57e0b24e959a08b3f67283b91c4e9e42ee89c8.tar.gz rust-ff57e0b24e959a08b3f67283b91c4e9e42ee89c8.zip | |
Rollup merge of #131171 - madsmtm:target-info-avr-env, r=petrochenkov
Fix `target_env` in `avr-unknown-gnu-atmega328` The target name itself contains GNU, we should probably reflect that as `target_env = "gnu"` as well? Or from my reading of https://github.com/rust-lang/rust/pull/74941#issuecomment-712219034, perhaps not, but then that should probably be documented somewhere? There's no listed target maintainer, but the target was introduced in https://github.com/rust-lang/rust/pull/74941, so I'll ping the author of that: `@dylanmckay` Relatedly, I wonder _why_ the recommendation is to [create separate target triples for each AVR](https://github.com/Rahix/avr-hal/tree/main/avr-specs), when `-Ctarget-cpu=...` would suffice, perhaps you could also elaborate on that? Was it just because `-Ctarget-cpu=...` didn't exist back then? If so, now that it does, should we now change the target back to e.g. `avr-unknown-none-gnu`, and require the user to set `-Ctarget-cpu=...` instead?
| -rw-r--r-- | compiler/rustc_target/src/spec/base/avr_gnu.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_target/src/spec/base/avr_gnu.rs b/compiler/rustc_target/src/spec/base/avr_gnu.rs index fb97738618b..4f348af21ad 100644 --- a/compiler/rustc_target/src/spec/base/avr_gnu.rs +++ b/compiler/rustc_target/src/spec/base/avr_gnu.rs @@ -19,6 +19,8 @@ pub(crate) fn target(target_cpu: &'static str, mmcu: &'static str) -> Target { llvm_target: "avr-unknown-unknown".into(), pointer_width: 16, options: TargetOptions { + env: "gnu".into(), + c_int_width: "16".into(), cpu: target_cpu.into(), exe_suffix: ".elf".into(), |
