X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=f0fc31d567cc2de8ddf141eabae278724f197c09;hp=34c597c9e0f53e1f43595e0ef1e99093c94ca29a;hb=080dc619d4780a1f7b14082b77b28686e694f72d;hpb=3f55e5aeb5ef269db8e64eea1b113cb6daf20327

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 34c597c9e0..f0fc31d567 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,28 +2,25 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_USE_VERSION_4_8_ARC if arc
-	default GCC_USE_VERSION_5
+	default GCC_USE_VERSION_8
 	help
 	  Select the version of gcc you wish to use.
 
-	config GCC_USE_VERSION_4_8_ARC
-		select GCC_VERSION_4_8_ARC
-		bool "gcc 4.8.x with support of ARC cores"
-		depends on arc
-
-	config GCC_USE_VERSION_5
-		bool "gcc 5.x"
+	config GCC_USE_VERSION_7
+		bool "gcc 7.x"
 		depends on !arc
 
-	config GCC_USE_VERSION_6
-		bool "gcc 6.x"
-		depends on !arc
+	config GCC_USE_VERSION_8
+		bool "gcc 8.x"
 
+	config GCC_USE_VERSION_9
+		bool "gcc 9.x"
+
+	config GCC_USE_VERSION_10
+		bool "gcc 10.x"
 endchoice
 
 config GCC_USE_GRAPHITE
-	depends on !GCC_VERSION_4_8_ARC
 	bool
 	prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
 
@@ -34,13 +31,19 @@ config EXTRA_GCC_CONFIG_OPTIONS
 	help
 	    Any additional gcc options you may want to include....
 
-config SSP_SUPPORT
+config GCC_DEFAULT_PIE
 	bool
-	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
-	depends on !USE_MUSL
-	default y if !USE_MUSL
+	prompt "Build executable with PIE enabled by default" if TOOLCHAINOPTS
+	default n
 	help
-	    Enable Stack-Smashing Protection support
+	    Use gcc configure option --enable-default-pie to turn on -fPIE and -pie by default.
+
+config GCC_DEFAULT_SSP
+	bool
+	prompt "Build executable with Stack-Smashing Protection enabled by default" if TOOLCHAINOPTS
+	default n
+	help
+	    Use gcc configure option --enable-default-ssp to turn on -fstack-protector-strong by default.
 
 config SJLJ_EXCEPTIONS
 	bool
@@ -51,14 +54,6 @@ config SJLJ_EXCEPTIONS
 	    frame unwinding exceptions handling routines.  Warning: increases
 	    code size and runtime memory usage.
 
-config INSTALL_LIBGCJ
-	bool
-	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
-	default n
-	help
-	    Build/install java compiler and GNU classpath ?
-
-
 config INSTALL_GFORTRAN
 	bool
 	prompt "Build/install fortran compiler?" if TOOLCHAINOPTS
@@ -69,7 +64,7 @@ config INSTALL_GFORTRAN
 config INSTALL_GCCGO
 	bool
 	prompt "Build/install Go compiler?" if TOOLCHAINOPTS
-	depends on !GCC_VERSION_4_8 && (USE_GLIBC || BROKEN)
+	depends on USE_GLIBC || BROKEN
 	default n
 	help
 	    Build/install GNU gccgo compiler ?