
<toplevel>

2016-11-14  Matthias Klose  <doko@ubuntu.com>

	* config-ml.in: Remove references to GCJ.
	* configure.ac: Likewise.
	* configure: Regenerate.

config/

2016-11-14  Matthias Klose  <doko@ubuntu.com>

	multi.m4: Don't set GCJ.

gcc/

2016-11-14  Matthias Klose  <doko@ubuntu.com>

	* doc/install.texi: Remove references to gcj/libjava.
	* doc/invoke.texi: Likewise.

Index: config/multi.m4
===================================================================
--- config/multi.m4	(revision 242381)
+++ config/multi.m4	(working copy)
@@ -64,5 +64,4 @@
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 CC="$CC"
 CXX="$CXX"
-GFORTRAN="$GFORTRAN"
-GCJ="$GCJ"])])dnl
+GFORTRAN="$GFORTRAN"])])dnl
Index: config-ml.in
===================================================================
--- config-ml.in	(revision 242381)
+++ config-ml.in	(working copy)
@@ -511,7 +511,6 @@
 				ADAFLAGS="$(ADAFLAGS) $${flags}" \
 				prefix="$(prefix)" \
 				exec_prefix="$(exec_prefix)" \
-				GCJFLAGS="$(GCJFLAGS) $${flags}" \
 				GOCFLAGS="$(GOCFLAGS) $${flags}" \
 				CXXFLAGS="$(CXXFLAGS) $${flags}" \
 				LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
@@ -746,13 +745,12 @@
         break
       fi
     done
-    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
 
     if [ "${with_target_subdir}" = "." ]; then
 	CC_=$CC' '
 	CXX_=$CXX' '
 	F77_=$F77' '
-	GCJ_=$GCJ' '
 	GFORTRAN_=$GFORTRAN' '
 	GOC_=$GOC' '
     else
@@ -795,18 +793,6 @@
 	  esac
 	done
 
