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 41ea61cb8a06f2e1f3240ae996a213939b9c8790..0fe0ea2957c38b322d502f61b17925f9fb5e0bc2 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,14 +2,14 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_USE_VERSION_4_8_ARC if arc
+       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_USE_VERSION_4_8_ARC
-               select GCC_VERSION_4_8_ARC
-               bool "gcc 4.8.x with support of ARC cores"
+       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_USE_VERSION_5
@@ -20,18 +20,16 @@ choice
                bool "gcc 6.x"
                depends on !arc
 
+       config GCC_USE_VERSION_7
+               bool "gcc 7.x"
+               depends on !arc
+
 endchoice
 
 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 on GCC_USE_GRAPHITE && GCC_VERSION_4_8
-       default n
-
 config EXTRA_GCC_CONFIG_OPTIONS
        string
        prompt "Additional gcc configure options" if TOOLCHAINOPTS
@@ -39,6 +37,21 @@ config EXTRA_GCC_CONFIG_OPTIONS
        help
            Any additional gcc options you may want to include....
 
+config GCC_DEFAULT_PIE
+       bool
+       prompt "Build executable with PIE enabled by default" if TOOLCHAINOPTS
+       depends on !GCC_USE_VERSION_5
+       default n
+       help
+           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 SSP_SUPPORT
        bool
        prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
@@ -56,14 +69,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
@@ -74,7 +79,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 ?