From d3f383b1eeafa11b093d7a5626d375d07ed2c3d7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 14 Dec 2009 12:15:36 +0100 Subject: gcc: add avr32 special version * Add new gcc version 4.2.2-avr32-2.1.5 in Config.in * Select the Atmel mirror to download gcc with avr32 in their version name, in gcc-uclibc-*.mk * Do not apply patches if the patch directory is empty, in gcc-uclibc-*.mk Signed-off-by: Thomas Petazzoni --- toolchain/gcc/Config.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'toolchain/gcc/Config.in') diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 7e5851620..3d3da46ec 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -26,6 +26,10 @@ choice depends on BR2_DEPRECATED || BR2_avr32 bool "gcc 4.2.2" + config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 + depends on BR2_avr32 + bool "gcc 4.2.2-avr32-2.1.5" + config BR2_GCC_VERSION_4_2_3 depends on !BR2_nios2 depends on BR2_EXT_GCC_VERSION_4_2_3 @@ -66,7 +70,7 @@ config BR2_GCC_SUPPORTS_SYSROOT config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE bool - default y if !BR2_GCC_VERSION_4_1_2 && !BR2_GCC_VERSION_4_2_1 && !BR2_GCC_VERSION_4_2_2 && !BR2_GCC_VERSION_4_2_3 && !BR2_GCC_VERSION_4_2_4 + default y if !BR2_GCC_VERSION_4_1_2 && !BR2_GCC_VERSION_4_2_1 && !BR2_GCC_VERSION_4_2_2 && !BR2_GCC_VERSION_4_2_3 && !BR2_GCC_VERSION_4_2_4 && !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 config BR2_GCC_SNAP_DATE string "GCC snapshot date" @@ -81,6 +85,7 @@ config BR2_GCC_VERSION default "4.1.2" if BR2_GCC_VERSION_4_1_2 default "4.2.1" if BR2_GCC_VERSION_4_2_1 default "4.2.2" if BR2_GCC_VERSION_4_2_2 + default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 default "4.2.3" if BR2_GCC_VERSION_4_2_3 default "4.2.4" if BR2_GCC_VERSION_4_2_4 default "4.3.2" if BR2_GCC_VERSION_4_3_2 -- cgit v1.2.3 From 5c6ccd9f20a9aec2d26bcbb32f17a027b333ace3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 14 Dec 2009 11:57:14 +0100 Subject: gcc: on avr32, only allow avr32 gcc versions Remove references to BR2_EXT_GCC_VERSION_* configuration options, and only allows special avr32 gcc versions on the AVR32 architecture. Signed-off-by: Thomas Petazzoni --- toolchain/gcc/Config.in | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'toolchain/gcc/Config.in') diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 3d3da46ec..07e42a6da 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -10,20 +10,18 @@ choice Select the version of gcc you wish to use. config BR2_GCC_VERSION_4_1_2 - depends on !BR2_nios2 - depends on BR2_EXT_GCC_VERSION_4_1_2 + depends on !BR2_nios2 && !BR2_avr32 depends on BR2_DEPRECATED bool "gcc 4.1.2" config BR2_GCC_VERSION_4_2_1 - depends on !BR2_nios2 - depends on BR2_EXT_GCC_VERSION_4_2_1 + depends on !BR2_nios2 && !BR2_avr32 depends on BR2_DEPRECATED bool "gcc 4.2.1" config BR2_GCC_VERSION_4_2_2 - depends on BR2_EXT_GCC_VERSION_4_2_2 - depends on BR2_DEPRECATED || BR2_avr32 + depends on !BR2_avr32 + depends on BR2_DEPRECATED bool "gcc 4.2.2" config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 @@ -31,9 +29,8 @@ choice bool "gcc 4.2.2-avr32-2.1.5" config BR2_GCC_VERSION_4_2_3 - depends on !BR2_nios2 - depends on BR2_EXT_GCC_VERSION_4_2_3 - depends on BR2_DEPRECATED || BR2_avr32 + depends on !BR2_nios2 && !BR2_avr32 + depends on BR2_DEPRECATED bool "gcc 4.2.3" config BR2_GCC_VERSION_4_2_4 -- cgit v1.2.3 From 636afc4664238b9555411622f45ff4d00ceffcde Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 14 Dec 2009 11:59:44 +0100 Subject: gcc: improve configuration for snapshot versions Make the selection of a snapshot version a normal gcc version choice, and make sure BR2_GCC_VERSION is properly defined. Signed-off-by: Thomas Petazzoni --- toolchain/gcc/Config.in | 11 ++++++----- toolchain/gcc/Makefile.in | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'toolchain/gcc/Config.in') diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 07e42a6da..10cb841a1 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -55,11 +55,11 @@ choice config BR2_GCC_VERSION_4_4_X depends on !BR2_avr32 && !BR2_nios2 bool "gcc 4.4.x" -endchoice -config BR2_GCC_IS_SNAP - depends on !BR2_avr32 - bool + config BR2_GCC_VERSION_SNAP + depends on !BR2_avr32 && !BR2_nios2 + bool "gcc snapshot" +endchoice config BR2_GCC_SUPPORTS_SYSROOT bool @@ -72,7 +72,7 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE config BR2_GCC_SNAP_DATE string "GCC snapshot date" default "20070921" - depends on BR2_GCC_IS_SNAP + depends on BR2_GCC_VERSION_SNAP help Enter snapshot date to use for gcc. Format is: YYYYMMDD @@ -89,6 +89,7 @@ config BR2_GCC_VERSION default "4.3.3" if BR2_GCC_VERSION_4_3_3 default "4.3.4" if BR2_GCC_VERSION_4_3_4 default "4.4.2" if BR2_GCC_VERSION_4_4_X + default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP config BR2_TOOLCHAIN_SYSROOT bool "Enable toolchain with --sysroot support" diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in index e92ecbc7b..c3e21cf35 100644 --- a/toolchain/gcc/Makefile.in +++ b/toolchain/gcc/Makefile.in @@ -8,7 +8,7 @@ GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION)) TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION)) EXTRA_GCC_CONFIG_OPTIONS:=$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS)) -ifeq ($(call qstrip,$(BR2_GCC_IS_SNAP)),y) +ifeq ($(call qstrip,$(BR2_GCC_VERSION_SNAP)),y) GCC_SNAP_DATE:=$(call qstrip,$(BR2_GCC_SNAP_DATE)) else GCC_SNAP_DATE:= -- cgit v1.2.3