Make sure ARM gcc-3.4.6 still builds

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

9 files changed, 32 insertions, 16 deletions

diff --git a/misc/buildroot/configs/README.txt b/misc/buildroot/configs/README.txt
index 4041a24d5..c27affd7f 100644
--- a/misc/buildroot/configs/README.txt
+++ b/misc/buildroot/configs/README.txt
@@ -3,6 +3,9 @@ arm-defconfig
 
 arm-defconfig-4.2.4
 	Builds an ARM toolchain using gcc 4.2.4
+	NOTE: At present, there are issues with some of the binutils
+	programes (arm-elf-objcopy in particular) that cause Floating
+	point exceptions when trying to build NuttX
 
 h8300_config
 	Builds an H8/300 toolchain using gcc 3.4.5
diff --git a/misc/buildroot/configs/arm-defconfig b/misc/buildroot/configs/arm-defconfig
index 2cab27fca..47f13b509 100644
--- a/misc/buildroot/configs/arm-defconfig
+++ b/misc/buildroot/configs/arm-defconfig
@@ -9,12 +9,15 @@ BR2_arm=y
 # BR2_cris is not set
 # BR2_i386 is not set
 # BR2_m68k is not set
+# BR2_m68hc11 is not set
+# BR2_m68hc12 is not set
 # BR2_mips is not set
 # BR2_mipsel is not set
 # BR2_nios2 is not set
 # BR2_powerpc is not set
 # BR2_sh is not set
 # BR2_sh64 is not set
+# BR2_h8300 is not set
 # BR2_sparc is not set
 # BR2_x86_64 is not set
 BR2_generic_arm=y
@@ -81,11 +84,12 @@ BR2_BINUTILS_VERSION_2_17=y
 # BR2_BINUTILS_VERSION_2_17_50_0_8 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_9 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_10 is not set
+# BR2_BINUTILS_VERSION_2_19 is not set
 BR2_BINUTILS_VERSION="2.17"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 
 #
-# Gcc Options
+# GCC Options
 #
 # BR2_GCC_VERSION_3_3_5 is not set
 # BR2_GCC_VERSION_3_3_6 is not set
@@ -103,12 +107,12 @@ BR2_GCC_VERSION_3_4_6=y
 # BR2_GCC_VERSION_4_1_1 is not set
 # BR2_GCC_VERSION_4_1_2 is not set
 # BR2_GCC_VERSION_4_2 is not set
-# BR2_GCC_IS_SNAP is not set
+# BR2_GCC_VERSION_4_2_4 is not set
+# BR2_GCC_SUPPORTS_SYSROOT is not set
 BR2_GCC_VERSION="3.4.6"
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-BR2_INSTALL_LIBSTDCPP=y
-BR2_INSTALL_LIBGCJ=y
+# BR2_INSTALL_LIBSTDCPP is not set
 # BR2_INSTALL_OBJC is not set
 # BR2_INSTALL_FORTRAN is not set
 
diff --git a/misc/buildroot/configs/h8300_defconfig b/misc/buildroot/configs/h8300_defconfig
index 3e5cd9a0b..289fa3167 100644
--- a/misc/buildroot/configs/h8300_defconfig
+++ b/misc/buildroot/configs/h8300_defconfig
@@ -67,11 +67,12 @@ BR2_BINUTILS_VERSION_2_17=y
 # BR2_BINUTILS_VERSION_2_17_50_0_8 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_9 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_10 is not set
+# BR2_BINUTILS_VERSION_2_19 is not set
 BR2_BINUTILS_VERSION="2.17"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 
 #
-# Gcc Options
+# GCC Options
 #
 # BR2_GCC_VERSION_3_3_5 is not set
 # BR2_GCC_VERSION_3_3_6 is not set
@@ -89,7 +90,8 @@ BR2_GCC_VERSION_3_4_6=y
 # BR2_GCC_VERSION_4_1_1 is not set
 # BR2_GCC_VERSION_4_1_2 is not set
 # BR2_GCC_VERSION_4_2 is not set
