/hg/icedtea7: PR1847: Synchronise javac.in with IcedTea6
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jul 24 16:28:41 UTC 2014
changeset e39193e994c8 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=e39193e994c8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 24 17:28:25 2014 +0100
PR1847: Synchronise javac.in with IcedTea6
2014-06-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1847: Synchronise javac.in with IcedTea6
* NEWS: Updated.
2013-05-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
* javac.in: Handle -Xbootclasspath/p, -Xbootclasspath
and -Xbootclasspath/a by prepending, setting or appending
its value to the bootclasspath option used to ecj,
respectively.
2012-05-09 Andrew John Hughes <ahughes at redhat.com>
* javac.in:
Split out '-J' prefixed options and pass them
to the VM rather than ecj. Filter out
'-J-Xbootclasspath/p:', which makes no sense
as there's nothing to prepend, and confuses
the VM.
2012-11-28 Andrew John Hughes <gnu.andrew at redhat.com>
* javac.in:
Add final else block which exits with an error.
diffstat:
ChangeLog | 26 ++++++++++++++++++++++++++
NEWS | 2 ++
javac.in | 54 +++++++++++++++++++++++++++++++++++++++++-------------
3 files changed, 69 insertions(+), 13 deletions(-)
diffs (151 lines):
diff -r 3e8a142adaf7 -r e39193e994c8 ChangeLog
--- a/ChangeLog Wed Jun 25 13:28:41 2014 -0400
+++ b/ChangeLog Thu Jul 24 17:28:25 2014 +0100
@@ -1,5 +1,31 @@
2014-06-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
+ PR1847: Synchronise javac.in with IcedTea6
+ * NEWS: Updated.
+
+2013-05-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath
+ and -Xbootclasspath/a by prepending, setting or appending
+ its value to the bootclasspath option used to ecj,
+ respectively.
+
+2012-05-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * javac.in:
+ Split out '-J' prefixed options and pass them
+ to the VM rather than ecj. Filter out
+ '-J-Xbootclasspath/p:', which makes no sense
+ as there's nothing to prepend, and confuses
+ the VM.
+
+2012-11-28 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * javac.in:
+ Add final else block which exits with an error.
+
+2014-06-25 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
* NEWS:
Add release notes for 2.5.0 and remove
duplicates.
diff -r 3e8a142adaf7 -r e39193e994c8 NEWS
--- a/NEWS Wed Jun 25 13:28:41 2014 -0400
+++ b/NEWS Thu Jul 24 17:28:25 2014 +0100
@@ -78,6 +78,8 @@
- S8038481: CMM Testing: Min/MaxHeapFreeRatio flags should be manageable through the API
- S8038640: new hotspot build - hs24.80-b06
- S8038785: hot workaround fix for a crash in C2 compiler at Node::rematerialize
+* Bug fixes
+ - PR1847: Synchronise javac.in with IcedTea6
New in release 2.5.0 (2014-06-13):
diff -r 3e8a142adaf7 -r e39193e994c8 javac.in
--- a/javac.in Wed Jun 25 13:28:41 2014 -0400
+++ b/javac.in Thu Jul 24 17:28:25 2014 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
use strict;
use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
-use constant STRIP_ARGS_1 => qw(-Werror -implicit:none);
+use constant STRIP_ARGS_1 => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
use constant STRIP_ARGS_2 => qw(-Xmaxwarns);
my ($ECJ_WARNINGS, $JAVAC_WARNINGS);
@@ -18,19 +18,32 @@
}
my @bcoption;
-my @bcoptions = grep {$_ =~ '^-Xbootclasspath/p:' } @ARGV;
+my @bcoptionsp = grep {$_ =~ '^-Xbootclasspath/p:' } @ARGV;
+my @bcoptions = grep {$_ =~ '^-Xbootclasspath:' } @ARGV;
+my @bcoptionsa = grep {$_ =~ '^-Xbootclasspath/a:' } @ARGV;
+my $bcp = $bcoptionsp[0];
my $bc = $bcoptions[0];
+my $bca = $bcoptionsa[0];
my $systembc = glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar';
+if ($bcp)
+{
+ $bcp =~ s/^[^:]*://;
+ $systembc = join ":", $bcp, $systembc;
+}
if ($bc)
{
$bc =~ s/^[^:]*://;
- $systembc = join ":", $bc, $systembc;
+ $systembc = $bc;
+}
+if ($bca)
+{
+ $bca =~ s/^[^:]*://;
+ $systembc = join ":", $systembc, $bca;
}
push @bcoption, '-bootclasspath', $systembc
unless grep {$_ eq '-bootclasspath'} @ARGV;
my @ecj_parms = ($ECJ_WARNINGS, @bcoption);
-my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source',
- '-XDignore.symbol.file=true', '-J-Xmx1024m');
+my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source', '-XDignore.symbol.file=true');
# Work around ecj's inability to handle duplicate command-line
# options and unknown javac options.
@@ -59,31 +72,46 @@
splice @new_args, $_, 2 for @indices;
}
- return @new_args;
+ return \@new_args;
+}
+
+sub split_vm_args
+{
+ my @new_args = @{$_[0]};
+
+ my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
+ my @javac_args = grep $_ !~ /^-J/, @new_args;
+
+ return (\@vm_args, \@javac_args);
}
if ( -e "@abs_top_builddir@/native-ecj" )
{
- my @ecj_args = gen_ecj_opts( \@ARGV );
- exec '@abs_top_builddir@/native-ecj', @ecj_parms, @ecj_args ;
+ my $ecj_args = gen_ecj_opts( \@ARGV );
+ exec '@abs_top_builddir@/native-ecj', @ecj_parms, @$ecj_args ;
}
elsif ( -e "@JAVAC@" )
{
if ("@USING_ECJ@" eq "yes")
{
- my @ecj_args = gen_ecj_opts( \@ARGV );
- exec '@JAVAC@', @ecj_parms, @ecj_args ;
+ my $ecj_args = gen_ecj_opts( \@ARGV );
+ exec '@JAVAC@', @ecj_parms, @$ecj_args ;
}
else
{
exec '@JAVAC@', @javac_parms, @ARGV ;
}
}
-else
+elsif ( -e "@ECJ_JAR@" )
{
- my @ecj_args = gen_ecj_opts( \@ARGV );
+ my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
my @CLASSPATH = ('@ECJ_JAR@');
push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
- exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
+ exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
}
+else
+{
+ print STDERR "No Java compiler to run";
+ exit -1;
+}
More information about the distro-pkg-dev
mailing list