Modify the enabled languages in stage2 builds to the macro @WITH_LANGUAGES@.

   Use ./configure --with-languages=c,c++,fortran to adjust the enabled languages. This change only affects the GNU toolchain.

Author: Arielfoever

Makefile.in

@@ -46,6 +46,11 @@ SYSROOT := $(INSTALL_DIR)/sysroot
 ENABLE_LIBSANITIZER ?= @enable_libsanitizer@
 QEMU_TARGETS ?= @qemu_targets@
 
+ENABLED_LANGUAGES ?= @WITH_LANGUAGES@
+ifeq ($(ENABLED_LANGUAGES),)
+	undefine ENABLED_LANGUAGES
+endif
+
 SHELL := /bin/sh
 AWK := @GAWK@
 SED := @GSED@
@@ -499,6 +504,7 @@ stamps/build-gcc-linux-stage1: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-binutil
 	$(MAKE) -C $(notdir $@) inhibit-libc=true install-target-libgcc
 	mkdir -p $(dir $@) && touch $@
 
+stamps/build-gcc-linux-stage2: ENABLED_LANGUAGES?="c,c++,fortran"
 stamps/build-gcc-linux-stage2: $(GCC_SRCDIR) $(GCC_SRC_GIT) $(addprefix stamps/build-glibc-linux-,$(GLIBC_MULTILIB_NAMES)) \
                                stamps/build-glibc-linux-headers
 	rm -rf $@ $(notdir $@)
