aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-04-29 19:40:49 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-04-29 19:40:49 +0000
commit4b07f524cb8f8c2aec98dc7840f8c29acf562293 (patch)
tree2fa4ee8ee515151cdeaca3b4f484b79adc705152
parent380033400ef8edf433bd5c3006dcec183eab2104 (diff)
downloadupstream-4b07f524cb8f8c2aec98dc7840f8c29acf562293.tar.gz
upstream-4b07f524cb8f8c2aec98dc7840f8c29acf562293.tar.bz2
upstream-4b07f524cb8f8c2aec98dc7840f8c29acf562293.zip
change default toolchain to gcc 3.4.3 and binutils 2.15.94.0.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@767 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--toolchain/binutils/Config.in7
-rw-r--r--toolchain/gcc/Config.in6
2 files changed, 7 insertions, 6 deletions
diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 138b01aa9f..7673feae92 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -6,7 +6,7 @@ endif
choice
prompt "Binutils Version" if CONFIG_DEVEL
- default BR2_BINUTILS_VERSION_2_14_90_0_8
+ default BR2_BINUTILS_VERSION_2_15_94_0_2
help
Select the version of binutils you wish to use.
@@ -54,7 +54,7 @@ endchoice
config BR2_BINUTILS_VERSION
string
- default "2.14.90.0.8" if BR2_BINUTILS_VERSION_2_14_90_0_8 || !CONFIG_DEVEL
+ default "2.14.90.0.8" if BR2_BINUTILS_VERSION_2_14_90_0_8
default "2.15" if BR2_BINUTILS_VERSION_2_15
default "2.15.90.0.1" if BR2_BINUTILS_VERSION_2_15_90_0_1
default "2.15.90.0.0.1.1" if BR2_BINUTILS_VERSION_2_15_90_0_1_1
@@ -64,5 +64,6 @@ config BR2_BINUTILS_VERSION
default "2.15.91.0.2" if BR2_BINUTILS_VERSION_2_15_91_0_2
default "2.15.92.0.2" if BR2_BINUTILS_VERSION_2_15_92_0_2
default "2.15.94.0.1" if BR2_BINUTILS_VERSION_2_15_94_0_1
- default "2.15.94.0.2" if BR2_BINUTILS_VERSION_2_15_94_0_2
+ default "2.15.94.0.2" if BR2_BINUTILS_VERSION_2_15_94_0_2 || !CONFIG_DEVEL
+ default "2.15.94.0.2.2" if BR2_BINUTILS_VERSION_2_15_94_0_2_2
default "2.16.90.0.1" if BR2_BINUTILS_VERSION_2_16_90_0_1
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 1188dba047..ab16c7feca 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -14,7 +14,7 @@ config BR2_GCC_3_4
choice
prompt "GCC compiler Version" if CONFIG_DEVEL
- default BR2_GCC_VERSION_3_3_5
+ default BR2_GCC_VERSION_3_4_3
help
Select the version of gcc you wish to use.
@@ -33,8 +33,8 @@ endchoice
config BR2_GCC_VERSION
string
- default "3.3.5" if BR2_GCC_VERSION_3_3_5 || !CONFIG_DEVEL
- default "3.4.3" if BR2_GCC_VERSION_3_4_3
+ default "3.3.5" if BR2_GCC_VERSION_3_3_5
+ default "3.4.3" if BR2_GCC_VERSION_3_4_3 || !CONFIG_DEVEL
default "4.0.0" if BR2_GCC_VERSION_4_0_0