authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-10-07 01:56:42+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-10-07 01:56:42+02:00
logaa8f39e2711dc2e9659e1c4d7388467c45271836
treec621e84dbdda92d5ca1a271f5a99b66843cacba2
parent790fc8cd98020c26b65a4af69e25c4e853d463be
parent770aa54579130bd539670ebad18534e1bb2f6e80
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #21614 from alexrp/target-avr-align

`std.Target`: Fix `cTypePreferredAlignment()` to always return 1 for avr.

1 files changed, 7 insertions(+), 8 deletions(-)

lib/std/Target.zig+7-8
......@@ -2637,7 +2637,6 @@ pub fn cTypeAlignment(target: Target, c_type: CType) u16 {
26372637 },
26382638
26392639 .msp430,
2640 .avr,
26412640 => 2,
26422641
26432642 .arc,
......@@ -2686,6 +2685,9 @@ pub fn cTypeAlignment(target: Target, c_type: CType) u16 {
26862685 .wasm32,
26872686 .wasm64,
26882687 => 16,
2688
2689 .avr,
2690 => unreachable, // Handled above.
26892691 }),
26902692 );
26912693}
......@@ -2720,12 +2722,7 @@ pub fn cTypePreferredAlignment(target: Target, c_type: CType) u16 {
27202722 .longdouble => return 4,
27212723 else => {},
27222724 },
2723 .avr => switch (c_type) {
2724 .char, .int, .uint, .long, .ulong, .float, .longdouble => return 1,
2725 .short, .ushort => return 2,
2726 .double => return 4,
2727 .longlong, .ulonglong => return 8,
2728 },
2725 .avr => return 1,
27292726 .x86 => switch (target.os.tag) {
27302727 .windows, .uefi => switch (c_type) {
27312728 .longdouble => switch (target.abi) {
......@@ -2761,7 +2758,6 @@ pub fn cTypePreferredAlignment(target: Target, c_type: CType) u16 {
27612758 .arc,
27622759 .arm,
27632760 .armeb,
2764 .avr,
27652761 .thumb,
27662762 .thumbeb,
27672763 .amdgcn,
......@@ -2799,6 +2795,9 @@ pub fn cTypePreferredAlignment(target: Target, c_type: CType) u16 {
27992795 .wasm32,
28002796 .wasm64,
28012797 => 16,
2798
2799 .avr,
2800 => unreachable, // Handled above.
28022801 }),
28032802 );
28042803}