aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-06-28 20:42:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-06-28 20:42:21 +0000
commitd922f4e821da4bb7372232e04db3228331048dc9 (patch)
tree2fa2024bd91df901352596c72160385d53345319 /toolchain
parent8df096ed3e5f09cc3e6fce803e1f58347d21a8b2 (diff)
downloadmaster-187ad058-d922f4e821da4bb7372232e04db3228331048dc9.tar.gz
master-187ad058-d922f4e821da4bb7372232e04db3228331048dc9.tar.bz2
master-187ad058-d922f4e821da4bb7372232e04db3228331048dc9.zip
update magicbox target to 2.6.22-rc6, select gcc 4.2.0 as default for this target (4.1.2 segfaults at compile time)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7762 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/gcc/Config.in1
-rw-r--r--toolchain/gcc/Config.version11
2 files changed, 4 insertions, 8 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index fccb7acdc2..2c0a982a94 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,6 +3,7 @@
choice
prompt "GCC compiler Version" if TOOLCHAINOPTS
default GCC_VERSION_3_4_6 if LINUX_2_4
+ default GCC_VERSION_4_2_0 if LINUX_2_6_MAGICBOX
default GCC_VERSION_4_1_2
help
Select the version of gcc you wish to use.
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index 440b482652..0b2ac52588 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,21 +1,16 @@
config GCC_VERSION
string
- default "3.4.4" if GCC_VERSION_3_4_4
- default "3.4.5" if GCC_VERSION_3_4_5
default "3.4.6" if GCC_VERSION_3_4_6
- default "4.0.2" if GCC_VERSION_4_0_2
- default "4.0.3" if GCC_VERSION_4_0_3
- default "4.1.0" if GCC_VERSION_4_1_0
- default "4.1.1" if GCC_VERSION_4_1_1
default "4.1.2" if GCC_VERSION_4_1_2
default "4.2.0" if GCC_VERSION_4_2_0
- default "3.4.6-nonmips" if GCC_VERSION_3_4_6_nonmips
default "4.1.2"
if !TOOLCHAINOPTS
config GCC_VERSION_3_4_6
default y if LINUX_2_4
- default y if LINUX_2_6_BRCM
+
+ config GCC_VERSION_4_2_0
+ default y if LINUX_2_6_MAGICBOX
endif