X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=toolchain%2Fgcc%2FConfig.in;h=7d7f34210a6d4ee8f5a9f192525cbdc3deb8fed1;hb=03e742dcd82df43ce48c42e96e439e1a4bad14ec;hp=556a56955fc5f5a9478804310561c94a0543169d;hpb=4fbc50d89a2d97cd1d4b2537a29cd6b2f85b3d48;p=oweals%2Fopenwrt.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 556a56955f..7d7f34210a 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,36 +2,28 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
-	default GCC_VERSION_LINARO
+	default GCC_USE_VERSION_8
 	help
 	  Select the version of gcc you wish to use.
 
-	config GCC_VERSION_4_4_6
-		bool "gcc 4.4.6"
+	config GCC_USE_VERSION_5
+		bool "gcc 5.x"
+		depends on !arc
 
-	config GCC_VERSION_4_6_1
-		bool "gcc 4.6.1"
+	config GCC_USE_VERSION_7
+		bool "gcc 7.x"
+		depends on !arc
 
-	config GCC_VERSION_LINARO
-		bool "gcc 4.5.x with Linaro enhancements"
-
-	config GCC_VERSION_LLVM
-		bool "llvm-gcc 4.2"
-		depends BROKEN
+	config GCC_USE_VERSION_8
+		bool "gcc 8.x"
 
+	config GCC_USE_VERSION_9
+		bool "gcc 9.x"
 endchoice
 
 config GCC_USE_GRAPHITE
 	bool
 	prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
-	depends GCC_VERSION_4_4 || GCC_VERSION_4_5 || GCC_VERSION_4_6
-
-config GCC_USE_SYSTEM_PPL_CLOOG
-	bool
-	prompt "Use the system versions of PPL and CLooG"
-	depends GCC_USE_GRAPHITE
-	default n
 
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
@@ -40,20 +32,28 @@ 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
+	prompt "Build executable with PIE enabled by default" if TOOLCHAINOPTS
+	depends on !GCC_USE_VERSION_5
 	default n
 	help
-	    Enable Stack-Smashing Protection support
+	    Use gcc configure option --enable-default-pie to turn on -fPIE and -pie by default.
 
-config TLS_SUPPORT
+config GCC_DEFAULT_SSP
 	bool
-	depends UCLIBC_VERSION_NPTL
-	prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
+	prompt "Build executable with Stack-Smashing Protection enabled by default" if TOOLCHAINOPTS
 	default n
 	help
-	    Enable Thread-local storage support
+	    Use gcc configure option --enable-default-ssp to turn on -fstack-protector-strong by default.
+
+config GCC_LIBSSP
+	bool
+	prompt "Build gcc libssp" if TOOLCHAINOPTS
+	depends on !USE_MUSL
+	default y if !USE_MUSL
+	help
+	    Enable Stack-Smashing Protection support
 
 config SJLJ_EXCEPTIONS
 	bool
@@ -64,25 +64,17 @@ config SJLJ_EXCEPTIONS
 	    frame unwinding exceptions handling routines.  Warning: increases
 	    code size and runtime memory usage.
 
-config INSTALL_LIBSTDCPP
-	bool
-	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
-	default y
-	help
-	    Build/install c++ compiler and libstdc++?
-
-config INSTALL_LIBGCJ
+config INSTALL_GFORTRAN
 	bool
-	depends on !GCC_VERSION_LLVM
-	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
+	prompt "Build/install fortran compiler?" if TOOLCHAINOPTS
 	default n
 	help
-	    Build/install java compiler and GNU classpath ?
-
+	    Build/install GNU fortran compiler ?
 
-config INSTALL_GFORTRAN
+config INSTALL_GCCGO
 	bool
-	prompt "Build/install fortran compiler?" if TOOLCHAINOPTS
+	prompt "Build/install Go compiler?" if TOOLCHAINOPTS
+	depends on USE_GLIBC || BROKEN
 	default n
 	help
-	    Build/install GNU fortran compiler ?
+	    Build/install GNU gccgo compiler ?