--- a/ChangeLog	Fri Apr 01 03:10:31 2016 +0100
+++ b/ChangeLog	Fri Apr 01 03:32:05 2016 +0100
@@ -1,3 +1,24 @@
+2016-03-31  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2766: Remove all references to GCJ
+	* Makefile.am:
+	Remove dead commented out lines.
+	(ICEDTEA_BOOTSTRAP_CLASSES): Remove unused variable.
+	(clean-local): Remove clean-native-ecj.
+	(native-ecj): Removed.
+	(clean-native-ecj): Likewise.
+	(bootstrap-directory-stage1): Remove dependency on
+	native-ecj.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_WITH_GCJ): Removed.
+	(IT_CHECK_FOR_JDK): Remove unused GCJ_VMS variable.
+	* configure.ac:
+	Don't invoke IT_WITH_GCJ or search for gcj.
+	* javac.in:
+	Update bootstrap classpath. Remove attempt to
+	use native-ecj.
+
 2016-03-31  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2547: Extend tarball checksumming option to

--- a/Makefile.am	Fri Apr 01 03:10:31 2016 +0100
+++ b/Makefile.am	Fri Apr 01 03:32:05 2016 +0100
@@ -93,13 +93,6 @@
 CACERTS_FILE = \
   `if [ -h $(JDK_CACERTS_FILE) ] ; then $(READLINK) -e $(JDK_CACERTS_FILE) ; else echo $(JDK_CACERTS_FILE); fi`
 
-# Sources used from OpenJDK.
-#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement
-#PR48033 - Missing javax.management.remote.JMXServiceURL
-#PR48034 - javax.management.modelmbean.ModelMBeanInfo
-#PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure 
-ICEDTEA_BOOTSTRAP_CLASSES =
-
 # Settings for javac
 
 IT_LANGUAGE_SOURCE_VERSION=6
@@ -560,19 +553,6 @@
 	LCMS_CFLAGS="${LCMS2_CFLAGS}"
 endif
 
-# Dropped for new build
-#	ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" 
-#	ANT="$(ANT)" 
-#	ALT_BOOTDIR="$(BOOT_DIR)" 
-#	BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" 
-#	ICEDTEA_RT="$(RUNTIME)" 
-#	FREETYPE2_HEADERS="$(FREETYPE2_CFLAGS)" 
-#	FT2_LIB="$(FREETYPE2_LIBS)" 
-#	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" 
-#	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" 
-#	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" 
-#	ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)"
-
 if ENABLE_JAR_COMPRESSION
 ICEDTEA_ENV += \
 	COMPRESS_JARS="true"
@@ -610,13 +590,6 @@
 	JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \
 	DISABLE_NIMBUS="true"
 
-# Dropped for new build
-#	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" 
-#	BOOTCLASSPATH_CLS="-bootclasspath $(CLS_DIR_BOOT)" 
-#	BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(RUNTIME)" 
-#	ALT_OUTPUTDIR="$(BOOT_BUILD_OUTPUT_DIR)"
-#	XSLT="$(XSLTPROC)"
-
 # Source files
 
 JTREG_SRCS = $(top_srcdir)/test/jtreg/com/sun/javatest/cof/i18n.properties \
@@ -727,10 +700,10 @@
  clean-icedtea clean-icedtea-debug clean-icedtea-boot clean-clone clean-clone-boot \
  clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
  clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
- clean-extract clean-native-ecj clean-icedtea-stage2 \
- clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
- clean-add-cacao clean-add-cacao-debug clean-cryptocheck clean-ecccheck \
- clean-policytool-@JAVA_VER@.desktop clean-jconsole-@JAVA_VER@.desktop
+ clean-extract clean-icedtea-stage2 clean-icedtea-debug-stage2 clean-icedtea-stage1 \
+ clean-add-zero clean-add-zero-debug clean-add-cacao clean-add-cacao-debug \
+ clean-cryptocheck clean-ecccheck clean-policytool-@JAVA_VER@.desktop \
+ clean-jconsole-@JAVA_VER@.desktop
 	if [ -e bootstrap ]; then \
 	  rmdir bootstrap ; \
 	fi
@@ -1723,21 +1696,8 @@
 # Bootstrap Directory Targets
 # ===========================
 
