tools: Add 'ecj-jato' wrapper for ECJ 3.7.2

Signed-off-by: Pekka Enberg <penberg@kernel.org>

4 files changed, 8 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index fb78a453..1092b9b6 100644
--- a/Makefile
+++ b/Makefile
@@ -162,14 +162,13 @@ CC		?= gcc
 LINK		?= $(CC)
 MONOBURG	:= ./tools/monoburg/monoburg
 JAVA		?= $(shell pwd)/jato
+JAVAC		?= ecj
 INSTALL		?= install
 
 ifeq ($(uname_M),x86_64)
 JASMIN		?= java -jar tools/jasmin/jasmin.jar
-JAVAC		?= JAVA=java $(shell pwd)/tools/ecj
 else
 JASMIN		?= $(JAVA) -jar tools/jasmin/jasmin.jar
-JAVAC		?= JAVA=java $(shell pwd)/tools/ecj
 endif
 
 JAVAC_OPTS	+= -encoding utf-8
@@ -483,6 +482,8 @@ install: $(PROGRAM)
 	$(E) "  INSTALL " $(PROGRAM)
 	$(Q) $(INSTALL) -d -m 755 $(INSTALL_PREFIX)/bin
 	$(Q) $(INSTALL) $(PROGRAM) $(INSTALL_PREFIX)/bin
+	$(Q) $(INSTALL) tools/ecj-jato/ecj-3.7.2.jar $(INSTALL_PREFIX)/bin
+	$(Q) $(INSTALL) tools/ecj-jato/ecj-jato $(INSTALL_PREFIX)/bin
 .PHONY: install
 
 tags: FORCE
diff --git a/tools/ecj b/tools/ecj
deleted file mode 100755
index 3d0ddf3e..00000000
--- a/tools/ecj
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ -z "$JAVA" ] ; then
-  JAVA=java
-fi
-
-$JAVA -cp /usr/share/java/eclipse-ecj.jar org.eclipse.jdt.internal.compiler.batch.Main $@
diff --git a/tools/ecj-jato/ecj-3.7.2.jar b/tools/ecj-jato/ecj-3.7.2.jar
new file mode 100644
index 00000000..54ae692a
--- /dev/null
+++ b/tools/ecj-jato/ecj-3.7.2.jar
diff --git a/tools/ecj-jato/ecj-jato b/tools/ecj-jato/ecj-jato
new file mode 100755
index 00000000..1e90bf44
--- /dev/null
+++ b/tools/ecj-jato/ecj-jato
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+BASEDIR=$(dirname $0)
+
+$BASEDIR/jato -Xmx768M -cp $BASEDIR/ecj-3.7.2.jar org.eclipse.jdt.internal.compiler.batch.Main "$@"