changeset in /hg/icedtea6: * Makefile.am (stamps/native-ecj.stam...

[Mark Wielaard]

changeset 4924c505eff0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4924c505eff0
description:
	* Makefile.am (stamps/native-ecj.stamp): Use -findirect-dispatch.
		* javac.in: Use ecj binary if available and no native-ecj.

diffstat:

3 files changed, 8 insertions(+), 1 deletion(-)
ChangeLog   |    5 +++++
Makefile.am |    2 +-
javac.in    |    2 ++

diffs (36 lines):

diff -r 0da756c744c9 -r 4924c505eff0 ChangeLog
--- a/ChangeLog	Sun Nov 30 11:58:42 2008 +0100
+++ b/ChangeLog	Sun Nov 30 22:54:25 2008 +0100
@@ -1,3 +1,8 @@ 2008-11-29  Mark Wielaard  <mark at klomp.o
+2008-11-30  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (stamps/native-ecj.stamp): Use -findirect-dispatch.
+	* javac.in: Use ecj binary if available and no native-ecj.
+
 2008-11-29  Mark Wielaard  <mark at klomp.org>
 
 	* configure.ac: Add and check --enable-xrender.
diff -r 0da756c744c9 -r 4924c505eff0 Makefile.am
--- a/Makefile.am	Sun Nov 30 11:58:42 2008 +0100
+++ b/Makefile.am	Sun Nov 30 22:54:25 2008 +0100
@@ -1125,7 +1125,7 @@ stamps/native-ecj.stamp:
 stamps/native-ecj.stamp: 
 	mkdir -p stamps ; \
 	if test "x${GCJ}" != "xno"; then \
-	  ${GCJ} ${CFLAGS} -Wl,-Bsymbolic -o native-ecj \
+	  ${GCJ} ${CFLAGS} -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
 	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
 	fi ; \
 	touch stamps/native-ecj.stamp
diff -r 0da756c744c9 -r 4924c505eff0 javac.in
--- a/javac.in	Sun Nov 30 11:58:42 2008 +0100
+++ b/javac.in	Sun Nov 30 22:54:25 2008 +0100
@@ -32,6 +32,8 @@ fi
 
 if [ -e @abs_top_builddir@/native-ecj ] ; then
     @abs_top_builddir@/native-ecj -1.5 -nowarn $bcoption $NEW_ARGS ;
+elif [ ! -z "@ECJ@" ] ; then
+    @ECJ@ -1.5 -nowarn $bcoption $NEW_ARGS
 else
     CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
      @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS