OpenWrt v18.06.3: adjust config defaults

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index ea33ac29c17a20f872bc11a97c0c90bff490867e..34db20d3aa786eeb2e5c7a5a2d63b2fb39822a66 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_6_3_ARC if arc
-       default GCC_USE_VERSION_5
+       default GCC_USE_VERSION_7_1_ARC if arc
+       default GCC_USE_VERSION_7
        help
          Select the version of gcc you wish to use.
 
-       config GCC_USE_VERSION_6_3_ARC
-               select GCC_VERSION_6_3_ARC
-               bool "gcc 6.3.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
@@ -37,9 +37,24 @@ 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
+           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 GCC_LIBSSP
+       bool
+       prompt "Build gcc libssp" if TOOLCHAINOPTS
        depends on !USE_MUSL
        default y if !USE_MUSL
        help
@@ -54,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