Index: build-cc
==================================================================
--- build-cc
+++ build-cc
@@ -36,10 +36,11 @@
 BINUTILS_VERS='2.22'
 GCC_VERS='4.6.3'
 GMP_VERS='5.0.2'
 MPFR_VERS='3.0.1'
 MPC_VERS='0.9'
+ECJ_VERS='4.5'
 
 # Start of script
 ## Initialize default values
 use_multilib='1'
 use_gnu_ld='1'
@@ -115,10 +116,14 @@
 ### MPC
 MPC_URL="http://www.multiprecision.org/mpc/download/mpc-${MPC_VERS}.tar.gz"
 MPC_TARBALL="src/mpc-${MPC_VERS}.tar.gz"
 MPC_DIR="mpc-${MPC_VERS}"
 
+### EJC
+EJC_URL="ftp://sourceware.org/pub/java/ecj-${EJC_VERS}.jar"
+EJC_JARFILE="src/ejc-${EJC_VERS}.jar"
+
 ## Clean-up
 if [ "$1" = "clean" -o "$1" = "distclean" ]; then
 	rm -rf "${BINUTILS_DIR}" "${GCC_DIR}" "${GMP_DIR}" "${MPFR_DIR}" "${MPC_DIR}"
 
 	for platform in "${platforms[@]}"; do
@@ -343,10 +348,11 @@
 		# Download sources required
 		download "${GCC_URL}" "${GCC_TARBALL}"
 		download "${GMP_URL}" "${GMP_TARBALL}"
 		download "${MPFR_URL}" "${MPFR_TARBALL}"
 		download "${MPC_URL}" "${MPC_TARBALL}"
+		download "${EJC_URL}" "${EJC_JARFILE}"
 
 		# Extract sources
 		bzip2 -dc "${GCC_TARBALL}" | "${TAR:-tar}" -xf -
 		bzip2 -dc "${GMP_TARBALL}" | "${TAR:-tar}" -xf -
 		bzip2 -dc "${MPFR_TARBALL}" | "${TAR:-tar}" -xf -
@@ -358,10 +364,11 @@
 		rm -rf "${GCC_DIR}/mpc"
 
 		mv "${GMP_DIR}" "${GCC_DIR}/gmp"
 		mv "${MPFR_DIR}" "${GCC_DIR}/mpfr"
 		mv "${MPC_DIR}" "${GCC_DIR}/mpc"
+		cp "${EJC_JARFILE}" "${GCC_DIR}/ecj.jar"
 
 		# Apply patches
 		## Apply patch files
 		for patchfile in "$(pwd)/patches/gcc"/*.diff; do
 			patchfile_checkscript="$(echo "${patchfile}" | sed 's@\.diff$@.sh@')"
@@ -419,11 +426,12 @@
 
 		${MAKE} all-gcc all-target-libgcc || exit 1
 		${MAKE} install-gcc install-target-libgcc || exit 1
 	else
 		### Stage 2 -- the full compiler suite
-		"../${GCC_DIR}/configure" --target="${CCNAME}" --prefix="${CCDIR}" --with-headers="${CCDIR}/${CCNAME}/include" --disable-nls --enable-languages='c,c++' --with-sysroot="${CCDIR}/${CCNAME}" --with-build-sysroot="${CCDIR}/${CCNAME}" ${BUILD_CC_GCC_CONFIGURE_EXTRA}
+		"../${GCC_DIR}/configure" --target="${CCNAME}" --prefix="${CCDIR}" --with-headers="${CCDIR}/${CCNAME}/include" --disable-nls --enable-languages='c,c++,java' --with-sysroot="${CCDIR}/${CCNAME}" --with-build-sysroot="${CCDIR}/${CCNAME}" ${BUILD_CC_GCC_CONFIGURE_EXTRA} || \
+			"../${GCC_DIR}/configure" --target="${CCNAME}" --prefix="${CCDIR}" --with-headers="${CCDIR}/${CCNAME}/include" --disable-nls --enable-languages='c,c++' --with-sysroot="${CCDIR}/${CCNAME}" --with-build-sysroot="${CCDIR}/${CCNAME}" ${BUILD_CC_GCC_CONFIGURE_EXTRA}
 
 		${MAKE} || exit 1
 		${MAKE} install || exit 1
 	fi
 )