-# BR2_GCC_IS_SNAP is not set
+# BR2_GCC_VERSION_4_2_4 is not set
+# BR2_GCC_SUPPORTS_SYSROOT is not set
 BR2_GCC_VERSION="3.4.6"
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
diff --git a/misc/buildroot/configs/m68hc11-config b/misc/buildroot/configs/m68hc11-config
index e9740b85c..99fc42084 100644
--- a/misc/buildroot/configs/m68hc11-config
+++ b/misc/buildroot/configs/m68hc11-config
@@ -17,6 +17,7 @@ BR2_m68hc11=y
 # BR2_powerpc is not set
 # BR2_sh is not set
 # BR2_sh64 is not set
+# BR2_h8300 is not set
 # BR2_sparc is not set
 # BR2_x86_64 is not set
 BR2_ARCH="m68hc11"
@@ -66,11 +67,12 @@ BR2_BINUTILS_VERSION_2_17=y
 # BR2_BINUTILS_VERSION_2_17_50_0_8 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_9 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_10 is not set
+# BR2_BINUTILS_VERSION_2_19 is not set
 BR2_BINUTILS_VERSION="2.17"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 
 #
-# Gcc Options
+# GCC Options
 #
 # BR2_GCC_VERSION_3_3_5 is not set
 # BR2_GCC_VERSION_3_3_6 is not set
@@ -88,7 +90,8 @@ BR2_GCC_VERSION_3_4_6=y
 # BR2_GCC_VERSION_4_1_1 is not set
 # BR2_GCC_VERSION_4_1_2 is not set
 # BR2_GCC_VERSION_4_2 is not set
-# BR2_GCC_IS_SNAP is not set
+# BR2_GCC_VERSION_4_2_4 is not set
+# BR2_GCC_SUPPORTS_SYSROOT is not set
 BR2_GCC_VERSION="3.4.6"
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
diff --git a/misc/buildroot/configs/m68k-defconfig b/misc/buildroot/configs/m68k-defconfig
index cbe3c11cd..b1c8726f2 100644
--- a/misc/buildroot/configs/m68k-defconfig
+++ b/misc/buildroot/configs/m68k-defconfig
@@ -9,12 +9,15 @@ BR2_HAVE_DOT_CONFIG=y
 # BR2_cris is not set
 # BR2_i386 is not set
 BR2_m68k=y
+# BR2_m68hc11 is not set
+# BR2_m68hc12 is not set
 # BR2_mips is not set
 # BR2_mipsel is not set
 # BR2_nios2 is not set
 # BR2_powerpc is not set
 # BR2_sh is not set
 # BR2_sh64 is not set
+# BR2_h8300 is not set
 # BR2_sparc is not set
 # BR2_x86_64 is not set
 BR2_ARCH="m68k"
@@ -64,11 +67,12 @@ BR2_BINUTILS_VERSION_2_17=y
 # BR2_BINUTILS_VERSION_2_17_50_0_8 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_9 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_10 is not set
+# BR2_BINUTILS_VERSION_2_19 is not set
 BR2_BINUTILS_VERSION="2.17"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 
 #
-# Gcc Options
+# GCC Options
 #
 # BR2_GCC_VERSION_3_3_5 is not set
 # BR2_GCC_VERSION_3_3_6 is not set
@@ -86,7 +90,8 @@ BR2_GCC_VERSION_3_4_6=y
 # BR2_GCC_VERSION_4_1_1 is not set
 # BR2_GCC_VERSION_4_1_2 is not set
 # BR2_GCC_VERSION_4_2 is not set
-# BR2_GCC_IS_SNAP is not set
+# BR2_GCC_VERSION_4_2_4 is not set
+# BR2_GCC_SUPPORTS_SYSROOT is not set
 BR2_GCC_VERSION="3.4.6"
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
diff --git a/misc/buildroot/configs/sh-defconfig b/misc/buildroot/configs/sh-defconfig
index 3cf38ed63..aaaa41153 100644
--- a/misc/buildroot/configs/sh-defconfig
+++ b/misc/buildroot/configs/sh-defconfig
@@ -17,6 +17,7 @@ BR2_HAVE_DOT_CONFIG=y
 # BR2_powerpc is not set
 BR2_sh=y
 # BR2_sh64 is not set
+# BR2_h8300 is not set
 # BR2_sparc is not set
 # BR2_x86_64 is not set
 BR2_sh1=y
@@ -73,11 +74,12 @@ BR2_BINUTILS_VERSION_2_17=y
 # BR2_BINUTILS_VERSION_2_17_50_0_8 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_9 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_10 is not set
+# BR2_BINUTILS_VERSION_2_19 is not set
 BR2_BINUTILS_VERSION="2.17"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 
 #
-# Gcc Options
+# GCC Options
 #
 # BR2_GCC_VERSION_3_3_5 is not set
 # BR2_GCC_VERSION_3_3_6 is not set
@@ -95,7 +97,8 @@ BR2_GCC_VERSION_3_4_6=y
 # BR2_GCC_VERSION_4_1_1 is not set
 # BR2_GCC_VERSION_4_1_2 is not set
 # BR2_GCC_VERSION_4_2 is not set
-# BR2_GCC_IS_SNAP is not set
+# BR2_GCC_VERSION_4_2_4 is not set
+# BR2_GCC_SUPPORTS_SYSROOT is not set
 BR2_GCC_VERSION="3.4.6"
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
diff --git a/misc/buildroot/toolchain/gcc/Config.in b/misc/buildroot/toolchain/gcc/Config.in
index ecf2d67cd..f7b14178c 100644
--- a/misc/buildroot/toolchain/gcc/Config.in
+++ b/misc/buildroot/toolchain/gcc/Config.in
@@ -137,7 +137,6 @@ config BR2_INSTALL_LIBSTDCPP
 	default n
 	# >= 4.2.0 work fine without LARGEFILE
 	select BR2_LARGEFILE if !BR2_GCC_SUPPORTS_SYSROOT
-	select BR2_GCC_CROSS_CXX
 	help
 	  Build/install c++ compiler and libstdc++?
 
@@ -159,7 +158,6 @@ config BR2_INSTALL_FORTRAN
 	bool "Build/install Fortran compiler and runtime?"
 	default n
 	depends on !BR2_avr32
-	select BR2_PACKAGE_LIBMPFR
 	help
 	  Build/install Fortran compiler and runtime?
 	  Note that it is highly recommended NOT to use gfortran
diff --git a/misc/buildroot/toolchain/gdb/Config.in b/misc/buildroot/toolchain/gdb/Config.in
index 079f52948..7465542b6 100644
--- a/misc/buildroot/toolchain/gdb/Config.in
+++ b/misc/buildroot/toolchain/gdb/Config.in
@@ -3,7 +3,6 @@ comment "Gdb Options"
 config BR2_PACKAGE_GDB
 	bool "Build gdb debugger for the Target"
 	default n
-	select BR2_PACKAGE_NCURSES
 	help
 	    Build the full gdb debugger to run on the target.
 
diff --git a/misc/buildroot/toolchain/gdb/Config.in.2 b/misc/buildroot/toolchain/gdb/Config.in.2
index 695c5d5ea..430355176 100644
--- a/misc/buildroot/toolchain/gdb/Config.in.2
+++ b/misc/buildroot/toolchain/gdb/Config.in.2
@@ -5,7 +5,6 @@ comment "Gdb Options"
 config BR2_PACKAGE_GDB
 	bool "Build gdb debugger for the Target"
 	default n
-	select BR2_PACKAGE_NCURSES
 	help
 	    Build the full gdb debugger to run on the target.