Skip to content

Add modern AVR mcus like avr128db28 and attiny3224 #142454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions compiler/rustc_target/src/spec/base/avr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ pub fn ef_avr_arch(target_cpu: &str) -> u32 {
"attiny1624" => elf::EF_AVR_ARCH_XMEGA3,
"attiny1626" => elf::EF_AVR_ARCH_XMEGA3,
"attiny1627" => elf::EF_AVR_ARCH_XMEGA3,
"attiny3224" => elf::EF_AVR_ARCH_XMEGA3,
"attiny3226" => elf::EF_AVR_ARCH_XMEGA3,
"attiny3227" => elf::EF_AVR_ARCH_XMEGA3,
"atmega808" => elf::EF_AVR_ARCH_XMEGA3,
"atmega809" => elf::EF_AVR_ARCH_XMEGA3,
"atmega1608" => elf::EF_AVR_ARCH_XMEGA3,
Expand All @@ -331,6 +334,70 @@ pub fn ef_avr_arch(target_cpu: &str) -> u32 {
"atmega4808" => elf::EF_AVR_ARCH_XMEGA3,
"atmega4809" => elf::EF_AVR_ARCH_XMEGA3,

"avr64da28" => elf::EF_AVR_ARCH_XMEGA2,
"avr64da32" => elf::EF_AVR_ARCH_XMEGA2,
"avr64da48" => elf::EF_AVR_ARCH_XMEGA2,
"avr64da64" => elf::EF_AVR_ARCH_XMEGA2,
"avr64db28" => elf::EF_AVR_ARCH_XMEGA2,
"avr64db32" => elf::EF_AVR_ARCH_XMEGA2,
"avr64db48" => elf::EF_AVR_ARCH_XMEGA2,
"avr64db64" => elf::EF_AVR_ARCH_XMEGA2,
"avr64dd14" => elf::EF_AVR_ARCH_XMEGA2,
"avr64dd20" => elf::EF_AVR_ARCH_XMEGA2,
"avr64dd28" => elf::EF_AVR_ARCH_XMEGA2,
"avr64dd32" => elf::EF_AVR_ARCH_XMEGA2,
"avr64du28" => elf::EF_AVR_ARCH_XMEGA2,
"avr64du32" => elf::EF_AVR_ARCH_XMEGA2,
"avr64ea28" => elf::EF_AVR_ARCH_XMEGA2,
"avr64ea32" => elf::EF_AVR_ARCH_XMEGA2,
"avr64ea48" => elf::EF_AVR_ARCH_XMEGA2,
"avr64sd28" => elf::EF_AVR_ARCH_XMEGA2,
"avr64sd32" => elf::EF_AVR_ARCH_XMEGA2,
"avr64sd48" => elf::EF_AVR_ARCH_XMEGA2,

Comment on lines +337 to +357
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small style q, should this block be sorted in with avr16/avr32/avr128?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small style q, should this block be sorted in with avr16/avr32/avr128?

It is now in sync with the LLVM source order, so I prefer to not diverge from that.

"avr16dd20" => elf::EF_AVR_ARCH_XMEGA3,
"avr16dd28" => elf::EF_AVR_ARCH_XMEGA3,
"avr16dd32" => elf::EF_AVR_ARCH_XMEGA3,
"avr16du14" => elf::EF_AVR_ARCH_XMEGA3,
"avr16du20" => elf::EF_AVR_ARCH_XMEGA3,
"avr16du28" => elf::EF_AVR_ARCH_XMEGA3,
"avr16du32" => elf::EF_AVR_ARCH_XMEGA3,
"avr32da28" => elf::EF_AVR_ARCH_XMEGA3,
"avr32da32" => elf::EF_AVR_ARCH_XMEGA3,
"avr32da48" => elf::EF_AVR_ARCH_XMEGA3,
"avr32db28" => elf::EF_AVR_ARCH_XMEGA3,
"avr32db32" => elf::EF_AVR_ARCH_XMEGA3,
"avr32db48" => elf::EF_AVR_ARCH_XMEGA3,
"avr32dd14" => elf::EF_AVR_ARCH_XMEGA3,
"avr32dd20" => elf::EF_AVR_ARCH_XMEGA3,
"avr32dd28" => elf::EF_AVR_ARCH_XMEGA3,
"avr32dd32" => elf::EF_AVR_ARCH_XMEGA3,
"avr32du14" => elf::EF_AVR_ARCH_XMEGA3,
"avr32du20" => elf::EF_AVR_ARCH_XMEGA3,
"avr32du28" => elf::EF_AVR_ARCH_XMEGA3,
"avr32du32" => elf::EF_AVR_ARCH_XMEGA3,
"avr16eb14" => elf::EF_AVR_ARCH_XMEGA3,
"avr16eb20" => elf::EF_AVR_ARCH_XMEGA3,
"avr16eb28" => elf::EF_AVR_ARCH_XMEGA3,
"avr16eb32" => elf::EF_AVR_ARCH_XMEGA3,
"avr16ea28" => elf::EF_AVR_ARCH_XMEGA3,
"avr16ea32" => elf::EF_AVR_ARCH_XMEGA3,
"avr16ea48" => elf::EF_AVR_ARCH_XMEGA3,
"avr32ea28" => elf::EF_AVR_ARCH_XMEGA3,
"avr32ea32" => elf::EF_AVR_ARCH_XMEGA3,
"avr32ea48" => elf::EF_AVR_ARCH_XMEGA3,
"avr32sd20" => elf::EF_AVR_ARCH_XMEGA3,
"avr32sd28" => elf::EF_AVR_ARCH_XMEGA3,
"avr32sd32" => elf::EF_AVR_ARCH_XMEGA3,
"avr128da28" => elf::EF_AVR_ARCH_XMEGA4,
"avr128da32" => elf::EF_AVR_ARCH_XMEGA4,
"avr128da48" => elf::EF_AVR_ARCH_XMEGA4,
"avr128da64" => elf::EF_AVR_ARCH_XMEGA4,
"avr128db28" => elf::EF_AVR_ARCH_XMEGA4,
"avr128db32" => elf::EF_AVR_ARCH_XMEGA4,
"avr128db48" => elf::EF_AVR_ARCH_XMEGA4,
"avr128db64" => elf::EF_AVR_ARCH_XMEGA4,

// Unknown target CPU => Unspecified/generic code
_ => 0,
}
Expand Down
Loading