Add gcc-4.3.3 and Cortex-M3

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1725 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 11 insertions, 122 deletions

diff --git a/misc/buildroot/toolchain/gcc/Config.in b/misc/buildroot/toolchain/gcc/Config.in
index 5b5414386..b8a25e64f 100644
--- a/misc/buildroot/toolchain/gcc/Config.in
+++ b/misc/buildroot/toolchain/gcc/Config.in
@@ -4,80 +4,26 @@ comment "GCC Options"
 
 choice
 	prompt "GCC compiler Version"
-	default BR2_GCC_VERSION_4_2_4 if !BR2_avr32
-	default BR2_GCC_VERSION_3_4_6 if BR2_avr32
+	default BR2_GCC_VERSION_4_3_3 if BR2_cortex_m3
+	default BR2_GCC_VERSION_4_2_4 if !BR2_avr32 && !BR2_cortex_m3
+	default BR2_GCC_VERSION_3_4_6 if BR2_avr32 && !BR2_cortex_m3
 	help
 	  Select the version of gcc you wish to use.
 
-#	config BR2_GCC_VERSION_3_3_5
-#		depends !BR2_nios2 && BR2_DEPRECATED
-#		bool "gcc 3.3.5"
-
-#	config BR2_GCC_VERSION_3_3_6
-#		depends !BR2_nios2 && BR2_DEPRECATED
-#		bool "gcc 3.3.6"
-
-#	config BR2_GCC_VERSION_3_4_2
-#		depends BR2_DEPRECATED
-#		bool "gcc 3.4.2"
-
-#	config BR2_GCC_VERSION_3_4_3
-#		depends BR2_DEPRECATED
-#		bool "gcc 3.4.3"
-
-#	config BR2_GCC_VERSION_3_4_4
-#		depends BR2_DEPRECATED
-#		bool "gcc 3.4.4"
-
-#	config BR2_GCC_VERSION_3_4_5
-#		depends BR2_DEPRECATED
-#		bool "gcc 3.4.5"
-
 	config BR2_GCC_VERSION_3_4_6
-		depends on !BR2_m32c
+		depends on !BR2_m32c && !BR2_cortex_m3
 		bool "gcc 3.4.6"
 
-#	config BR2_GCC_VERSION_4_0_0
-#		depends !BR2_nios2 && BR2_DEPRECATED
-#		bool "gcc 4.0.0"
-
-#	config BR2_GCC_VERSION_4_0_1
-#		depends !BR2_nios2 && BR2_DEPRECATED
-#		bool "gcc 4.0.1"
-
-#	config BR2_GCC_VERSION_4_0_2
-#		depends !BR2_nios2 && BR2_DEPRECATED
-#		bool "gcc 4.0.2"
-
-#	config BR2_GCC_VERSION_4_0_3
-#		depends !BR2_nios2 && BR2_DEPRECATED
-#		bool "gcc 4.0.3"
-
-#	config BR2_GCC_VERSION_4_0_4
-#		depends !BR2_nios2 && BR2_DEPRECATED
-#		bool "gcc 4.0.4"
-
-#	config BR2_GCC_VERSION_4_1_0
-#		depends !BR2_nios2 && BR2_DEPRECATED
-#		bool "gcc 4.1.0"
-
-#	config BR2_GCC_VERSION_4_1_1
-#		depends !BR2_nios2 && BR2_DEPRECATED
-#		bool "gcc 4.1.1"
-
-#	config BR2_GCC_VERSION_4_1_2
-#		depends !BR2_nios2 && BR2_DEPRECATED
-#		bool "gcc 4.1.2"
-
-#	config BR2_GCC_VERSION_4_2
-#		depends !BR2_nios2 && BR2_DEPRECATED
-#		bool "gcc 4.2"
-
 	config BR2_GCC_VERSION_4_2_4
-		depends on !BR2_avr32 && !BR2_nios2
+		depends on !BR2_avr32 && !BR2_nios2 && !BR2_cortex_m3
 		select BR2_GCC_SUPPORTS_SYSROOT
 		bool "gcc 4.2.4"
 
+	config BR2_GCC_VERSION_4_3_3
+		depends on !BR2_avr32 && !BR2_nios2
+		select BR2_GCC_SUPPORTS_SYSROOT
+		bool "gcc 4.3.3"
+
 endchoice
 
 config BR2_GCC_SUPPORTS_SYSROOT