@@ -512,7 +518,7 @@ stamps/build-gcc-linux-stage2: $(GCC_SRCDIR) $(GCC_SRC_GIT) $(addprefix stamps/b
 		@with_system_zlib@ \
 		--enable-shared \
 		--enable-tls \
-		--enable-languages=c,c++,fortran \
+		--enable-languages=$(ENABLED_LANGUAGES) \
 		--disable-libmudflap \
 		--disable-libssp \
 		--disable-libquadmath \
@@ -558,6 +564,8 @@ stamps/build-binutils-linux-native: $(BINUTILS_SRCDIR) $(BINUTILS_SRC_GIT) stamp
 	$(MAKE) -C $(notdir $@) install
 	mkdir -p $(dir $@) && touch $@
 
+
+stamps/build-gcc-linux-native: ENABLED_LANGUAGES?="c,c++,fortran"
 stamps/build-gcc-linux-native: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-gcc-linux-stage2 stamps/build-binutils-linux-native
 	if test -f $</contrib/download_prerequisites; then cd $< && ./contrib/download_prerequisites; fi
 	rm -rf $@ $(notdir $@)
@@ -570,7 +578,7 @@ stamps/build-gcc-linux-native: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-gcc-lin
 		--without-system-zlib \
 		--enable-shared \
 		--enable-tls \
-		--enable-languages=c,c++,fortran \
+		--enable-languages=$(ENABLED_LANGUAGES) \
 		--disable-libmudflap \
 		--disable-libssp \
 		--disable-libquadmath \
@@ -741,6 +749,7 @@ stamps/merge-newlib-nano: stamps/build-newlib-nano stamps/build-newlib
 		$(INSTALL_DIR)/$(NEWLIB_TUPLE)/include/newlib-nano/newlib.h; \
 	mkdir -p $(dir $@) && touch $@
 
+stamps/build-gcc-newlib-stage2: ENABLED_LANGUAGES?="c,c++"
 stamps/build-gcc-newlib-stage2: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-newlib \
 		stamps/merge-newlib-nano
 	rm -rf $@ $(notdir $@)
@@ -751,7 +760,7 @@ stamps/build-gcc-newlib-stage2: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-newlib
 		--prefix=$(INSTALL_DIR) \
 		--disable-shared \
 		--disable-threads \
-		--enable-languages=c,c++ \
+		--enable-languages=$(ENABLED_LANGUAGES) \
 		--with-pkgversion="$(GCCPKGVER)" \
 		@with_system_zlib@ \
 		--enable-tls \
@@ -901,6 +910,7 @@ stamps/build-musl-linux: $(MUSL_SRCDIR) $(MUSL_SRC_GIT) stamps/build-gcc-musl-st
 	+flock $(SYSROOT)/.lock $(MAKE) -C $(notdir $@) install
 	mkdir -p $(dir $@) && touch $@
 
+stamps/build-gcc-musl-stage2: ENABLED_LANGUAGES?="c,c++"
 stamps/build-gcc-musl-stage2: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-musl-linux \
                                stamps/build-musl-linux-headers
 	rm -rf $@ $(notdir $@)
@@ -915,7 +925,7 @@ stamps/build-gcc-musl-stage2: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-musl-lin
 		@with_system_zlib@ \
 		--enable-shared \
 		--enable-tls \
-		--enable-languages=c,c++ \
+		--enable-languages=$(ENABLED_LANGUAGES) \
 		--disable-libmudflap \
 		--disable-libssp \
 		--disable-libquadmath \
@@ -1037,6 +1047,7 @@ stamps/build-uclibc-linux: $(UCLIBC_SRCDIR) $(UCLIBC_SRC_GIT) stamps/build-gcc-u
 
 	mkdir -p $(dir $@) && touch $@
 
+stamps/build-gcc-uclibc-stage2: ENABLED_LANGUAGES?="c,c++"
 stamps/build-gcc-uclibc-stage2: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-uclibc-linux
 	rm -rf $@ $(notdir $@)
 	mkdir $(notdir $@)
@@ -1047,7 +1058,7 @@ stamps/build-gcc-uclibc-stage2: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-uclibc
 		--with-sysroot=$(SYSROOT) \
 		@with_system_zlib@ \
 		--enable-tls \
-		--enable-languages=c,c++ \
+		--enable-languages=$(ENABLED_LANGUAGES) \
 		--disable-shared \
 		--disable-libmudflap \
 		--disable-libssp \

README.md

@@ -103,6 +103,10 @@ using the `--print-multi-lib` flag on either cross-compiler.
 Linux toolchain has an additional option `--enable-default-pie` to control the
 default PIE enablement for GCC, which is disable by default.
 
+To customize the enabled languages, use option `--with-languages=`. For example, 
+if you want to enable `c,c++,fortran`, use `./configure --with-languages=c,c++,fortran`.
+This option only takes effect for the GNU toolchain.
+
 ### Troubleshooting Build Problems
 
 Builds work best if installing into an empty directory.  If you build a

configure

@@ -646,6 +646,7 @@ glibc_multilib_names
 multilib_flags
 extra_multilib_test
 multilib_gen
+WITH_LANGUAGES
 WITH_SIM
 WITH_ISA_SPEC
 WITH_TUNE
@@ -721,6 +722,7 @@ with_abi
 with_tune
 with_isa_spec
 with_sim
+with_languages
 enable_multilib
 with_multilib_generator
 with_extra_multilib_test
@@ -1403,6 +1405,10 @@ Optional Packages:
                           Set the default ISA spec version, default to
                           20191213, available options: 2.2, 20190608, 20191213
   --with-sim=qemu         Sets the base RISC-V Simulator, defaults to qemu
+  --with-languages=       Sets the enabled languages for GNU toolchain,
+                          defaults to c,c++,fortran for Linux/native and
+                          Linux/glibc or c,c++ for Bare-metal, Linux/musl and
+                          Linux/uClibc
   --with-multilib-generator
                           Multi-libs configuration string, only supported for
                           bare-metal/elf toolchain, this option implied
@@ -1928,7 +1934,9 @@ struct stat;
 /* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
 struct buf { int x; };
 struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (char **p, int i)
+static char *e (p, i)
+     char **p;
+     int i;
 {
   return p[i];
 }
@@ -1979,7 +1987,6 @@ extern int puts (const char *);
 extern int printf (const char *, ...);
 extern int dprintf (int, const char *, ...);
 extern void *malloc (size_t);
-extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
@@ -3631,14 +3638,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char __gmpz_init (void);
+   builtin and then its argument prototype would still apply.  */
+char __gmpz_init ();
 int
 main (void)
 {
@@ -3682,14 +3683,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char mpfr_init (void);
+   builtin and then its argument prototype would still apply.  */
+char mpfr_init ();
 int
 main (void)
 {
@@ -3733,14 +3728,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char mpc_init2 (void);
+   builtin and then its argument prototype would still apply.  */
+char mpc_init2 ();
 int
 main (void)
 {
@@ -3979,18 +3968,20 @@ else $as_nop
 fi
 
 # Check whether --enable-default-pie was given.
-if test "${enable_default_pie+set}" = set; then :
+if test ${enable_default_pie+y}
+then :
   enableval=$enable_default_pie;
-else
+else $as_nop
   enable_default_pie=no
 
 fi
 
 
-if test "x$enable_default_pie" != xyes; then :
+if test "x$enable_default_pie" != xyes
+then :
   enable_default_pie="--disable-default-pie"
 
-else
+else $as_nop
   enable_default_pie="--enable-default-pie"
 
 fi
@@ -4051,6 +4042,15 @@ else $as_nop
 fi
 
 
+
+# Check whether --with-languages was given.
+if test ${with_languages+y}
+then :
+  withval=$with_languages;
+
+fi
+
+
 if test "x$with_abi" = xdefault
 then :
   case $with_arch in #(
@@ -4084,6 +4084,8 @@ WITH_ISA_SPEC=--with-isa-spec=$with_isa_spec
 
 WITH_SIM=$with_sim
 
+WITH_LANGUAGES=$with_languages
+
 
 # Check whether --enable-multilib was given.
 if test ${enable_multilib+y}
@@ -4323,7 +4325,7 @@ else $as_nop
 
 fi
 
-# Check whether --enable-host_gcc was given.
+# Check whether --enable-host-gcc was given.
 if test ${enable_host_gcc+y}
 then :
   enableval=$enable_host_gcc; enable_host_gcc=yes

configure.ac

@@ -114,6 +114,12 @@ AC_ARG_WITH(sim,
 	[with_sim=qemu]
 	)
 
+AC_ARG_WITH(languages,
+        [AS_HELP_STRING([--with-languages=],
+                [Sets the enabled languages for GNU toolchain, defaults to c,c++,fortran for Linux/native and Linux/glibc or c,c++ for Bare-metal, Linux/musl and Linux/uClibc])],
+        []
+        ) 
+
 AS_IF([test "x$with_abi" = xdefault],
 	[AS_CASE([$with_arch],
 		[*rv64g* | *rv64*d*], [with_abi=lp64d],
@@ -131,6 +137,7 @@ AC_SUBST(WITH_ABI, --with-abi=$with_abi)
 AC_SUBST(WITH_TUNE, --with-tune=$with_tune)
 AC_SUBST(WITH_ISA_SPEC, --with-isa-spec=$with_isa_spec)
 AC_SUBST(WITH_SIM, $with_sim)
+AC_SUBST(WITH_LANGUAGES, $with_languages)
 
 AC_ARG_ENABLE(multilib,
 	[AS_HELP_STRING([--enable-multilib],