X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/64958baf0e72e9c111733449ef1967b4522a3e70..edf4ec42fabd19cf92766af05efc94292255dc07:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e034c3860..07f050aad 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -10,6 +10,7 @@ choice
 	default GCC_VERSION_4_3_3 if TARGET_etrax
 	default GCC_VERSION_4_3_3 if TARGET_coldfire
 	default GCC_VERSION_4_4_0 if ubicom32
+	default GCC_VERSION_4_4_1 if TARGET_octeon
 	default GCC_VERSION_4_1_2
 	help
 	  Select the version of gcc you wish to use.
@@ -39,18 +40,9 @@ endif
 
 endchoice
 
-config EABI_SUPPORT
-	bool
-	depends arm||armeb
-	prompt "Enable EABI support" if TOOLCHAINOPTS
-	default n if TARGET_gemini
-	default y
-	help
-	  Enable ARM EABI support
-
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
-	prompt "Additional gcc options" if TOOLCHAINOPTS
+	prompt "Additional gcc configure options" if TOOLCHAINOPTS
 	default ""
 	help
 	    Any additional gcc options you may want to include....
@@ -58,10 +50,10 @@ config EXTRA_GCC_CONFIG_OPTIONS
 config SSP_SUPPORT
 	bool
 	depends !GCC_VERSION_3_4_6
-	prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
+	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
 	default n
 	help
-	    Enable Smash Stacking Protection support
+	    Enable Stack-Smashing Protection support
 
 config INSTALL_LIBSTDCPP
 	bool