mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-26 03:50:44 -09:00
support/scripts/gen-bootlin-toolchains: fix ARMv7 EABIhf toolchains condition
The ARMv7 EABIhf toolchains can currently be selected with ARMv8 cores selected, even when EABI is used due to how the condition is constructed. This obviously fails as those toolchains are EABIhf, causing the following build issue: Incorrect ABI setting: EABI selected, but toolchain is incompatible This is for example what happens with: BR2_arm=y BR2_cortex_a32=y BR2_ARM_EABI=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE=y In order to address this, we adjust the script generating the Bootlin toolchain package so that EABIhf is required for both ARMv7 and ARMv8. Please note that we already require BR2_arm for those toolchains, so we are *only* talking about ARMv8 cores being used in 32-bit mode. This will be needed to fix: https://autobuild.buildroot.org/results/3ce1dbd480c71b782ef722c39034cb039a036523/ Reported-by: Julien Olivain <ju.o@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
acd98af32e
commit
43a8c35a38
@@ -53,12 +53,12 @@ arches = {
|
||||
'prefix': 'arm',
|
||||
},
|
||||
'armv7-eabihf': {
|
||||
'conditions': ['BR2_arm', '(BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A'],
|
||||
'conditions': ['BR2_arm', 'BR2_ARM_EABIHF', '(BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A)'],
|
||||
'test_options': ['BR2_arm', 'BR2_cortex_a8', 'BR2_ARM_EABIHF'],
|
||||
'prefix': 'arm',
|
||||
},
|
||||
'armebv7-eabihf': {
|
||||
'conditions': ['BR2_armeb', '(BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF) || BR2_ARM_CPU_ARMV8A'],
|
||||
'conditions': ['BR2_armeb', 'BR2_ARM_EABIHF', '(BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A)'],
|
||||
'test_options': ['BR2_armeb', 'BR2_cortex_a8', 'BR2_ARM_EABIHF'],
|
||||
'prefix': 'armeb',
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user