toolchain/gcc: remove glibc libgcc_eh hack

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 5cb4d23e169f4265541561364fe034c6e41297c9..d150c9cc4ba82b92671de0c3c74e4c73bd47db83 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,36 +2,21 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
-       default GCC_USE_VERSION_4_8_LINARO
+       default GCC_USE_VERSION_12
        help
          Select the version of gcc you wish to use.
 
-       config GCC_USE_VERSION_4_6_LINARO
-               select GCC_VERSION_4_6_LINARO
-               bool "gcc 4.6.x with Linaro enhancements"
-
-       config GCC_USE_VERSION_4_8_LINARO
-               select GCC_VERSION_4_8_LINARO
-               bool "gcc 4.8.x with Linaro enhancements"
-
-       config GCC_USE_VERSION_4_9_LINARO
-               select GCC_VERSION_4_9_LINARO
-               bool "gcc 4.9.x with Linaro enhancements"
-               depends on BROKEN
+       config GCC_USE_VERSION_11
+               bool "gcc 11.x"
 
+       config GCC_USE_VERSION_12
+               bool "gcc 12.x"
 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
-       default n
-
 config EXTRA_GCC_CONFIG_OPTIONS
        string
        prompt "Additional gcc configure options" if TOOLCHAINOPTS
@@ -39,33 +24,35 @@ config EXTRA_GCC_CONFIG_OPTIONS
        help
            Any additional gcc options you may want to include....
 
-config SSP_SUPPORT
+config GCC_DEFAULT_PIE
+       bool
+       prompt "Build executable with PIE enabled by default" if TOOLCHAINOPTS
+       help
+           Use gcc configure option --enable-default-pie to turn on -fPIE and -pie by default.
+
+config GCC_DEFAULT_SSP
        bool
-       prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
-       default y
+       prompt "Build executable with Stack-Smashing Protection enabled by default" if TOOLCHAINOPTS
        help
-           Enable Stack-Smashing Protection support
+           Use gcc configure option --enable-default-ssp to turn on -fstack-protector-strong by default.
 
 config SJLJ_EXCEPTIONS
        bool
        prompt "Use setjump()/longjump() exceptions" if TOOLCHAINOPTS
-       default n
        help
            Use old setjump()/longjump() exceptions instead of the newer
            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
-       default n
        help
            Build/install GNU fortran compiler ?
+
+config INSTALL_GCCGO
+       bool
+       prompt "Build/install Go compiler?" if TOOLCHAINOPTS
+       depends on USE_GLIBC || BROKEN
+       help
+           Build/install GNU gccgo compiler ?