@@ -86,37 +32,9 @@ config BR2_GCC_SUPPORTS_SYSROOT
 
 config BR2_GCC_VERSION
 	string
-#	default "3.3.5"     if BR2_GCC_VERSION_3_3_5
-#	default "3.3.6"     if BR2_GCC_VERSION_3_3_6
-#	default "3.4.2"     if BR2_GCC_VERSION_3_4_2
-#	default "3.4.3"     if BR2_GCC_VERSION_3_4_3
-#	default "3.4.4"     if BR2_GCC_VERSION_3_4_4
-#	default "3.4.5"     if BR2_GCC_VERSION_3_4_5
 	default "3.4.6"     if BR2_GCC_VERSION_3_4_6
-#	default "4.0.0"     if BR2_GCC_VERSION_4_0_0
-#	default "4.0.1"     if BR2_GCC_VERSION_4_0_1
-#	default "4.0.2"     if BR2_GCC_VERSION_4_0_2
-#	default "4.0.3"     if BR2_GCC_VERSION_4_0_3
-#	default "4.0.4"     if BR2_GCC_VERSION_4_0_4
-#	default "4.1.0"     if BR2_GCC_VERSION_4_1_0
-#	default "4.1.1"     if BR2_GCC_VERSION_4_1_1
-#	default "4.1.2"     if BR2_GCC_VERSION_4_1_2
-#	default "4.2"       if BR2_GCC_VERSION_4_2
 	default "4.2.4"     if BR2_GCC_VERSION_4_2_4
-
-#config BR2_TOOLCHAIN_SYSROOT
-#	bool "Enable toolchain with --sysroot support"
-#	depends on BR2_GCC_SUPPORTS_SYSROOT
-#	default y
-#	help
-#	  Enables --sysroot=dir for binutils and gcc.
-#	  Use dir as the logical root directory for headers and libraries.
-#	  For example, if the compiler would normally search for headers in
-#	  /usr/include and libraries in /usr/lib, it will instead search
-#	  dir/usr/include and dir/usr/lib.
-#
-#	  This does not work with gcc < 4.2.0 (4.1.2 gets
-#	  ORIGINAL_AS_FOR_TARGET wrong)
+	default "4.3.3"     if BR2_GCC_VERSION_4_3_3
 
 config BR2_GCC_USE_SJLJ_EXCEPTIONS
 	bool "Enable setjmp/longjmp exceptions?"
diff --git a/misc/buildroot/toolchain/gcc/Config.in.2 b/misc/buildroot/toolchain/gcc/Config.in.2
deleted file mode 100644
index 2275ce34b..000000000
--- a/misc/buildroot/toolchain/gcc/Config.in.2
+++ /dev/null
@@ -1,15 +0,0 @@
-config BR2_PACKAGE_GCC_TARGET
-	bool "native toolchain in the target filesystem"
-	default n
-	help
-	  If you want the target system to be able to run 
-	  binutils/gcc and compile native code, say Y here.
-
-config BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS
-	string "Additional target gcc options"
-	default ""
-	depends on BR2_PACKAGE_GCC_TARGET
-	help
-	  Any additional target gcc options you may want to include....
-	  Including, but not limited to --disable-checking etc.
-	  Refer to */configure in your gcc sources.
diff --git a/misc/buildroot/toolchain/gcc/Makefile.in b/misc/buildroot/toolchain/gcc/Makefile.in
index 54b81a51b..895f345d7 100644
--- a/misc/buildroot/toolchain/gcc/Makefile.in
+++ b/misc/buildroot/toolchain/gcc/Makefile.in
@@ -57,17 +57,3 @@ ifneq ($(strip $(subst ",,$(BR2_GCC_TARGET_ABI))),)
 # ")))
 GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI)
 endif
-
-ifeq ($(strip $(BR2_PACKAGE_GCC_TARGET)),y)
-# pull in config opts from the user
-EXTRA_TARGET_GCC_CONFIG_OPTIONS:=$(strip $(subst ",, $(BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS)))
-#"))
-
-ifeq ($(BR2_PREFER_IMA),y)
-# >= 4.x
-ifneq ($(findstring 3.,$(GCC_VERSION)),3.)
-EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--enable-intermodule
-endif
-endif # BR2_PREFER_IMA=y
-
-endif