-# Optional native ecj
-stamps/native-ecj.stamp:
-	mkdir -p stamps 
-if BUILD_NATIVE_ECJ
-	${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
-	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
-endif
-	touch $@
-
-clean-native-ecj:
-	rm -f native-ecj
-	rm -rf stamps/native-ecj.stamp
-
 # bootstrap/stage1
-stamps/bootstrap-directory-stage1.stamp: stamps/native-ecj.stamp
+stamps/bootstrap-directory-stage1.stamp:
 	mkdir -p $(STAGE1_BOOT_DIR)/bin stamps/
 	ln -sf $(JAVA) $(STAGE1_BOOT_DIR)/bin/java
 	ln -sf ../../../javah $(STAGE1_BOOT_DIR)/bin/javah
@@ -3057,8 +3017,6 @@
 
 jtreg: stamps/jtreg.stamp
 
-native-ecj: stamps/native-ecj.stamp
-
 overlay: stamps/overlay.stamp
 
 patch: stamps/patch.stamp

--- a/NEWS	Fri Apr 01 03:10:31 2016 +0100
+++ b/NEWS	Fri Apr 01 03:32:05 2016 +0100
@@ -138,6 +138,7 @@
   - PR2738: java.lang.UnsatisfiedLinkError: no javalcms in java.library.path
   - PR2743: Remove bad AArch64 merge fragment
   - PR2759: LCMS library should be named javalcms, not lcms, to avoid potential conflicts with the system library
+  - PR2766: Remove all references to GCJ
   - PR2767: Remove remaining rogue binaries from OpenJDK tree
   - PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed
   - PR2777: Fix MAX/MIN template usage on s390

--- a/acinclude.m4	Fri Apr 01 03:10:31 2016 +0100
+++ b/acinclude.m4	Fri Apr 01 03:32:05 2016 +0100
@@ -841,25 +841,6 @@
   AC_SUBST(VERSION_SUFFIX, $version_suffix)
 ])
 
-AC_DEFUN([IT_WITH_GCJ],
-[
-  AC_MSG_CHECKING([whether to compile ecj natively])
-  AC_ARG_WITH([gcj],
-	      [AS_HELP_STRING([--with-gcj[[=PATH]]],location of gcj for natively compiling ecj)],
-  [
-    GCJ="${withval}"
-  ],
-  [ 
-    GCJ="no"
-  ])
-  AC_MSG_RESULT([${GCJ}])
-  if test "x${GCJ}" = xyes; then
-    AC_PATH_TOOL([GCJ],[gcj])
-  fi
-  AM_CONDITIONAL([BUILD_NATIVE_ECJ], test x"${GCJ}" != xno)
-  AC_SUBST([GCJ])
-])
-
 AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
 [
   DEFAULT_BUILD="default"
@@ -1070,7 +1051,6 @@
   if test -z "${SYSTEM_JDK_DIR}"; then
     AC_MSG_RESULT([not specified])
     if test "x${enable_bootstrap}" = "xyes"; then
-      GCJ_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk";
       BOOTSTRAP_VMS="/usr/lib/jvm/cacao";
     fi
     ICEDTEA7_VMS="/usr/lib/jvm/icedtea-7 /usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk

--- a/configure.ac	Fri Apr 01 03:10:31 2016 +0100
+++ b/configure.ac	Fri Apr 01 03:32:05 2016 +0100
@@ -48,7 +48,6 @@
 IT_OBTAIN_HG_REVISIONS
 AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
 IT_CHECK_FOR_RMDIR
-IT_WITH_GCJ
 IT_WITH_HOTSPOT_BUILD
 AC_PATH_TOOL([LINUX32],[linux32])
 IT_CHECK_GCC_VERSION
@@ -143,9 +142,6 @@
 AC_SUBST([HG])
 IT_WITH_HG_REVISION
 
-AC_PATH_TOOL([GCJ],[gcj])
-AC_SUBST([GCJ])
-
 dnl pkgconfig cannot be used to find these headers and libraries.
 AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
 	,[AC_MSG_ERROR("CUPS headers were not found -

--- a/javac.in	Fri Apr 01 03:10:31 2016 +0100
+++ b/javac.in	Fri Apr 01 03:32:05 2016 +0100
@@ -18,7 +18,7 @@
 }
 
 my @bcoption;
-push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'
+push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.7.0/jre/lib/rt.jar'
     unless grep {$_ eq '-bootclasspath'} @ARGV;
 my @ecj_parms = ($ECJ_WARNINGS, @bcoption);
 my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source',
@@ -54,12 +54,7 @@
     return @new_args;
 }
 
-if ( -e "@abs_top_builddir@/native-ecj" )
-{
-    my @ecj_args = gen_ecj_opts( \@ARGV );
-    exec '@abs_top_builddir@/native-ecj', @ecj_parms, @ecj_args ;
-}
-elsif ( -e "@JAVAC@" )
+if ( -e "@JAVAC@" )
 {
     if ("@USING_ECJ@" eq "yes")
     {