Skip to content

Commit bbe6a25

Browse files
authored
[ATfE] Remove unaligned variants of Armv6-M (#263)
The Armv6-M architecture does not support unaligned memory accesses, so these variants are pretty much identical to their aligned counterparts. This patch removes the unaligned variants and adjust the multilib flags for compatibility.
1 parent eab783c commit bbe6a25

File tree

3 files changed

+2
-92
lines changed

3 files changed

+2
-92
lines changed

arm-software/embedded/arm-multilib/json/multilib.json

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,25 +140,15 @@
140140
"json": "armv5te.json",
141141
"flags": "--target=armv5e-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti"
142142
},
143-
{
144-
"variant": "armv6m_soft_nofp_exn_rtti_unaligned",
145-
"json": "armv6m_soft_nofp_exn_rtti_unaligned.json",
146-
"flags": "--target=thumbv6m-unknown-none-eabi -mfpu=none"
147-
},
148143
{
149144
"variant": "armv6m_soft_nofp_exn_rtti",
150145
"json": "armv6m_soft_nofp_exn_rtti.json",
151-
"flags": "--target=thumbv6m-unknown-none-eabi -mfpu=none -mno-unaligned-access"
152-
},
153-
{
154-
"variant": "armv6m_soft_nofp_unaligned",
155-
"json": "armv6m_soft_nofp_unaligned.json",
156-
"flags": "--target=thumbv6m-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti"
146+
"flags": "--target=thumbv6m-unknown-none-eabi -mfpu=none"
157147
},
158148
{
159149
"variant": "armv6m_soft_nofp",
160150
"json": "armv6m_soft_nofp.json",
161-
"flags": "--target=thumbv6m-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti -mno-unaligned-access"
151+
"flags": "--target=thumbv6m-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti"
162152
},
163153
{
164154
"variant": "armebv6m_soft_nofp_exn_rtti",

arm-software/embedded/arm-multilib/json/variants/armv6m_soft_nofp_exn_rtti_unaligned.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

arm-software/embedded/arm-multilib/json/variants/armv6m_soft_nofp_unaligned.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)