toolchain/gcc: Introduce BR2_ARCH_HAS_NO_GCC_x_y
PATCH 1/1 toolchain/gcc: Introduce BR2_ARCH_HAS_NO_GCC_x_y
This patch eliminates the long "depends on" lines in toolchain/gcc/Config.in by letting architectures specify which GCC versions they do not support.
--- arch/Config.in | 7 +++++++ arch/Config.in.arc | 7 +++++++ arch/Config.in.arm | 15 +++++++++++++++ arch/Config.in.powerpc | 9 +++++++++ arch/Config.in.sparc | 24 ++++++++++++++++++++++++ arch/Config.in.x86 | 2 ++ toolchain/gcc/Config.in | 42 +++++++++++++++++++++++++++++++++++------- 7 files changed, 99 insertions(+), 7 deletions(-)
arch/Config.in +7 -0
@@ -48,6 +48,13 @@ config BR2_aarch64 config BR2_avr32 bool "AVR32" select BR2_SOFT_FLOAT + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_4 + select BR2_ARCH_HAS_NO_GCC_4_5 + select BR2_ARCH_HAS_NO_GCC_4_6 + select BR2_ARCH_HAS_NO_GCC_4_7 + select BR2_ARCH_HAS_NO_GCC_4_8 + select BR2_ARCH_HAS_NO_GCC_SNAP help The AVR32 is a 32-bit RISC microprocessor architecture designed by Atmel.
arch/Config.in.arc +7 -0
@@ -5,6 +5,13 @@ config BR2_ARCH config BR2_arc bool default y if BR2_arcle || BR2_arceb + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_4 + select BR2_ARCH_HAS_NO_GCC_4_5 + select BR2_ARCH_HAS_NO_GCC_4_6 + select BR2_ARCH_HAS_NO_GCC_4_7 + select BR2_ARCH_HAS_NO_GCC_4_8 + select BR2_ARCH_HAS_NO_GCC_SNAP config BR2_ENDIAN default "LITTLE" if BR2_arcle
arch/Config.in.arm +15 -0
@@ -36,19 +36,34 @@ config BR2_arm1176jzf_s config BR2_cortex_a5 bool "cortex-A5" select BR2_ARM_CPU_MAYBE_HAS_NEON + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_4 config BR2_cortex_a8 bool "cortex-A8" select BR2_ARM_CPU_HAS_NEON + select BR2_ARCH_HAS_NO_GCC_4_3 config BR2_cortex_a9 bool "cortex-A9" select BR2_ARM_CPU_MAYBE_HAS_NEON + select BR2_ARCH_HAS_NO_GCC_4_3 config BR2_cortex_a15 bool "cortex-A15" select BR2_ARM_CPU_HAS_NEON + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_4 + select BR2_ARCH_HAS_NO_GCC_4_5 config BR2_fa526 bool "fa526/626" + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_4 + select BR2_ARCH_HAS_NO_GCC_4_5 config BR2_pj4 bool "pj4" + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_4 + select BR2_ARCH_HAS_NO_GCC_4_5 + select BR2_ARCH_HAS_NO_GCC_4_6 + select BR2_ARCH_HAS_NO_GCC_4_7 config BR2_strongarm bool "strongarm sa110/sa1100" config BR2_xscale
arch/Config.in.powerpc +9 -0
@@ -20,12 +20,18 @@ config BR2_powerpc_440fp bool "440 with FPU" config BR2_powerpc_464 bool "464" + select BR2_ARCH_HAS_NO_GCC_4_3 config BR2_powerpc_464fp bool "464 with FPU" + select BR2_ARCH_HAS_NO_GCC_4_3 config BR2_powerpc_476 bool "476" + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_4 config BR2_powerpc_476fp bool "476 with FPU" + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_4 config BR2_powerpc_505 bool "505" config BR2_powerpc_601
@@ -66,10 +72,13 @@ config BR2_powerpc_8548 bool "8548 / e500v2" config BR2_powerpc_e300c2 bool "e300c2" + select BR2_ARCH_HAS_NO_GCC_4_3 config BR2_powerpc_e300c3 bool "e300c3" + select BR2_ARCH_HAS_NO_GCC_4_3 config BR2_powerpc_e500mc bool "e500mc" + select BR2_ARCH_HAS_NO_GCC_4_3 endchoice choice
arch/Config.in.sparc +24 -0
@@ -9,12 +9,36 @@ config BR2_sparc_v8 bool "v8" config BR2_sparc_sparchfleon bool "hfleon" + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_5 + select BR2_ARCH_HAS_NO_GCC_4_6 + select BR2_ARCH_HAS_NO_GCC_4_7 + select BR2_ARCH_HAS_NO_GCC_4_8 + select BR2_ARCH_HAS_NO_GCC_SNAP config BR2_sparc_sparchfleonv8 bool "hfleonv8" + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_5 + select BR2_ARCH_HAS_NO_GCC_4_6 + select BR2_ARCH_HAS_NO_GCC_4_7 + select BR2_ARCH_HAS_NO_GCC_4_8 + select BR2_ARCH_HAS_NO_GCC_SNAP config BR2_sparc_sparcsfleon bool "sfleon" + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_5 + select BR2_ARCH_HAS_NO_GCC_4_6 + select BR2_ARCH_HAS_NO_GCC_4_7 + select BR2_ARCH_HAS_NO_GCC_4_8 + select BR2_ARCH_HAS_NO_GCC_SNAP config BR2_sparc_sparcsfleonv8 bool "sfleonv8" + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_5 + select BR2_ARCH_HAS_NO_GCC_4_6 + select BR2_ARCH_HAS_NO_GCC_4_7 + select BR2_ARCH_HAS_NO_GCC_4_8 + select BR2_ARCH_HAS_NO_GCC_SNAP endchoice config BR2_ARCH
arch/Config.in.x86 +2 -0
@@ -86,6 +86,8 @@ config BR2_x86_atom select BR2_X86_CPU_HAS_SSE2 select BR2_X86_CPU_HAS_SSE3 select BR2_X86_CPU_HAS_SSSE3 + select BR2_ARCH_HAS_NO_GCC_4_3 + select BR2_ARCH_HAS_NO_GCC_4_4 config BR2_x86_k6 bool "k6" select BR2_X86_CPU_HAS_MMX
toolchain/gcc/Config.in +35 -7
76 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 1/1 toolchain/gcc: Introduce BR2_ARCH_HAS_NO_GCC_x_y
Quoted 5 lines · Mischa Jonker
This patch eliminates the long "depends on" lines in toolchain/gcc/Config.in by letting architectures specify which GCC versions they do not support.
Signed-off-by Mischa Jonker <[email protected]>
Quoted 9 lines
--- arch/Config.in | 7 +++++++ arch/Config.in.arc | 7 +++++++ arch/Config.in.arm | 15 +++++++++++++++ arch/Config.in.powerpc | 9 +++++++++ arch/Config.in.sparc | 24 ++++++++++++++++++++++++ arch/Config.in.x86 | 2 ++ toolchain/gcc/Config.in | 42 +++++++++++++++++++++++++++++++++++------- 7 files changed, 99 insertions(+), 7 deletions(-)
This diffstat looks a lot better already. Of course, the 7 deletions
are a bit misleading, it's actually something like 50 deletions (due to lack of newlines).
[snip]
toolchain/gcc/Config.in choice · line 85
Quoted 12 lines
config
BR2_GCC_VERSION_4_8_Xtoolchain/gcc/Config.in +2
-2- depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 + depends on !BR2_ARCH_HAS_NO_GCC_4_8 select BR2_GCC_NEEDS_MPC bool "gcc 4.8.x" config BR2_GCC_VERSION_SNAP - depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 + depends on !BR2_ARCH_HAS_NO_GCC_SNAP select BR2_GCC_NEEDS_MPC bool "gcc snapshot" endchoice
For the cases which will only ever support one specific gcc version
(arc (until it's upstreamed), avr32, and leon), I think it makes more sense to disable the choice completely.
choice
prompt "GCC compiler Version" if BR2_sparc_sparchfleon || \
BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || \
BR2_sparc_sparcsfleonv8 || BR2_avr32 || BR2_arc
default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || \
BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || \
BR2_sparc_sparcsfleonv8
default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr32
default BR2_GCC_VERSION_4_4_7_ARC if BR2_arc
default BR2_GCC_VERSION_4_7_X Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F