gcc: remove support for libgcj/java

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 0c07796c532f318050c8c3cfe1e16d0e5a1168ae..a54c8d12d36c47d29a7cc236f2dbc88bab635d14 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,28 +2,27 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_USE_VERSION_4_4_7 if avr32
-       default GCC_USE_VERSION_4_6_LINARO if mips64
-       default GCC_USE_VERSION_4_8_LINARO
+       default GCC_USE_VERSION_6_3_ARC if arc
+       default GCC_USE_VERSION_5
        help
          Select the version of gcc you wish to use.
 
-       config GCC_USE_VERSION_4_4_7
-               select GCC_VERSION_4_4_7
-               bool "gcc 4.4.7"
-               depends on avr32
+       config GCC_USE_VERSION_6_3_ARC
+               select GCC_VERSION_6_3_ARC
+               bool "gcc 6.3.x with support of ARC cores"
+               depends on arc
 
-       config GCC_USE_VERSION_4_8_0
-               select GCC_VERSION_4_8_0
-               bool "gcc 4.8.0"
+       config GCC_USE_VERSION_5
+               bool "gcc 5.x"
+               depends on !arc
 
-       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_6
+               bool "gcc 6.x"
+               depends on !arc
 
-       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_7
+               bool "gcc 7.x"
+               depends on !arc
 
 endchoice
 
@@ -31,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 on GCC_USE_GRAPHITE
-       default n
-
 config EXTRA_GCC_CONFIG_OPTIONS
        string
        prompt "Additional gcc configure options" if TOOLCHAINOPTS
@@ -47,7 +40,8 @@ config EXTRA_GCC_CONFIG_OPTIONS
 config SSP_SUPPORT
        bool
        prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
-       default n
+       depends on !USE_MUSL
+       default y if !USE_MUSL
        help
            Enable Stack-Smashing Protection support
 
@@ -60,17 +54,17 @@ config SJLJ_EXCEPTIONS
            frame unwinding exceptions handling routines.  Warning: increases
            code size and runtime memory usage.
 
-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 ?