/hg/icedtea6: PR1458: Make use of bootstrap tools & -Xbootclassp...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon May 27 03:02:06 PDT 2013
changeset 632c42c569f8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=632c42c569f8
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon May 27 11:00:32 2013 +0100
PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional
2013-05-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1458: Make use of bootstrap tools & -Xbootclasspath
patches optional
* INSTALL: Document --disable-bootstrap-tools.
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException
if any of the constructors are missing.
(ICEDTEA_ECJ_PATCHES): Split out fphexconstants,
no-sun-classes, bootstrap-tools and xbootclasspath
patches from icedtea.patch. Make the latter two
conditional.
* NEWS: Updated.
* acinclude.m4:
(IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools
to decide whether to use the boot javac/javah or the
one built as part of langtools. Defaults to on.
(IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java
can be passed -Xbootclasspath/p to prepend a path
to the bootclasspath or not.
* configure.ac: Invoke the new macros and test
for the java.sql.SQLException constructors.
* javac.in: Handle -Xbootclasspath/p, -Xbootclasspath
and -Xbootclasspath/a by prepending, setting or appending
its value to the bootclasspath option used to ecj,
respectively.
* patches/ecj/bootstrap-tools.patch:
Split from icedtea.patch. Uses the bootstrap
javac and javah rather than the langtools one for
CORBA and JDK.
* patches/ecj/corba-dependencies.patch:
Include the langtools source directory on the sourcepath.
* patches/ecj/fphexconstants.patch:
Split replacements of floating point hex constants out
from icedtea.patch.
* patches/ecj/icedtea.patch:
Remove split-out segements. Drop addition of ICEDTEA_RT
in BuildToolJar.gmk and common/Rules.gmk in JDK altogether,
along with setting of bootclasspath in langtools.
* patches/ecj/needs-6.patch:
Add java.awt Makefile.
* patches/ecj/no-sun-classes.patch:
Split from icedtea.patch. Appends ICEDTEA_CLS_DIR to the
bootclasspath in java.text, sun.text and sun.javazic
Makefiles for VMs without internal Sun classes.
* patches/ecj/xbootclasspath.patch:
Replaces the use of -Xbootclasspath in java.text,
sun.text and sun.javazic for those VMs that don't
support it (gcj).
diffstat:
ChangeLog | 50 +++++++
INSTALL | 13 +-
Makefile.am | 35 +++++-
NEWS | 1 +
acinclude.m4 | 61 +++++++++
configure.ac | 9 +
javac.in | 24 +++-
patches/ecj/bootstrap-tools.patch | 87 +++++++++++++
patches/ecj/corba-dependencies.patch | 14 +-
patches/ecj/fphexconstants.patch | 60 +++++++++
patches/ecj/icedtea.patch | 233 -----------------------------------
patches/ecj/needs-6.patch | 12 +
patches/ecj/no-sun-classes.patch | 35 +++++
patches/ecj/xbootclasspath.patch | 45 ++++++
14 files changed, 440 insertions(+), 239 deletions(-)
diffs (truncated from 880 to 500 lines):
diff -r a371c1860804 -r 632c42c569f8 ChangeLog
--- a/ChangeLog Mon May 20 13:25:41 2013 +0200
+++ b/ChangeLog Mon May 27 11:00:32 2013 +0100
@@ -1,3 +1,53 @@
+2013-05-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1458: Make use of bootstrap tools & -Xbootclasspath
+ patches optional
+ * INSTALL: Document --disable-bootstrap-tools.
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException
+ if any of the constructors are missing.
+ (ICEDTEA_ECJ_PATCHES): Split out fphexconstants,
+ no-sun-classes, bootstrap-tools and xbootclasspath
+ patches from icedtea.patch. Make the latter two
+ conditional.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools
+ to decide whether to use the boot javac/javah or the
+ one built as part of langtools. Defaults to on.
+ (IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java
+ can be passed -Xbootclasspath/p to prepend a path
+ to the bootclasspath or not.
+ * configure.ac: Invoke the new macros and test
+ for the java.sql.SQLException constructors.
+ * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath
+ and -Xbootclasspath/a by prepending, setting or appending
+ its value to the bootclasspath option used to ecj,
+ respectively.
+ * patches/ecj/bootstrap-tools.patch:
+ Split from icedtea.patch. Uses the bootstrap
+ javac and javah rather than the langtools one for
+ CORBA and JDK.
+ * patches/ecj/corba-dependencies.patch:
+ Include the langtools source directory on the sourcepath.
+ * patches/ecj/fphexconstants.patch:
+ Split replacements of floating point hex constants out
+ from icedtea.patch.
+ * patches/ecj/icedtea.patch:
+ Remove split-out segements. Drop addition of ICEDTEA_RT
+ in BuildToolJar.gmk and common/Rules.gmk in JDK altogether,
+ along with setting of bootclasspath in langtools.
+ * patches/ecj/needs-6.patch:
+ Add java.awt Makefile.
+ * patches/ecj/no-sun-classes.patch:
+ Split from icedtea.patch. Appends ICEDTEA_CLS_DIR to the
+ bootclasspath in java.text, sun.text and sun.javazic
+ Makefiles for VMs without internal Sun classes.
+ * patches/ecj/xbootclasspath.patch:
+ Replaces the use of -Xbootclasspath in java.text,
+ sun.text and sun.javazic for those VMs that don't
+ support it (gcj).
+
2013-05-20 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/jtreg-TextLayoutBoundsChecks.patch:
diff -r a371c1860804 -r 632c42c569f8 INSTALL
--- a/INSTALL Mon May 20 13:25:41 2013 +0200
+++ b/INSTALL Mon May 27 11:00:32 2013 +0100
@@ -154,6 +154,7 @@
* --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
* --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
* --with-llvm-config: Specify the location of the llvm-config binary.
+* --disable-bootstrap-tools: Use javac and javah from langtools, not the bootstrap JDK.
Other options may be supplied which enable or disable new features.
These are documented fully in the relevant section below.
@@ -191,7 +192,7 @@
PulseAudio which can be enabled using --enable-pulse-java. The resulting
provider is org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider.
-Xrender Support
+XRender Support
===============
IcedTea6 includes support for an Xrender-based rendering pipeline
@@ -329,7 +330,7 @@
other than x86/x86_64/sparc). As 'hs23' is known not to work with
Zero or Shark, 'original' is still the default for these builds.
-Javascript Support
+JavaScript Support
==================
IcedTea6 adds Javascript support via the javax.script API by using
@@ -348,6 +349,14 @@
avoids conflicts between the JDK's copy of Rhino and any used by other
applications.
+Bootstrap Tools
+===============
+
+For bootstrap builds, the option --disable-bootstrap-tools can be used
+to make use of the javac and javah built as part of the langtools build,
+rather than the bootstrap tools. The default setting of this option is
+to use the bootstrap tools.
+
Building Additional Virtual Machines
====================================
diff -r a371c1860804 -r 632c42c569f8 Makefile.am
--- a/Makefile.am Mon May 20 13:25:41 2013 +0200
+++ b/Makefile.am Mon May 27 11:00:32 2013 +0100
@@ -140,6 +140,27 @@
$(SHARE)/javax/net/ssl/KeyStoreBuilderParameters.java
endif
+#PR57420 - java.sql.SQLException
+if LACKS_JAVA_SQL_EXCEPTION_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+else
+if LACKS_JAVA_SQL_EXCEPTION_REASON_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+else
+if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+else
+if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+endif
+endif
+endif
+endif
+
# Flags
MEMORY_LIMIT = -J-Xmx1024m
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
@@ -678,7 +699,9 @@
patches/ecj/corba-dependencies.patch \
patches/ecj/jaxws-langtools-dependency.patch \
patches/ecj/jaxws-jdk-dependency.patch \
- patches/ecj/hotspot/$(HSBUILD)/hotspot-jdk-dependency.patch
+ patches/ecj/hotspot/$(HSBUILD)/hotspot-jdk-dependency.patch \
+ patches/ecj/fphexconstants.patch \
+ patches/ecj/no-sun-classes.patch
if DTDTYPE_QNAME
ICEDTEA_ECJ_PATCHES += \
@@ -692,6 +715,16 @@
endif
endif
+if !DISABLE_BOOTSTRAP_TOOLS
+ICEDTEA_ECJ_PATCHES += \
+ patches/ecj/bootstrap-tools.patch
+endif
+
+if !VM_SUPPORTS_XBOOTCLASSPATH
+ICEDTEA_ECJ_PATCHES += \
+ patches/ecj/xbootclasspath.patch
+endif
+
if !WITH_PAX
ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch
endif
diff -r a371c1860804 -r 632c42c569f8 NEWS
--- a/NEWS Mon May 20 13:25:41 2013 +0200
+++ b/NEWS Mon May 27 11:00:32 2013 +0100
@@ -15,6 +15,7 @@
* New features
- PR1317: Provide an option to build with a more up-to-date HotSpot
+ - PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional
* Backports
- S8009641: OpenJDK 6 build broken via 8007675 fix
- OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build
diff -r a371c1860804 -r 632c42c569f8 acinclude.m4
--- a/acinclude.m4 Mon May 20 13:25:41 2013 +0200
+++ b/acinclude.m4 Mon May 27 11:00:32 2013 +0100
@@ -1933,6 +1933,67 @@
AC_PROVIDE([$0])dnl
])
+AC_DEFUN_ONCE([IT_USE_BOOTSTRAP_TOOLS],
+[
+ AC_MSG_CHECKING([whether to disable the use of bootstrap tools for bootstrapping])
+ AC_ARG_ENABLE([bootstrap-tools],
+ [AS_HELP_STRING(--disable-bootstrap-tools,
+ disable the use of bootstrap tools for bootstrapping [[default=no]])],
+ [
+ case "${enableval}" in
+ no)
+ disable_bootstrap_tools=yes
+ ;;
+ *)
+ disable_bootstrap_tools=no
+ ;;
+ esac
+ ],
+ [
+ disable_bootstrap_tools=no;
+ ])
+ AC_MSG_RESULT([$disable_bootstrap_tools])
+ AM_CONDITIONAL([DISABLE_BOOTSTRAP_TOOLS], test x"${disable_bootstrap_tools}" = "xyes")
+])
+
+AC_DEFUN_ONCE([IT_CHECK_FOR_XBOOTCLASSPATH],
+[
+ AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
+ AC_CACHE_CHECK([if the VM supports -Xbootclasspath], it_cv_xbootclasspath_works, [
+ CLASS=Test.java
+ BYTECODE=$(echo $CLASS|sed 's#\.java##')
+ mkdir tmp.$$
+ cd tmp.$$
+ cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+
+public class Test
+{
+ public static void main(String[] args)
+ {
+ System.out.println("Hello World!");
+ }
+}]
+EOF
+ mkdir build
+ if $JAVAC -d build -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVA -Xbootclasspath/p:build $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_xbootclasspath_works=yes;
+ else
+ it_cv_xbootclasspath_works=no;
+ fi
+ else
+ it_cv_xbootclasspath_works=no;
+ fi
+ rm -f $CLASS build/*.class
+ rmdir build
+ cd ..
+ rmdir tmp.$$
+ ])
+ AC_PROVIDE([$0])dnl
+ AM_CONDITIONAL([VM_SUPPORTS_XBOOTCLASSPATH], test x"${it_cv_xbootclasspath_works}" = "xyes")
+])
+
AC_DEFUN_ONCE([IT_WITH_PAX],
[
AC_MSG_CHECKING([for pax utility to use])
diff -r a371c1860804 -r 632c42c569f8 configure.ac
--- a/configure.ac Mon May 20 13:25:41 2013 +0200
+++ b/configure.ac Mon May 27 11:00:32 2013 +0100
@@ -154,6 +154,12 @@
[new javax.net.ssl.KeyStoreBuilderParameters(new java.util.ArrayList<java.security.KeyStore.Builder>()).getParameters()]
)
+dnl PR57420 - java.sql.SQLException
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_THROWABLE],[java.sql.SQLException],[Throwable.class],[new Throwable()])
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_THROWABLE],[java.sql.SQLException],[String.class,Throwable.class],["Something went wrong",new Throwable()])
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Throwable.class],["Something went wrong","",new Throwable()])
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Integer.TYPE,Throwable.class],["Something went wrong","",666,new Throwable()])
+
# Use xvfb-run if found to run gui tests (check-jdk).
AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])
AC_SUBST(XVFB_RUN_CMD)
@@ -254,6 +260,9 @@
AC_CONFIG_FILES([javac], [chmod +x javac])
AC_CONFIG_FILES([javap], [chmod +x javap])
+IT_USE_BOOTSTRAP_TOOLS
+IT_CHECK_FOR_XBOOTCLASSPATH
+
IT_FIND_RHINO_JAR
IT_WITH_OPENJDK_SRC_ZIP
IT_WITH_HOTSPOT_SRC_ZIP
diff -r a371c1860804 -r 632c42c569f8 javac.in
--- a/javac.in Mon May 20 13:25:41 2013 +0200
+++ b/javac.in Mon May 27 11:00:32 2013 +0100
@@ -7,7 +7,29 @@
my $JAVAC_WARNINGS="-nowarn";
my @bcoption;
-push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'
+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 = $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');
diff -r a371c1860804 -r 632c42c569f8 patches/ecj/bootstrap-tools.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/bootstrap-tools.patch Mon May 27 11:00:32 2013 +0100
@@ -0,0 +1,87 @@
+diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000
+@@ -116,35 +116,17 @@
+ CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
+ JAVACFLAGS += $(CLASS_VERSION)
+ JAVACFLAGS += -encoding ascii
+-JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar
++JAVACFLAGS += -classpath $(LANGTOOLS_DIST)/lib/classes.jar
+ JAVACFLAGS += $(OTHER_JAVACFLAGS)
+
+ # Needed for javah
+-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
+
+-# Langtools
+-ifdef LANGTOOLS_DIST
+- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
+- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
+- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
+- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
+- JAVAC_CMD = $(BOOT_JAVA_CMD) \
+- "-Xbootclasspath/p:$(JAVAC_JAR)" \
+- -jar $(JAVAC_JAR) $(JAVACFLAGS)
+- JAVAH_CMD = $(BOOT_JAVA_CMD) \
+- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
+- -jar $(JAVAH_JAR) $(JAVAHFLAGS)
+- JAVADOC_CMD = $(BOOT_JAVA_CMD) \
+- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
+- -jar $(JAVADOC_JAR)
+-else
+- # If no explicit tools, use boot tools (add VM flags in this case)
+- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
++# If no explicit tools, use boot tools (add VM flags in this case)
++JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
+ $(JAVACFLAGS)
+- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
++JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
+ $(JAVAHFLAGS)
+- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
+-endif
+
+ # Override of what javac to use (see deploy workspace)
+ ifdef JAVAC
+diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000
+@@ -124,34 +124,18 @@
+ JAVACFLAGS += $(OTHER_JAVACFLAGS)
+
+ # Needed for javah
+-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(CLASSDESTDIR)
+
+ # Needed for JAVADOC and BOOT_JAVACFLAGS
+ NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
+
+ # Langtools
+-ifdef LANGTOOLS_DIST
+- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
+- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
+- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
+- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
+- JAVAC_CMD = $(BOOT_JAVA_CMD) \
+- "-Xbootclasspath/p:$(JAVAC_JAR)" \
+- -jar $(JAVAC_JAR) $(JAVACFLAGS)
+- JAVAH_CMD = $(BOOT_JAVA_CMD) \
+- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
+- -jar $(JAVAH_JAR) $(JAVAHFLAGS)
+- JAVADOC_CMD = $(BOOT_JAVA_CMD) \
+- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
+- -jar $(JAVADOC_JAR)
+-else
+- # If no explicit tools, use boot tools (add VM flags in this case)
+- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
++# If no explicit tools, use boot tools (add VM flags in this case)
++JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
+ $(JAVACFLAGS)
+- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
++JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
+ $(JAVAHFLAGS)
+- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
+-endif
++JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
+
+ # Override of what javac to use (see deploy workspace)
+ ifdef JAVAC
diff -r a371c1860804 -r 632c42c569f8 patches/ecj/corba-dependencies.patch
--- a/patches/ecj/corba-dependencies.patch Mon May 20 13:25:41 2013 +0200
+++ b/patches/ecj/corba-dependencies.patch Mon May 27 11:00:32 2013 +0100
@@ -8,11 +8,21 @@
- $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+ $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) \
-+ -sourcepath "$(SOURCEPATH):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes" \
++ -sourcepath "$(SOURCEPATH):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(LANGTOOLS_TOPDIR)/src/share/classes" \
+ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+ $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) \
-+ -sourcepath "$(SOURCEPATH):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes" \
++ -sourcepath "$(SOURCEPATH):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(LANGTOOLS_TOPDIR)/src/share/classes" \
+ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
fi
@$(java-vm-cleanup)
+--- openjdk-ecj.orig/make/Defs-internal.gmk
++++ openjdk-ecj/make/Defs-internal.gmk
+@@ -305,6 +305,7 @@
+
+ # Common make arguments (supplied to all component builds)
+ COMMON_BUILD_ARGUMENTS = \
++ LANGTOOLS_TOPDIR=$(ABS_LANGTOOLS_TOPDIR) \
+ JDK_TOPDIR=$(ABS_JDK_TOPDIR) \
+ JDK_MAKE_SHARED_DIR=$(ABS_JDK_TOPDIR)/make/common/shared \
+ EXTERNALSANITYCONTROL=true \
diff -r a371c1860804 -r 632c42c569f8 patches/ecj/fphexconstants.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/fphexconstants.patch Mon May 27 11:00:32 2013 +0100
@@ -0,0 +1,60 @@
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2011-01-07 21:32:53.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2012-01-18 21:43:04.150185964 +0000
+@@ -76,7 +76,7 @@
+ * {@code 0x1.fffffffffffffP+1023} and also equal to
+ * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
+ */
+- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308
++ public static final double MAX_VALUE = 1.7976931348623157e+308;
+
+ /**
+ * A constant holding the smallest positive normal value of type
+@@ -86,7 +86,7 @@
+ *
+ * @since 1.6
+ */
+- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308
++ public static final double MIN_NORMAL = 2.2250738585072014E-308;
+
+ /**
+ * A constant holding the smallest positive nonzero value of type
+@@ -95,7 +95,7 @@
+ * {@code 0x0.0000000000001P-1022} and also equal to
+ * {@code Double.longBitsToDouble(0x1L)}.
+ */
+- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324
++ public static final double MIN_VALUE = 4.9e-324;
+
+ /**
+ * Maximum exponent a finite {@code double} variable may have.
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2011-01-07 21:32:53.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2012-01-18 21:43:04.150185964 +0000
+@@ -76,7 +76,7 @@
+ * {@code 0x1.fffffeP+127f} and also equal to
+ * {@code Float.intBitsToFloat(0x7f7fffff)}.
+ */
+- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f
++ public static final float MAX_VALUE = 3.4028235e+38f;
+
+ /**
+ * A constant holding the smallest positive normal value of type
+@@ -86,7 +86,7 @@
+ *
+ * @since 1.6
+ */
+- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
++ public static final float MIN_NORMAL = 1.17549435E-38f;
+
+ /**
+ * A constant holding the smallest positive nonzero value of type
+@@ -94,7 +94,7 @@
+ * hexadecimal floating-point literal {@code 0x0.000002P-126f}
+ * and also equal to {@code Float.intBitsToFloat(0x1)}.
+ */
+- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
++ public static final float MIN_VALUE = 1.4e-45f;
+
+ /**
+ * Maximum exponent a finite {@code float} variable may have. It
diff -r a371c1860804 -r 632c42c569f8 patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Mon May 20 13:25:41 2013 +0200
+++ b/patches/ecj/icedtea.patch Mon May 27 11:00:32 2013 +0100
@@ -327,50 +327,6 @@
#
# We want to privatize JVM symbols on Solaris. This is so the user can
-diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
---- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000
-@@ -116,35 +116,17 @@
- CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
- JAVACFLAGS += $(CLASS_VERSION)
- JAVACFLAGS += -encoding ascii
--JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar
-+JAVACFLAGS += -classpath $(LANGTOOLS_DIST)/lib/classes.jar
More information about the distro-pkg-dev
mailing list