-	GCJ_=
-	for arg in ${GCJ}; do
-	  case $arg in
-	  -[BIL]"${ML_POPDIR}"/*)
-	    GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-	  "${ML_POPDIR}"/*)
-	    GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-	  *)
-	    GCJ_="${GCJ_}${arg} " ;;
-	  esac
-	done
-
 	GFORTRAN_=
 	for arg in ${GFORTRAN}; do
 	  case $arg in
Index: configure.ac
===================================================================
--- configure.ac	(revision 242381)
+++ configure.ac	(working copy)
@@ -1256,7 +1256,6 @@
   AS_FOR_BUILD=${AS_FOR_BUILD-as}
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
   CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
-  GCJ_FOR_BUILD=${GCJ_FOR_BUILD-gcj}
   GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
   GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
   DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
@@ -1270,7 +1269,6 @@
   AS_FOR_BUILD="\$(AS)"
   CC_FOR_BUILD="\$(CC)"
   CXX_FOR_BUILD="\$(CXX)"
-  GCJ_FOR_BUILD="\$(GCJ)"
   GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
   GOC_FOR_BUILD="\$(GOC)"
   DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
@@ -3183,7 +3181,6 @@
 AC_SUBST(CXXFLAGS_FOR_BUILD)
 AC_SUBST(CXX_FOR_BUILD)
 AC_SUBST(DLLTOOL_FOR_BUILD)
-AC_SUBST(GCJ_FOR_BUILD)
 AC_SUBST(GFORTRAN_FOR_BUILD)
 AC_SUBST(GOC_FOR_BUILD)
 AC_SUBST(LDFLAGS_FOR_BUILD)
@@ -3293,7 +3290,6 @@
 NCN_STRICT_CHECK_TARGET_TOOLS(CC_FOR_TARGET, cc gcc)
 NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TARGET, c++ g++ cxx gxx)
 NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
-NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj)
 NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
 NCN_STRICT_CHECK_TARGET_TOOLS(GOC_FOR_TARGET, gccgo)
 
Index: gcc/doc/install.texi
===================================================================
--- gcc/doc/install.texi	(revision 242381)
+++ gcc/doc/install.texi	(working copy)
@@ -338,10 +338,6 @@
 Used by various scripts to generate some files included in SVN (mainly
 Unicode-related and rarely changing) from source tables.
 
-@item @command{jar}, or InfoZIP (@command{zip} and @command{unzip})
-
-Necessary to build libgcj, the GCJ runtime.
-
 @end table
 
 Several support libraries are necessary to build GCC, some are required,
@@ -2139,240 +2135,6 @@
 tools.
 @end table
 
-@subheading Java-Specific Options
-
-The following option applies to the build of the Java front end.
-
-@table @code
-@item --disable-libgcj
-Specify that the run-time libraries
-used by GCJ should not be built.  This is useful in case you intend
-to use GCJ with some other run-time, or you're going to install it
-separately, or it just happens not to build on your particular
-machine.  In general, if the Java front end is enabled, the GCJ
-libraries will be enabled too, unless they're known to not work on
-the target platform.  If GCJ is enabled but @samp{libgcj} isn't built, you
-may need to port it; in this case, before modifying the top-level
-@file{configure.ac} so that @samp{libgcj} is enabled by default on this platform,
-you may use @option{--enable-libgcj} to override the default.
-
-@end table
-
-The following options apply to building @samp{libgcj}.
-
-@subsubheading General Options
-
-@table @code
-@item --enable-java-maintainer-mode
-By default the @samp{libjava} build will not attempt to compile the
-@file{.java} source files to @file{.class}.  Instead, it will use the
-@file{.class} files from the source tree.  If you use this option you
-must have executables named @command{ecj1} and @command{gjavah} in your path
-for use by the build.  You must use this option if you intend to
-modify any @file{.java} files in @file{libjava}.
-
-@item --with-java-home=@var{dirname}
-This @samp{libjava} option overrides the default value of the
-@samp{java.home} system property.  It is also used to set
-@samp{sun.boot.class.path} to @file{@var{dirname}/lib/rt.jar}.  By
-default @samp{java.home} is set to @file{@var{prefix}} and
-@samp{sun.boot.class.path} to
-@file{@var{datadir}/java/libgcj-@var{version}.jar}.
-
-@item --with-ecj-jar=@var{filename}
-This option can be used to specify the location of an external jar
-file containing the Eclipse Java compiler.  A specially modified
-version of this compiler is used by @command{gcj} to parse
-@file{.java} source files.  If this option is given, the
-@samp{libjava} build will create and install an @file{ecj1} executable
-which uses this jar file at runtime.
-
-If this option is not given, but an @file{ecj.jar} file is found in
-the topmost source tree at configure time, then the @samp{libgcj}
-build will create and install @file{ecj1}, and will also install the
-discovered @file{ecj.jar} into a suitable place in the install tree.
-
-If @file{ecj1} is not installed, then the user will have to supply one
-on his path in order for @command{gcj} to properly parse @file{.java}
-source files.  A suitable jar is available from
-@uref{ftp://sourceware.org/pub/java/}.
-
-@item --disable-getenv-properties
-Don't set system properties from @env{GCJ_PROPERTIES}.
-
-@item --enable-hash-synchronization
-Use a global hash table for monitor locks.  Ordinarily,
-@samp{libgcj}'s @samp{configure} script automatically makes
-the correct choice for this option for your platform.  Only use
-this if you know you need the library to be configured differently.
-
-@item --enable-interpreter
-Enable the Java interpreter.  The interpreter is automatically
-enabled by default on all platforms that support it.  This option
-is really only useful if you want to disable the interpreter
-(using @option{--disable-interpreter}).
-
-@item --disable-java-net
-Disable java.net.  This disables the native part of java.net only,
-using non-functional stubs for native method implementations.
-
-@item --disable-jvmpi
-Disable JVMPI support.
-
-@item --disable-libgcj-bc
-Disable BC ABI compilation of certain parts of libgcj.  By default,
-some portions of libgcj are compiled with @option{-findirect-dispatch}
-and @option{-fno-indirect-classes}, allowing them to be overridden at
-run-time.
-
-If @option{--disable-libgcj-bc} is specified, libgcj is built without
-these options.  This allows the compile-time linker to resolve
-dependencies when statically linking to libgcj.  However it makes it
-impossible to override the affected portions of libgcj at run-time.
-
-@item --enable-reduced-reflection
-Build most of libgcj with @option{-freduced-reflection}.  This reduces
-the size of libgcj at the expense of not being able to do accurate
-reflection on the classes it contains.  This option is safe if you
-know that code using libgcj will never use reflection on the standard
-runtime classes in libgcj (including using serialization, RMI or CORBA).
-
-@item --with-ecos
-Enable runtime eCos target support.
-
-@item --without-libffi
-Don't use @samp{libffi}.  This will disable the interpreter and JNI
-support as well, as these require @samp{libffi} to work.
-
-@item --enable-libgcj-debug
-Enable runtime debugging code.
-
-@item --enable-libgcj-multifile
-If specified, causes all @file{.java} source files to be
-compiled into @file{.class} files in one invocation of
-@samp{gcj}.  This can speed up build time, but is more
-resource-intensive.  If this option is unspecified or
-disabled, @samp{gcj} is invoked once for each @file{.java}
-file to compile into a @file{.class} file.
-
-@item --with-libiconv-prefix=DIR
-Search for libiconv in @file{DIR/include} and @file{DIR/lib}.
-
-@item --enable-sjlj-exceptions
-Force use of the @code{setjmp}/@code{longjmp}-based scheme for exceptions.
-@samp{configure} ordinarily picks the correct value based on the platform.
-Only use this option if you are sure you need a different setting.
-
-@item --with-system-zlib
-Use installed @samp{zlib} rather than that included with GCC@.
-
-@item --with-win32-nlsapi=ansi, unicows or unicode
-Indicates how MinGW @samp{libgcj} translates between UNICODE
-characters and the Win32 API@.
-
-@item --enable-java-home
-If enabled, this creates a JPackage compatible SDK environment during install.
-Note that if --enable-java-home is used, --with-arch-directory=ARCH must also
-be specified.
-
-@item --with-arch-directory=ARCH
-Specifies the name to use for the @file{jre/lib/ARCH} directory in the SDK
-environment created when --enable-java-home is passed. Typical names for this
-directory include i386, amd64, ia64, etc.
-
-@item --with-os-directory=DIR
-Specifies the OS directory for the SDK include directory. This is set to auto
-detect, and is typically 'linux'.
-
-@item --with-origin-name=NAME
-Specifies the JPackage origin name. This defaults to the 'gcj' in
-java-1.5.0-gcj.
-
-@item --with-arch-suffix=SUFFIX
-Specifies the suffix for the sdk directory. Defaults to the empty string.
-Examples include '.x86_64' in 'java-1.5.0-gcj-1.5.0.0.x86_64'.
-
-@item --with-jvm-root-dir=DIR
-Specifies where to install the SDK. Default is $(prefix)/lib/jvm.
-
-@item --with-jvm-jar-dir=DIR
-Specifies where to install jars. Default is $(prefix)/lib/jvm-exports.
-
-@item --with-python-dir=DIR
-Specifies where to install the Python modules used for aot-compile. DIR should
-not include the prefix used in installation. For example, if the Python modules
-are to be installed in /usr/lib/python2.5/site-packages, then
---with-python-dir=/lib/python2.5/site-packages should be passed. If this is
-not specified, then the Python modules are installed in $(prefix)/share/python.
-
-@item --enable-aot-compile-rpm
-Adds aot-compile-rpm to the list of installed scripts.
-
-@item --enable-browser-plugin
-Build the gcjwebplugin web browser plugin.
-
-@item --enable-static-libjava
-Build static libraries in libjava. The default is to only build shared
-libraries.
-
-@table @code
-@item ansi
-Use the single-byte @code{char} and the Win32 A functions natively,
-translating to and from UNICODE when using these functions.  If
-unspecified, this is the default.
-
-@item unicows
-Use the @code{WCHAR} and Win32 W functions natively.  Adds
-@code{-lunicows} to @file{libgcj.spec} to link with @samp{libunicows}.
-@file{unicows.dll} needs to be deployed on Microsoft Windows 9X machines
-running built executables.  @file{libunicows.a}, an open-source
-import library around Microsoft's @code{unicows.dll}, is obtained from
-@uref{http://libunicows.sourceforge.net/}, which also gives details
-on getting @file{unicows.dll} from Microsoft.
-
-@item unicode
-Use the @code{WCHAR} and Win32 W functions natively.  Does @emph{not}
-add @code{-lunicows} to @file{libgcj.spec}.  The built executables will
-only run on Microsoft Windows NT and above.
-@end table
-@end table
-
-@subsubheading AWT-Specific Options
-
-@table @code
-@item --with-x
-Use the X Window System.
-
-@item --enable-java-awt=PEER(S)
-Specifies the AWT peer library or libraries to build alongside
-@samp{libgcj}.  If this option is unspecified or disabled, AWT
-will be non-functional.  Current valid values are @option{gtk} and
-@option{xlib}.  Multiple libraries should be separated by a
-comma (i.e.@: @option{--enable-java-awt=gtk,xlib}).
-
-@item --enable-gtk-cairo
-Build the cairo Graphics2D implementation on GTK@.
-
-@item --enable-java-gc=TYPE
-Choose garbage collector.  Defaults to @option{boehm} if unspecified.
-
-@item --disable-gtktest
-Do not try to compile and run a test GTK+ program.
-
-@item --disable-glibtest
-Do not try to compile and run a test GLIB program.
-
-@item --with-libart-prefix=PFX
-Prefix where libart is installed (optional).
-
-@item --with-libart-exec-prefix=PFX
-Exec prefix where libart is installed (optional).
-
-@item --disable-libarttest
-Do not try to compile and run a test libart program.
-
-@end table
-
 @subsubheading Overriding @command{configure} test results
 
 Sometimes, it might be necessary to override the result of some
Index: gcc/doc/invoke.texi
===================================================================
--- gcc/doc/invoke.texi	(revision 242381)
+++ gcc/doc/invoke.texi	(working copy)
@@ -11438,10 +11438,9 @@
 across different shared libraries.  In that case, each of the libraries
 as well as the application itself should use the shared @file{libgcc}.
 
-Therefore, the G++ and GCJ drivers automatically add
-@option{-shared-libgcc} whenever you build a shared library or a main
-executable, because C++ and Java programs typically use exceptions, so
-this is the right thing to do.
+Therefore, the G++ and driver automatically adds @option{-shared-libgcc}
+ whenever you build a shared library or a main executable, because C++
+ programs typically use exceptions, so this is the right thing to do.
 
 If, instead, you use the GCC driver to create shared libraries, you may
 find that they are not always linked with the shared @file{libgcc}.
@@ -11455,7 +11454,7 @@
 costs at library load time.
 
 However, if a library or main executable is supposed to throw or catch
-exceptions, you must link it using the G++ or GCJ driver, as appropriate
+exceptions, you must link it using the G++ driver, as appropriate
 for the languages used in the program, or using the option
 @option{-shared-libgcc}, such that it is linked with the shared
 @file{libgcc}.
