toolchain: add gcc configure default PIE and SSP

[openwrt/openwrt.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index b528586aa4266cac0d6be27d7984e5c972259749..0fe0ea2957c38b322d502f61b17925f9fb5e0bc2 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,26 +2,27 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
-       default GCC_VERSION_4_6_LINARO
+       default GCC_USE_VERSION_7_1_ARC if arc
+       default GCC_USE_VERSION_5
        help
          Select the version of gcc you wish to use.
 
-       config GCC_VERSION_4_4_7
-               bool "gcc 4.4.7"
-               depends avr32
+       config GCC_USE_VERSION_7_1_ARC
+               select GCC_VERSION_7_1_ARC
+               bool "gcc 7.1.x with support of ARC cores"
+               depends on arc
 
-       config GCC_VERSION_4_6_3
-               bool "gcc 4.6.3"
+       config GCC_USE_VERSION_5
+               bool "gcc 5.x"
+               depends on !arc
 
-       config GCC_VERSION_4_7_2
-               bool "gcc 4.7.2"
+       config GCC_USE_VERSION_6
+               bool "gcc 6.x"
+               depends on !arc
 
-       config GCC_VERSION_4_6_LINARO
-               bool "gcc 4.6.x with Linaro enhancements"
-
-       config GCC_VERSION_4_7_LINARO
-               bool "gcc 4.7.x with Linaro enhancements"
+       config GCC_USE_VERSION_7
+               bool "gcc 7.x"
+               depends on !arc
 
 endchoice
 
@@ -29,12 +30,6 @@ config GCC_USE_GRAPHITE
        bool
        prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
 
-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
        prompt "Additional gcc configure options" if TOOLCHAINOPTS
@@ -42,19 +37,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
-       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 SSP_SUPPORT
+       bool
+       prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
+       depends on !USE_MUSL
+       default y if !USE_MUSL
+       help
+           Enable Stack-Smashing Protection support
 
 config SJLJ_EXCEPTIONS
        bool
@@ -65,24 +69,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 if !USE_MUSL
-       help
-           Build/install c++ compiler and libstdc++?
-
-config INSTALL_LIBGCJ
+config INSTALL_GFORTRAN
        bool
-       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 ?