Mercurial > hg > release > icedtea6-1.5
changeset 1230:4924c505eff0
* Makefile.am (stamps/native-ecj.stamp): Use -findirect-dispatch.
* javac.in: Use ecj binary if available and no native-ecj.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Sun, 30 Nov 2008 22:54:25 +0100 |
| parents | 0da756c744c9 |
| children | 990fb5e4f060 |
| files | ChangeLog Makefile.am javac.in |
| diffstat | 3 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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-30 Mark Wielaard <mark@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@klomp.org> * configure.ac: Add and check --enable-xrender.
--- 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: 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
--- 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 @@ 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