Skip to content

R
riscv-gcc-1
Commit eae99394 by Andrew Haley
Options

Makefile.def: Remove libjava. 

2016-09-05  Andrew Haley  <aph@redhat.com>

	* Makefile.def: Remove libjava.
	* Makefile.tpl: Likewise.
	* Makefile.in: Regenerate.
	* configure.ac: Likewise.
	* configure: Likewise.

From-SVN: r240661
parent 37b204de
Showing with 0 additions and 496 deletions
Makefile.def
...@@ -165,8 +165,6 @@ target_modules = { module= libtermcap; no_check=true; ...@@ -165,8 +165,6 @@ target_modules = { module= libtermcap; no_check=true;
target_modules = { module= winsup; }; target_modules = { module= winsup; };
target_modules = { module= libgloss; no_check=true; }; target_modules = { module= libgloss; no_check=true; };
target_modules = { module= libffi; no_install=true; }; target_modules = { module= libffi; no_install=true; };
target_modules = { module= libjava; raw_cxx=true;
extra_configure_flags="$(EXTRA_CONFIGARGS_LIBJAVA)"; };
target_modules = { module= zlib; }; target_modules = { module= zlib; };
target_modules = { module= boehm-gc; }; target_modules = { module= boehm-gc; };
target_modules = { module= rda; }; target_modules = { module= rda; };
...@@ -534,7 +532,6 @@ dependencies = { module=all-m4; on=all-build-texinfo; }; ...@@ -534,7 +532,6 @@ dependencies = { module=all-m4; on=all-build-texinfo; };
// Target modules. These can also have dependencies on the language // Target modules. These can also have dependencies on the language
// environment (e.g. on libstdc++). By default target modules depend // environment (e.g. on libstdc++). By default target modules depend
// on libgcc and newlib/libgloss. // on libgcc and newlib/libgloss.
lang_env_dependencies = { module=libjava; cxx=true; };
lang_env_dependencies = { module=libitm; cxx=true; }; lang_env_dependencies = { module=libitm; cxx=true; };
lang_env_dependencies = { module=libffi; cxx=true; }; lang_env_dependencies = { module=libffi; cxx=true; };
lang_env_dependencies = { module=libcilkrts; cxx=true; }; lang_env_dependencies = { module=libcilkrts; cxx=true; };
...@@ -555,13 +552,6 @@ dependencies = { module=configure-target-libgo; on=all-target-libstdc++-v3; }; ...@@ -555,13 +552,6 @@ dependencies = { module=configure-target-libgo; on=all-target-libstdc++-v3; };
dependencies = { module=all-target-libgo; on=all-target-libbacktrace; }; dependencies = { module=all-target-libgo; on=all-target-libbacktrace; };
dependencies = { module=all-target-libgo; on=all-target-libffi; }; dependencies = { module=all-target-libgo; on=all-target-libffi; };
dependencies = { module=all-target-libgo; on=all-target-libatomic; }; dependencies = { module=all-target-libgo; on=all-target-libatomic; };
dependencies = { module=configure-target-libjava; on=configure-target-zlib; };
dependencies = { module=configure-target-libjava; on=configure-target-boehm-gc; };
dependencies = { module=configure-target-libjava; on=configure-target-libffi; };
dependencies = { module=all-target-libjava; on=all-fastjar; };
dependencies = { module=all-target-libjava; on=all-target-zlib; };
dependencies = { module=all-target-libjava; on=all-target-boehm-gc; };
dependencies = { module=all-target-libjava; on=all-target-libffi; };
dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc; }; dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc; };
dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; }; dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; };
dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; }; dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; };
...@@ -585,7 +575,6 @@ dependencies = { module=install-target-libcilkrts; on=install-target-libstdc++-v ...@@ -585,7 +575,6 @@ dependencies = { module=install-target-libcilkrts; on=install-target-libstdc++-v
dependencies = { module=install-target-libcilkrts; on=install-target-libgcc; }; dependencies = { module=install-target-libcilkrts; on=install-target-libgcc; };
dependencies = { module=install-target-liboffloadmic; on=install-target-libstdc++-v3; }; dependencies = { module=install-target-liboffloadmic; on=install-target-libstdc++-v3; };
dependencies = { module=install-target-liboffloadmic; on=install-target-libgcc; }; dependencies = { module=install-target-liboffloadmic; on=install-target-libgcc; };
dependencies = { module=install-target-libjava; on=install-target-libgcc; };
dependencies = { module=install-target-libitm; on=install-target-libgcc; }; dependencies = { module=install-target-libitm; on=install-target-libgcc; };
dependencies = { module=install-target-libobjc; on=install-target-libgcc; }; dependencies = { module=install-target-libobjc; on=install-target-libgcc; };
dependencies = { module=install-target-libstdc++-v3; on=install-target-libgcc; }; dependencies = { module=install-target-libstdc++-v3; on=install-target-libgcc; };
...@@ -610,8 +599,6 @@ languages = { language=c++; gcc-check-target=check-c++; ...@@ -610,8 +599,6 @@ languages = { language=c++; gcc-check-target=check-c++;
languages = { language=fortran; gcc-check-target=check-fortran; languages = { language=fortran; gcc-check-target=check-fortran;
lib-check-target=check-target-libquadmath; lib-check-target=check-target-libquadmath;
lib-check-target=check-target-libgfortran; }; lib-check-target=check-target-libgfortran; };
languages = { language=java; gcc-check-target=check-java;
lib-check-target=check-target-libjava; };
languages = { language=ada; gcc-check-target=check-ada; languages = { language=ada; gcc-check-target=check-ada;
lib-check-target=check-target-libada; }; lib-check-target=check-target-libada; };
languages = { language=objc; gcc-check-target=check-objc; languages = { language=objc; gcc-check-target=check-objc;
......
Makefile.tpl
...@@ -325,8 +325,6 @@ HOST_ISLVER = @islver@ ...@@ -325,8 +325,6 @@ HOST_ISLVER = @islver@
HOST_LIBELFLIBS = @libelflibs@ HOST_LIBELFLIBS = @libelflibs@
HOST_LIBELFINC = @libelfinc@ HOST_LIBELFINC = @libelfinc@
EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@
# ---------------------------------------------- # ----------------------------------------------
# Programs producing files for the BUILD machine # Programs producing files for the BUILD machine
# ---------------------------------------------- # ----------------------------------------------
......
configure
...@@ -674,7 +674,6 @@ CPPFLAGS ...@@ -674,7 +674,6 @@ CPPFLAGS
LDFLAGS LDFLAGS
CFLAGS CFLAGS
CC CC
EXTRA_CONFIGARGS_LIBJAVA
extra_liboffloadmic_configure_flags extra_liboffloadmic_configure_flags
target_subdir target_subdir
host_subdir host_subdir
...@@ -761,7 +760,6 @@ enable_libada ...@@ -761,7 +760,6 @@ enable_libada
enable_libssp enable_libssp
enable_libstdcxx enable_libstdcxx
enable_liboffloadmic enable_liboffloadmic
enable_static_libjava
enable_bootstrap enable_bootstrap
with_mpc with_mpc
with_mpc_include with_mpc_include
...@@ -786,7 +784,6 @@ enable_lto ...@@ -786,7 +784,6 @@ enable_lto
enable_linker_plugin_configure_flags enable_linker_plugin_configure_flags
enable_linker_plugin_flags enable_linker_plugin_flags
enable_stage1_languages enable_stage1_languages
enable_objc_gc
with_build_sysroot with_build_sysroot
with_debug_prefix_map with_debug_prefix_map
with_build_config with_build_config
...@@ -1489,8 +1486,6 @@ Optional Features: ...@@ -1489,8 +1486,6 @@ Optional Features:
--disable-libstdcxx do not build libstdc++-v3 directory --disable-libstdcxx do not build libstdc++-v3 directory
--enable-liboffloadmic=ARG --enable-liboffloadmic=ARG
build liboffloadmic [ARG={no,host,target}] build liboffloadmic [ARG={no,host,target}]
--enable-static-libjava[=ARG]
build static libjava [default=no]
--enable-bootstrap enable bootstrapping [yes if native build] --enable-bootstrap enable bootstrapping [yes if native build]
--disable-isl-version-check --disable-isl-version-check
disable check for isl version disable check for isl version
...@@ -1504,8 +1499,6 @@ Optional Features: ...@@ -1504,8 +1499,6 @@ Optional Features:
--enable-stage1-languages[=all] --enable-stage1-languages[=all]
choose additional languages to build during stage1. choose additional languages to build during stage1.
Mostly useful for compiler development Mostly useful for compiler development
--enable-objc-gc enable use of Boehm's garbage collector with the GNU
Objective-C runtime
--enable-vtable-verify Enable vtable verification feature --enable-vtable-verify Enable vtable verification feature
--enable-serial-[{host,target,build}-]configure --enable-serial-[{host,target,build}-]configure
force sequential configuration of sub-packages for force sequential configuration of sub-packages for
...@@ -2736,11 +2729,6 @@ host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktr ...@@ -2736,11 +2729,6 @@ host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktr
# If --enable-gold is used, "gold" may replace "ld". # If --enable-gold is used, "gold" may replace "ld".
host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools" host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
# libgcj represents the runtime libraries only used by gcj.
libgcj="target-libffi \
target-zlib \
target-libjava"
# these libraries are built for the target environment, and are built after # these libraries are built for the target environment, and are built after
# the host libraries and the host tools (which may be a cross compiler) # the host libraries and the host tools (which may be a cross compiler)
# Note that libiberty is not a target library. # Note that libiberty is not a target library.
...@@ -2760,8 +2748,6 @@ target_libraries="target-libgcc \ ...@@ -2760,8 +2748,6 @@ target_libraries="target-libgcc \
target-libssp \ target-libssp \
target-libquadmath \ target-libquadmath \
target-libgfortran \ target-libgfortran \
target-boehm-gc \
${libgcj} \
target-libobjc \ target-libobjc \
target-libada \ target-libada \
target-libgo" target-libgo"
...@@ -3148,43 +3134,6 @@ fi ...@@ -3148,43 +3134,6 @@ fi
# Save it here so that, even in case of --enable-libgcj, if the Java
# front-end isn't enabled, we still get libgcj disabled.
libgcj_saved=$libgcj
case $enable_libgcj in
yes)
# If we reset it here, it won't get added to noconfigdirs in the
# target-specific build rules, so it will be forcibly enabled
# (unless the Java language itself isn't enabled).
libgcj=
;;
no)
# Make sure we get it printed in the list of not supported target libs.
# Don't disable libffi, though, other languages use it.
noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`"
# Clear libgcj_saved so that even if java is enabled libffi won't be
# built.
libgcj_saved=
;;
esac
# Check whether --enable-static-libjava was given.
if test "${enable_static_libjava+set}" = set; then :
enableval=$enable_static_libjava; ENABLE_STATIC_LIBJAVA=$enableval
else
ENABLE_STATIC_LIBJAVA=no
fi
enable_static_libjava=
if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then
enable_static_libjava=yes
fi
if test x$enable_static_libjava != xyes ; then
EXTRA_CONFIGARGS_LIBJAVA=--disable-static
fi
# Enable libgomp by default on hosted POSIX systems, and a few others. # Enable libgomp by default on hosted POSIX systems, and a few others.
if test x$enable_libgomp = x ; then if test x$enable_libgomp = x ; then
case "${target}" in case "${target}" in
...@@ -3402,166 +3351,6 @@ case "${target}" in ...@@ -3402,166 +3351,6 @@ case "${target}" in
;; ;;
esac esac
# Disable Java if libffi is not supported.
case "${target}" in
aarch64-*-*)
;;
alpha*-*-*)
;;
arm*-*-*)
;;
cris-*-*)
;;
frv-*-*)
;;
hppa*-*-linux*)
;;
hppa*-*-hpux*)
;;
i?86-*-*)
;;
ia64*-*-*)
;;
m32r*-*-*)
;;
m68k-*-*)
;;
mips*-*-rtems*)
;;
mips*-*-linux*)
;;
powerpc*-*-linux*)
;;
powerpc-*-darwin*)
;;
powerpc-*-aix* | rs6000-*-aix*)
;;
powerpc-*-freebsd*)
;;
powerpc64-*-freebsd*)
;;
powerpc*-*-rtems*)
;;
s390-*-* | s390x-*-*)
;;
sh-*-* | sh[34]*-*-*)
;;
sparc*-*-*)
;;
x86_64-*-*)
;;
*-*-*)
unsupported_languages="$unsupported_languages java"
;;
esac
# Disable Java, libgcj or related libraries for some systems.
case "${target}" in
powerpc-*-darwin*)
;;
i[3456789]86-*-darwin*)
;;
x86_64-*-darwin[912]*)
;;
*-*-darwin*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-netware*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-phoenix*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-rtems*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-tpf*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-uclinux*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-vxworks*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
alpha*-*-*vms*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
arm*-*-freebsd*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
arm-wince-pe)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
arm*-*-symbianelf*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
bfin-*-*)
noconfigdirs="$noconfigdirs target-boehm-gc"
;;
cris-*-* | crisv32-*-*)
unsupported_languages="$unsupported_languages java"
case "${target}" in
*-*-linux*)
;;
*) # See PR46792 regarding target-libffi.
noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
esac
;;
hppa*64*-*-linux*)
# In this case, it's because the hppa64-linux target is for
# the kernel only at this point and has no libc, and thus no
# headers, crt*.o, etc., all of which are needed by these.
unsupported_languages="$unsupported_languages java"
;;
hppa*64*-*-hpux*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
hppa*-hp-hpux11*)
;;
hppa*-*-hpux*)
# According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
# build on HP-UX 10.20.
noconfigdirs="$noconfigdirs ${libgcj}"
;;
ia64*-*-*vms*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
i[3456789]86-w64-mingw*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
i[3456789]86-*-mingw*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
x86_64-*-mingw*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
mmix-*-*)
noconfigdirs="$noconfigdirs target-libffi target-boehm-gc"
;;
powerpc-*-aix*)
# copied from rs6000-*-* entry
noconfigdirs="$noconfigdirs ${libgcj}"
;;
rs6000-*-aix*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
ft32-*-*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-lynxos*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
esac
# Disable the go frontend on systems where it is known to not work. Please keep
# this in sync with contrib/config-list.mk.
case "${target}" in
*-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)
unsupported_languages="$unsupported_languages go"
;;
esac
# Disable libgo for some systems where it is known to not work. # Disable libgo for some systems where it is known to not work.
# For testing, you can easily override this with --enable-libgo. # For testing, you can easily override this with --enable-libgo.
if test x$enable_libgo = x; then if test x$enable_libgo = x; then
...@@ -6504,30 +6293,6 @@ for dir in $configdirs $build_configdirs $target_configdirs ; do ...@@ -6504,30 +6293,6 @@ for dir in $configdirs $build_configdirs $target_configdirs ; do
fi fi
done done
# Check for Boehm's garbage collector
# Check whether --enable-objc-gc was given.
if test "${enable_objc_gc+set}" = set; then :
enableval=$enable_objc_gc; case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in
*,objc,*:*:yes:*target-boehm-gc*)
as_fn_error "Boehm's garbage collector was requested yet not supported in this configuration" "$LINENO" 5
;;
esac
fi
# Make sure we only build Boehm's garbage collector if required.
case ,${enable_languages},:${enable_objc_gc} in
*,objc,*:yes)
# Keep target-boehm-gc if requested for Objective-C.
;;
*)
# Otherwise remove target-boehm-gc depending on target-libjava.
if echo " ${noconfigdirs} " | grep "target-libjava" >/dev/null 2>&1; then
noconfigdirs="$noconfigdirs target-boehm-gc"
fi
;;
esac
# Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++ # Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++
case ,${enable_languages}, in case ,${enable_languages}, in
*,c++,*) *,c++,*)
...@@ -6612,15 +6377,6 @@ for i in ${target_configdirs_all} ; do ...@@ -6612,15 +6377,6 @@ for i in ${target_configdirs_all} ; do
fi fi
done done
# Exclude target-zlib if target-libjava isn't built.
case ${target_configdirs} in
*target-libjava*)
;;
*)
target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
;;
esac
# libiberty-linker-plugin is special: it doesn't have its own source directory, # libiberty-linker-plugin is special: it doesn't have its own source directory,
# so we have to add it after the preceding checks. # so we have to add it after the preceding checks.
if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x
......
configure.ac
...@@ -142,11 +142,6 @@ host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktr ...@@ -142,11 +142,6 @@ host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktr
# If --enable-gold is used, "gold" may replace "ld". # If --enable-gold is used, "gold" may replace "ld".
host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools" host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
# libgcj represents the runtime libraries only used by gcj.
libgcj="target-libffi \
target-zlib \
target-libjava"
# these libraries are built for the target environment, and are built after # these libraries are built for the target environment, and are built after
# the host libraries and the host tools (which may be a cross compiler) # the host libraries and the host tools (which may be a cross compiler)
# Note that libiberty is not a target library. # Note that libiberty is not a target library.
...@@ -166,8 +161,6 @@ target_libraries="target-libgcc \ ...@@ -166,8 +161,6 @@ target_libraries="target-libgcc \
target-libssp \ target-libssp \
target-libquadmath \ target-libquadmath \
target-libgfortran \ target-libgfortran \
target-boehm-gc \
${libgcj} \
target-libobjc \ target-libobjc \
target-libada \ target-libada \
target-libgo" target-libgo"
...@@ -507,41 +500,6 @@ else ...@@ -507,41 +500,6 @@ else
fi]) fi])
AC_SUBST(extra_liboffloadmic_configure_flags) AC_SUBST(extra_liboffloadmic_configure_flags)
# Save it here so that, even in case of --enable-libgcj, if the Java
# front-end isn't enabled, we still get libgcj disabled.
libgcj_saved=$libgcj
case $enable_libgcj in
yes)
# If we reset it here, it won't get added to noconfigdirs in the
# target-specific build rules, so it will be forcibly enabled
# (unless the Java language itself isn't enabled).
libgcj=
;;
no)
# Make sure we get it printed in the list of not supported target libs.
# Don't disable libffi, though, other languages use it.
noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`"
# Clear libgcj_saved so that even if java is enabled libffi won't be
# built.
libgcj_saved=
;;
esac
AC_ARG_ENABLE(static-libjava,
[AS_HELP_STRING([[--enable-static-libjava[=ARG]]],
[build static libjava @<:@default=no@:>@])],
ENABLE_STATIC_LIBJAVA=$enableval,
ENABLE_STATIC_LIBJAVA=no)
enable_static_libjava=
if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then
enable_static_libjava=yes
fi
if test x$enable_static_libjava != xyes ; then
EXTRA_CONFIGARGS_LIBJAVA=--disable-static
fi
AC_SUBST(EXTRA_CONFIGARGS_LIBJAVA)
# Enable libgomp by default on hosted POSIX systems, and a few others. # Enable libgomp by default on hosted POSIX systems, and a few others.
if test x$enable_libgomp = x ; then if test x$enable_libgomp = x ; then
case "${target}" in case "${target}" in
...@@ -738,166 +696,6 @@ case "${target}" in ...@@ -738,166 +696,6 @@ case "${target}" in
;; ;;
esac esac
# Disable Java if libffi is not supported.
case "${target}" in
aarch64-*-*)
;;
alpha*-*-*)
;;
arm*-*-*)
;;
cris-*-*)
;;
frv-*-*)
;;
hppa*-*-linux*)
;;
hppa*-*-hpux*)
;;
i?86-*-*)
;;
ia64*-*-*)
;;
m32r*-*-*)
;;
m68k-*-*)
;;
mips*-*-rtems*)
;;
mips*-*-linux*)
;;
powerpc*-*-linux*)
;;
powerpc-*-darwin*)
;;
powerpc-*-aix* | rs6000-*-aix*)
;;
powerpc-*-freebsd*)
;;
powerpc64-*-freebsd*)
;;
powerpc*-*-rtems*)
;;
s390-*-* | s390x-*-*)
;;
sh-*-* | sh[[34]]*-*-*)
;;
sparc*-*-*)
;;
x86_64-*-*)
;;
*-*-*)
unsupported_languages="$unsupported_languages java"
;;
esac
# Disable Java, libgcj or related libraries for some systems.
case "${target}" in
powerpc-*-darwin*)
;;
i[[3456789]]86-*-darwin*)
;;
x86_64-*-darwin[[912]]*)
;;
*-*-darwin*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-netware*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-phoenix*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-rtems*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-tpf*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-uclinux*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-vxworks*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
alpha*-*-*vms*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
arm*-*-freebsd*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
arm-wince-pe)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
arm*-*-symbianelf*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
bfin-*-*)
noconfigdirs="$noconfigdirs target-boehm-gc"
;;
cris-*-* | crisv32-*-*)
unsupported_languages="$unsupported_languages java"
case "${target}" in
*-*-linux*)
;;
*) # See PR46792 regarding target-libffi.
noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
esac
;;
hppa*64*-*-linux*)
# In this case, it's because the hppa64-linux target is for
# the kernel only at this point and has no libc, and thus no
# headers, crt*.o, etc., all of which are needed by these.
unsupported_languages="$unsupported_languages java"
;;
hppa*64*-*-hpux*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
hppa*-hp-hpux11*)
;;
hppa*-*-hpux*)
# According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
# build on HP-UX 10.20.
noconfigdirs="$noconfigdirs ${libgcj}"
;;
ia64*-*-*vms*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
i[[3456789]]86-w64-mingw*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
i[[3456789]]86-*-mingw*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
x86_64-*-mingw*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
mmix-*-*)
noconfigdirs="$noconfigdirs target-libffi target-boehm-gc"
;;
powerpc-*-aix*)
# copied from rs6000-*-* entry
noconfigdirs="$noconfigdirs ${libgcj}"
;;
rs6000-*-aix*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
ft32-*-*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
*-*-lynxos*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
esac
# Disable the go frontend on systems where it is known to not work. Please keep
# this in sync with contrib/config-list.mk.
case "${target}" in
*-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)
unsupported_languages="$unsupported_languages go"
;;
esac
# Disable libgo for some systems where it is known to not work. # Disable libgo for some systems where it is known to not work.
# For testing, you can easily override this with --enable-libgo. # For testing, you can easily override this with --enable-libgo.
if test x$enable_libgo = x; then if test x$enable_libgo = x; then
...@@ -2160,30 +1958,6 @@ for dir in $configdirs $build_configdirs $target_configdirs ; do ...@@ -2160,30 +1958,6 @@ for dir in $configdirs $build_configdirs $target_configdirs ; do
fi fi
done done
# Check for Boehm's garbage collector
AC_ARG_ENABLE(objc-gc,
[AS_HELP_STRING([--enable-objc-gc],
[enable use of Boehm's garbage collector with the
GNU Objective-C runtime])],
[case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in
*,objc,*:*:yes:*target-boehm-gc*)
AC_MSG_ERROR([Boehm's garbage collector was requested yet not supported in this configuration])
;;
esac])
# Make sure we only build Boehm's garbage collector if required.
case ,${enable_languages},:${enable_objc_gc} in
*,objc,*:yes)
# Keep target-boehm-gc if requested for Objective-C.
;;
*)
# Otherwise remove target-boehm-gc depending on target-libjava.
if echo " ${noconfigdirs} " | grep "target-libjava" >/dev/null 2>&1; then
noconfigdirs="$noconfigdirs target-boehm-gc"
fi
;;
esac
# Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++ # Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++
case ,${enable_languages}, in case ,${enable_languages}, in
*,c++,*) *,c++,*)
...@@ -2268,15 +2042,6 @@ for i in ${target_configdirs_all} ; do ...@@ -2268,15 +2042,6 @@ for i in ${target_configdirs_all} ; do
fi fi
done done
# Exclude target-zlib if target-libjava isn't built.
case ${target_configdirs} in
*target-libjava*)
;;
*)
target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
;;
esac
# libiberty-linker-plugin is special: it doesn't have its own source directory, # libiberty-linker-plugin is special: it doesn't have its own source directory,
# so we have to add it after the preceding checks. # so we have to add it after the preceding checks.
if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x
...@@ -3438,8 +3203,6 @@ GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX, ...@@ -3438,8 +3203,6 @@ GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
c++) c++)
GCC_TARGET_TOOL(dlltool, DLLTOOL_FOR_TARGET, DLLTOOL, [binutils/dlltool]) GCC_TARGET_TOOL(dlltool, DLLTOOL_FOR_TARGET, DLLTOOL, [binutils/dlltool])
GCC_TARGET_TOOL(gcc, GCC_FOR_TARGET, , [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/]) GCC_TARGET_TOOL(gcc, GCC_FOR_TARGET, , [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
GCC_TARGET_TOOL(gcj, GCJ_FOR_TARGET, GCJ,
[gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/], java)
GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_TARGET, GFORTRAN, GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_TARGET, GFORTRAN,
[gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran) [gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran)
GCC_TARGET_TOOL(gccgo, GOC_FOR_TARGET, GOC, GCC_TARGET_TOOL(gccgo, GOC_FOR_TARGET, GOC,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment