--- Makefile	2013-12-10 12:03:49.000000000 +0100
+++ ../Makefile	2018-12-28 15:31:59.621062256 +0100
@@ -1,5 +1,5 @@
 TAG = R3_8_2
-TAG = R4_3_1
+#TAG = R4_3_1
 
 cvsroot = :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse
 
@@ -12,7 +12,10 @@
 	$(MAKE) compile
 	$(MAKE) ecj.jar ecj-source.tar.bz2
 
-checkout:
+$(TAG).tar.gz:
+	curl -O https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/$(TAG).tar.gz
+
+checkout: $(TAG).tar.gz
 #	git clone -b R3_8_maintenance git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git
 #	wget http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/$(TAG).tar.gz
 	tar xf $(TAG).tar.gz
@@ -37,7 +40,7 @@
 OUTPUT = bin
 
 ecj.jar:
-	cd $(OUTPUT); jar cf ../ecj.jar .
+	cd $(OUTPUT); fastjar-4 cf ../ecj.jar .
 
 ecj-source.tar.bz2:
 	tar -jcf ecj-source.tar.bz2 --exclude '*~' \
@@ -46,7 +49,7 @@
 compile:
 	@mkdir -p $(OUTPUT)
 	find $(SOURCES) -name '*.java' > List
-	ecj -d $(OUTPUT) -1.5 -nowarn -g @List
+	gcj-4 -C -d $(OUTPUT) -g @List
 	set -e; \
 	here=`pwd`; for dir in $(SOURCES); do \
 	  (cd $$dir; find . -name '*.properties' -o -name '*.props' -o -name '*.rsc' | \