From 657f2849bed5a2ffe6eb04310cd4b2187c29067c Mon Sep 17 00:00:00 2001 From: aph Date: Fri, 30 Sep 2016 16:08:23 +0000 Subject: 2016-09-05 Andrew Haley * Makefile.def: Remove libjava. * Makefile.tpl: Likewise. * Makefile.in: Regenerate. * configure.ac: Likewise. * configure: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@240661 138bc75d-0d04-0410-961f-82ee72b054a4 --- configure | 244 -------------------------------------------------------------- 1 file changed, 244 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 3b30f770ca96..0522f4182f0f 100755 --- a/configure +++ b/configure @@ -674,7 +674,6 @@ CPPFLAGS LDFLAGS CFLAGS CC -EXTRA_CONFIGARGS_LIBJAVA extra_liboffloadmic_configure_flags target_subdir host_subdir @@ -761,7 +760,6 @@ enable_libada enable_libssp enable_libstdcxx enable_liboffloadmic -enable_static_libjava enable_bootstrap with_mpc with_mpc_include @@ -786,7 +784,6 @@ enable_lto enable_linker_plugin_configure_flags enable_linker_plugin_flags enable_stage1_languages -enable_objc_gc with_build_sysroot with_debug_prefix_map with_build_config @@ -1489,8 +1486,6 @@ Optional Features: --disable-libstdcxx do not build libstdc++-v3 directory --enable-liboffloadmic=ARG build liboffloadmic [ARG={no,host,target}] - --enable-static-libjava[=ARG] - build static libjava [default=no] --enable-bootstrap enable bootstrapping [yes if native build] --disable-isl-version-check disable check for isl version @@ -1504,8 +1499,6 @@ Optional Features: --enable-stage1-languages[=all] choose additional languages to build during stage1. 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-serial-[{host,target,build}-]configure force sequential configuration of sub-packages for @@ -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". 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 # the host libraries and the host tools (which may be a cross compiler) # Note that libiberty is not a target library. @@ -2760,8 +2748,6 @@ target_libraries="target-libgcc \ target-libssp \ target-libquadmath \ target-libgfortran \ - target-boehm-gc \ - ${libgcj} \ target-libobjc \ target-libada \ target-libgo" @@ -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. if test x$enable_libgomp = x ; then case "${target}" in @@ -3402,166 +3351,6 @@ case "${target}" in ;; 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 , 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. # For testing, you can easily override this with --enable-libgo. if test x$enable_libgo = x; then @@ -6504,30 +6293,6 @@ for dir in $configdirs $build_configdirs $target_configdirs ; do fi 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++ case ,${enable_languages}, in *,c++,*) @@ -6612,15 +6377,6 @@ for i in ${target_configdirs_all} ; do fi 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, # so we have to add it after the preceding checks. if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x -- cgit v1.2.3