add gcc 4.0.1, remove older compilers

SVN-Revision: 1422
2005-07-12 19:23:12 +00:00 · 2005-07-12 19:23:12 +00:00 · e79dc74f12
commit e79dc74f12
parent a135dc88bf
3 changed files with 3607 additions and 10 deletions
--- a/openwrt/toolchain/gcc/4.0.1/100-uclibc-conf.patch
+++ b/openwrt/toolchain/gcc/4.0.1/100-uclibc-conf.patch
@ -0,0 +1,410 @@
+diff -urN gcc-4.1.0/boehm-gc/configure gcc-4.1.0-patched/boehm-gc/configure
+--- gcc-4.1.0/boehm-gc/configure	2005-04-13 19:31:24.000000000 -0500
+++ gcc-4.1.0-patched/boehm-gc/configure	2005-04-25 20:47:19.919723167 -0500
+@@ -4320,6 +4320,11 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+linux-uclibc*)
+  lt_cv_deplibs_check_method=pass_all
+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
+  ;;
+
+ netbsd* | knetbsd*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
+diff -urN gcc-4.1.0/gcc/config/arm/linux-elf.h gcc-4.1.0-patched/gcc/config/arm/linux-elf.h
+--- gcc-4.1.0/gcc/config/arm/linux-elf.h	2005-03-02 10:27:42.000000000 -0600
+++ gcc-4.1.0-patched/gcc/config/arm/linux-elf.h	2005-04-25 20:45:31.795953620 -0500
+@@ -82,6 +82,18 @@
+   "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
+ 
+ #undef  LINK_SPEC
+#ifdef USE_UCLIBC
+#define LINK_SPEC "%{h*} %{version:-v} \
+   %{b} %{Wl,*:%*} \
+   %{static:-Bstatic} \
+   %{shared:-shared} \
+   %{symbolic:-Bsymbolic} \
+   %{rdynamic:-export-dynamic} \
+   %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0} \
+   -X \
+   %{mbig-endian:-EB}" \
+   SUBTARGET_EXTRA_LINK_SPEC
+#else
+ #define LINK_SPEC "%{h*} %{version:-v} \
+    %{b} %{Wl,*:%*} \
+    %{static:-Bstatic} \
+@@ -92,6 +104,7 @@
+    -X \
+    %{mbig-endian:-EB}" \
+    SUBTARGET_EXTRA_LINK_SPEC
+#endif
+ 
+ #define TARGET_OS_CPP_BUILTINS()		\
+   do						\
+diff -urN gcc-4.1.0/gcc/config/cris/linux.h gcc-4.1.0-patched/gcc/config/cris/linux.h
+--- gcc-4.1.0/gcc/config/cris/linux.h	2005-04-23 23:01:27.000000000 -0500
+++ gcc-4.1.0-patched/gcc/config/cris/linux.h	2005-04-25 20:45:31.796953451 -0500
+@@ -73,6 +73,25 @@
+ #undef CRIS_DEFAULT_CPU_VERSION
+ #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
+ 
+#ifdef USE_UCLIBC
+
+#undef CRIS_SUBTARGET_VERSION
+#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
+
+#undef CRIS_LINK_SUBTARGET_SPEC
+#define CRIS_LINK_SUBTARGET_SPEC \
+ "-mcrislinux\
+  -rpath-link include/asm/../..%s\
+  %{shared} %{static}\
+  %{symbolic:-Bdynamic} %{shlib:-Bdynamic} %{static:-Bstatic}\
+  %{!shared: \
+    %{!static: \
+      %{rdynamic:-export-dynamic} \
+      %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}} \
+  %{!r:%{O2|O3: --gc-sections}}"
+
+#else  /* USE_UCLIBC */
+
+ #undef CRIS_SUBTARGET_VERSION
+ #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
+ 
+@@ -87,6 +106,8 @@
+   %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\
+   %{!r:%{O2|O3: --gc-sections}}"
+ 
+#endif  /* USE_UCLIBC */
+
+ 
+ /* Node: Run-time Target */
+ 
+diff -urN gcc-4.1.0/gcc/config/cris/t-linux-uclibc gcc-4.1.0-patched/gcc/config/cris/t-linux-uclibc
+--- gcc-4.1.0/gcc/config/cris/t-linux-uclibc	1969-12-31 18:00:00.000000000 -0600
+++ gcc-4.1.0-patched/gcc/config/cris/t-linux-uclibc	2005-04-25 20:45:31.797953283 -0500
+@@ -0,0 +1,3 @@
+T_CFLAGS = -DUSE_UCLIBC
+TARGET_LIBGCC2_CFLAGS += -fPIC
+CRTSTUFF_T_CFLAGS_S = $(TARGET_LIBGCC2_CFLAGS)
+diff -urN gcc-4.1.0/gcc/config/i386/linux.h gcc-4.1.0-patched/gcc/config/i386/linux.h
+--- gcc-4.1.0/gcc/config/i386/linux.h	2004-11-27 10:45:14.000000000 -0600
+++ gcc-4.1.0-patched/gcc/config/i386/linux.h	2005-04-25 21:21:05.828409973 -0500
+@@ -104,8 +104,13 @@
+ 
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+#if defined USE_UCLIBC
+#define LINK_EMULATION "elf_i386"
+#define DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#else
+ #define LINK_EMULATION "elf_i386"
+ #define DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#endif
+ 
+ #undef  SUBTARGET_EXTRA_SPECS
+ #define SUBTARGET_EXTRA_SPECS \
+@@ -144,6 +149,7 @@
+     }									\
+   } while (0)
+ #endif
+#endif
+ 
+ /* Handle special EH pointer encodings.  Absolute, pc-relative, and
+    indirect are handled automatically.  */
+diff -urN gcc-4.1.0/gcc/config/mips/linux.h gcc-4.1.0-patched/gcc/config/mips/linux.h
+--- gcc-4.1.0/gcc/config/mips/linux.h	2005-01-25 20:04:46.000000000 -0600
+++ gcc-4.1.0-patched/gcc/config/mips/linux.h	2005-04-25 20:45:31.809951259 -0500
+@@ -108,6 +108,17 @@
+ 
+ /* Borrowed from sparc/linux.h */
+ #undef LINK_SPEC
+#ifdef USE_UCLIBC
+#define LINK_SPEC \
+ "%(endian_spec) \
+  %{shared:-shared} \
+  %{!shared: \
+    %{!ibcs: \
+      %{!static: \
+        %{rdynamic:-export-dynamic} \
+        %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
+        %{static:-static}}}"
+#else
+ #define LINK_SPEC \
+  "%(endian_spec) \
+   %{shared:-shared} \
+@@ -117,6 +128,7 @@
+         %{rdynamic:-export-dynamic} \
+         %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
+         %{static:-static}}}"
+#endif
+ 
+ #undef SUBTARGET_ASM_SPEC
+ #define SUBTARGET_ASM_SPEC "%{mabi=64: -64} %{!mno-abicalls:-KPIC}"
+diff -urN gcc-4.1.0/gcc/config/rs6000/linux.h gcc-4.1.0-patched/gcc/config/rs6000/linux.h
+--- gcc-4.1.0/gcc/config/rs6000/linux.h	2004-12-01 20:21:28.000000000 -0600
+++ gcc-4.1.0-patched/gcc/config/rs6000/linux.h	2005-04-25 20:45:31.810951091 -0500
+@@ -69,7 +69,11 @@
+ #define LINK_START_DEFAULT_SPEC "%(link_start_linux)"
+ 
+ #undef	LINK_OS_DEFAULT_SPEC
+#ifdef USE_UCLIBC
+#define LINK_OS_DEFAULT_SPEC "%(link_os_linux_uclibc)"
+#else
+ #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
+#endif
+ 
+ #define LINK_GCC_C_SEQUENCE_SPEC \
+   "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
+diff -urN gcc-4.1.0/gcc/config/rs6000/sysv4.h gcc-4.1.0-patched/gcc/config/rs6000/sysv4.h
+--- gcc-4.1.0/gcc/config/rs6000/sysv4.h	2005-04-13 19:26:50.000000000 -0500
+++ gcc-4.1.0-patched/gcc/config/rs6000/sysv4.h	2005-04-25 20:45:31.812950754 -0500
+@@ -957,6 +957,7 @@
+   mcall-linux  : %(link_os_linux)       ; \
+   mcall-gnu    : %(link_os_gnu)         ; \
+   mcall-netbsd : %(link_os_netbsd)      ; \
+  mcall-linux-uclibc : %(link_os_linux_uclibc); \
+   mcall-openbsd: %(link_os_openbsd)     ; \
+                : %(link_os_default)     }"
+ 
+@@ -1135,6 +1136,10 @@
+   %{rdynamic:-export-dynamic} \
+   %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
+ 
+#define LINK_OS_LINUX_UCLIBC_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+  %{rdynamic:-export-dynamic} \
+  %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}}"
+
+ #if defined(HAVE_LD_EH_FRAME_HDR)
+ # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
+ #endif
+@@ -1301,6 +1306,7 @@
+   { "link_os_sim",		LINK_OS_SIM_SPEC },			\
+   { "link_os_freebsd",		LINK_OS_FREEBSD_SPEC },			\
+   { "link_os_linux",		LINK_OS_LINUX_SPEC },			\
+  { "link_os_linux_uclibc",	LINK_OS_LINUX_UCLIBC_SPEC },		\
+   { "link_os_gnu",		LINK_OS_GNU_SPEC },			\
+   { "link_os_netbsd",		LINK_OS_NETBSD_SPEC },			\
+   { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
+diff -urN gcc-4.1.0/gcc/config/sh/linux.h gcc-4.1.0-patched/gcc/config/sh/linux.h
+--- gcc-4.1.0/gcc/config/sh/linux.h	2005-02-28 21:39:03.000000000 -0600
+++ gcc-4.1.0-patched/gcc/config/sh/linux.h	2005-04-25 20:45:31.814950416 -0500
+@@ -55,12 +55,21 @@
+ #undef SUBTARGET_LINK_EMUL_SUFFIX
+ #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
+ #undef SUBTARGET_LINK_SPEC
+#ifdef USE_UCLIBC
+#define SUBTARGET_LINK_SPEC \
+  "%{shared:-shared} \
+   %{!static: \
+     %{rdynamic:-export-dynamic} \
+     %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
+   %{static:-static}"
+#else
+ #define SUBTARGET_LINK_SPEC \
+   "%{shared:-shared} \
+    %{!static: \
+      %{rdynamic:-export-dynamic} \
+      %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+    %{static:-static}"
+#endif
+ 
+ /* Output assembler code to STREAM to call the profiler.  */
+ 
+diff -urN gcc-4.1.0/gcc/config/sh/t-linux-uclibc gcc-4.1.0-patched/gcc/config/sh/t-linux-uclibc
+--- gcc-4.1.0/gcc/config/sh/t-linux-uclibc	1969-12-31 18:00:00.000000000 -0600
+++ gcc-4.1.0-patched/gcc/config/sh/t-linux-uclibc	2005-04-25 20:45:31.814950416 -0500
+@@ -0,0 +1,13 @@
+T_CFLAGS = -DUSE_UCLIBC
+
+TARGET_LIBGCC2_CFLAGS = -fpic -DNO_FPSCR_VALUES
+LIB1ASMFUNCS_CACHE = _ic_invalidate
+
+LIB2FUNCS_EXTRA=
+
+MULTILIB_OPTIONS= $(MULTILIB_ENDIAN) m3e/m4
+MULTILIB_DIRNAMES= 
+MULTILIB_MATCHES = 
+MULTILIB_EXCEPTIONS=
+
+EXTRA_MULTILIB_PARTS= crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
+diff -urN gcc-4.1.0/gcc/config/sh/t-sh64-uclibc gcc-4.1.0-patched/gcc/config/sh/t-sh64-uclibc
+--- gcc-4.1.0/gcc/config/sh/t-sh64-uclibc	1969-12-31 18:00:00.000000000 -0600
+++ gcc-4.1.0-patched/gcc/config/sh/t-sh64-uclibc	2005-04-25 20:45:31.815950248 -0500
+@@ -0,0 +1,13 @@
+EXTRA_MULTILIB_PARTS= crt1.o crti.o crtn.o crtbegin.o crtend.o
+
+LIB1ASMFUNCS = \
+  _sdivsi3 _sdivsi3_i4 _udivsi3 _udivsi3_i4 _set_fpscr \
+  _shcompact_call_trampoline _shcompact_return_trampoline \
+  _shcompact_incoming_args _ic_invalidate _nested_trampoline \
+  _push_pop_shmedia_regs \
+  _udivdi3 _divdi3 _umoddi3 _moddi3
+
+MULTILIB_OPTIONS = $(MULTILIB_ENDIAN) m5-32media-nofpu/m5-compact/m5-compact-nofpu/m5-64media/m5-64media-nofpu
+MULTILIB_DIRNAMES= $(MULTILIB_ENDIAN) nofpu compact nofpu/compact media64 nofpu/media64
+MULTILIB_MATCHES=
+MULTILIB_EXCEPTIONS=
+diff -urN gcc-4.1.0/gcc/config/t-linux-uclibc gcc-4.1.0-patched/gcc/config/t-linux-uclibc
+--- gcc-4.1.0/gcc/config/t-linux-uclibc	1969-12-31 18:00:00.000000000 -0600
+++ gcc-4.1.0-patched/gcc/config/t-linux-uclibc	2005-04-25 20:45:31.815950248 -0500
+@@ -0,0 +1,15 @@
+T_CFLAGS = -DUSE_UCLIBC
+
+# Compile crtbeginS.o and crtendS.o with pic.
+CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC
+# Compile libgcc2.a with pic.
+TARGET_LIBGCC2_CFLAGS = -fPIC
+
+# Override t-slibgcc-elf-ver to export some libgcc symbols with
+# the symbol versions that glibc used.
+#SHLIB_MAPFILES += $(srcdir)/config/libgcc-glibc.ver
+
+# Use unwind-dw2-fde
+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \
+  $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c
+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h
+diff -urN gcc-4.1.0/gcc/config.gcc gcc-4.1.0-patched/gcc/config.gcc
+--- gcc-4.1.0/gcc/config.gcc	2005-04-23 23:01:23.000000000 -0500
+++ gcc-4.1.0-patched/gcc/config.gcc	2005-04-25 21:12:43.375594576 -0500
+@@ -448,7 +448,14 @@
+   case ${enable_threads} in
+     "" | yes | posix) thread_file='posix' ;;
+   esac
+-  tmake_file="t-slibgcc-elf-ver t-linux"
+  case ${target} in
+    *-linux*uclibc*)
+      tmake_file="t-slibgcc-elf-ver t-linux-uclibc"
+      ;;
+    *)
+      tmake_file="t-slibgcc-elf-ver t-linux"
+      ;;
+  esac
+   ;;
+ *-*-gnu*)
+   # On the Hurd, the setup is just about the same on
+@@ -667,6 +674,12 @@
+ 	extra_parts=""
+ 	use_collect2=yes
+ 	;;
+arm*-*-linux-uclibc*)		# ARM GNU/Linux with ELF - uClibc
+	tm_file="dbxelf.h elfos.h linux.h arm/elf.h  arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h"
+	tmake_file="t-slibgcc-elf-ver t-linux-uclibc arm/t-linux"
+	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+	gnu_ld=yes
+	;;
+ arm*-*-linux*)			# ARM GNU/Linux with ELF
+ 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h  arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h"
+ 	tmake_file="${tmake_file} arm/t-arm arm/t-linux"
+@@ -765,6 +778,10 @@
+ 	gas=yes
+ 	extra_options="${extra_options} cris/elf.opt"
+ 	;;
+cris-*-linux-uclibc*)
+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h"
+	tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux-uclibc"
+	;;
+ cris-*-linux*)
+ 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h"
+ 	# We need to avoid using t-linux, so override default tmake_file
+@@ -1443,6 +1460,16 @@
+ 	gnu_ld=yes
+ 	gas=yes
+ 	;;
+mips*-*-linux-uclibc*)			# Linux MIPS, either endian. uClibc
+        tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h"
+	case ${target} in
+        mipsisa32*-*)
+                target_cpu_default="MASK_SOFT_FLOAT"
+		tm_defines="MIPS_ISA_DEFAULT=32"
+                ;;
+        esac
+	tmake_file="t-slibgcc-elf-ver t-linux-uclibc"
+	;;
+ mips*-*-linux*)				# Linux MIPS, either endian.
+         tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h"
+ 	case ${target} in
+@@ -1659,6 +1686,10 @@
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h"
+ 	tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+ 	;;
+powerpc-*-linux-uclibc*)
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"
+	tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux-uclibc rs6000/t-ppccomm"
+	;;
+ powerpc-*-linux*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+ 	tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+@@ -1821,6 +1852,8 @@
+ 	esac
+ 	tm_file="${tm_file} sh/elf.h"
+ 	case ${target} in
+	sh*-*-linux-uclibc*)	tmake_file="${tmake_file} t-linux-uclibc sh/t-linux-uclibc"
+			tm_file="${tm_file} linux.h sh/linux.h" ;;
+ 	sh*-*-linux*)	tmake_file="${tmake_file} sh/t-linux"
+ 			tm_file="${tm_file} linux.h sh/linux.h" ;;
+ 	sh*-*-kaos*)	tm_file="${tm_file} sh/embed-elf.h kaos.h sh/kaos-sh.h"
+@@ -1840,6 +1873,11 @@
+ 	*-*-netbsd)
+                 tmake_file="${tmake_file} sh/t-netbsd"
+ 		;;
+	sh64*-*-linux-uclibc*)
+		tmake_file="${tmake_file} sh/t-sh64-uclibc"
+		tm_file="${tm_file} sh/sh64.h"
+		extra_headers="shmedia.h ushmedia.h sshmedia.h"
+		;;
+ 	sh64*-*-linux*)
+ 		tmake_file="${tmake_file} sh/t-sh64 sh/t-linux64"
+ 		tm_file="${tm_file} sh/sh64.h"
+diff -urN gcc-4.1.0/libtool.m4 gcc-4.1.0-patched/libtool.m4
+--- gcc-4.1.0/libtool.m4	2005-04-13 19:31:24.000000000 -0500
+++ gcc-4.1.0-patched/libtool.m4	2005-04-25 20:47:51.679369687 -0500
+@@ -743,6 +743,11 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+linux-uclibc*)
+  lt_cv_deplibs_check_method=pass_all
+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
+  ;;
+
+ netbsd* | knetbsd*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
+diff -urN gcc-4.1.0/ltconfig gcc-4.1.0-patched/ltconfig
+--- gcc-4.1.0/ltconfig	2004-10-02 11:33:06.000000000 -0500
+++ gcc-4.1.0-patched/ltconfig	2005-04-25 20:45:31.836946707 -0500
+@@ -602,6 +602,7 @@
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+linux-uclibc*) ;;
+ linux-gnu*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+@@ -1273,6 +1274,24 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+linux-uclibc*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  # Note: copied from linux-gnu, and may not be appropriate.
+  hardcode_into_libs=yes
+  # Assume using the uClibc dynamic linker.
+  dynamic_linker="uClibc ld.so"
+  ;;
+
+ netbsd*)
+   need_lib_prefix=no
+   need_version=no
--- a/openwrt/toolchain/gcc/4.0.1/200-uclibc-locale.patch
+++ b/openwrt/toolchain/gcc/4.0.1/200-uclibc-locale.patch
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/toolchain/gcc/Config.in
@ -10,7 +10,7 @@ endif
 config BR2_GCC_3_4
 	bool
 	default n
-	depends BR2_GCC_VERSION_3_4_3 || BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_4_0_0
+	depends BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_4_0_0 || BR2_GCC_VERSION_4_0_1

 choice
 	prompt "GCC compiler Version" if CONFIG_DEVEL
@ -18,13 +18,6 @@ choice
 	help
 	  Select the version of gcc you wish to use.

-	config BR2_GCC_VERSION_3_3_5
-		bool "gcc 3.3.5"
-
-	config BR2_GCC_VERSION_3_4_3
-		bool "gcc 3.4.3"
-		select BR2_GCC_3_4
-
 	config BR2_GCC_VERSION_3_4_4
 		bool "gcc 3.4.4"
 		select BR2_GCC_3_4
@ -33,14 +26,17 @@ choice
 		bool "gcc 4.0.0"
 		select BR2_GCC_3_4

+	config BR2_GCC_VERSION_4_0_1
+		bool "gcc 4.0.1"
+		select BR2_GCC_3_4
+
 endchoice

 config BR2_GCC_VERSION
 	string
-	default "3.3.5"     if BR2_GCC_VERSION_3_3_5 
-	default "3.4.3"     if BR2_GCC_VERSION_3_4_3
 	default "3.4.4"     if BR2_GCC_VERSION_3_4_4 || !CONFIG_DEVEL
 	default "4.0.0"     if BR2_GCC_VERSION_4_0_0
+	default "4.0.1"     if BR2_GCC_VERSION_4_0_1


 config BR2_GCC_USE_SJLJ_EXCEPTIONS