/hg/icedtea6-hg: 10 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Dec 5 07:52:12 PST 2012
changeset 8f6318c8c2f4 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8f6318c8c2f4
author: Lukas Berk <lberk at redhat.com>
date: Thu Nov 01 14:03:48 2012 -0400
Enhanced garbage collection dtrace/systemtap instrumentation.
2012-11-01 Lukas Berk <lberk at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add patches/systemtap.patch.
(EXTRA_DIST): Add tapset/hotspot_gc.stp.in.
(stamps/icedtea.stamp): Build tapset/hotspot_gc.stp.
(stamps/icedtea-debug.stamp): Likewise.
* configure.ac: Generate tapset/hotspot_gc.stp.
* patches/systemtap_gc.patch:
Add Garbage Collection dtrace/systemtap probes to hotspot.
* tapset/hotspot_gc.stp.in:
Systemtap tapset allowing use of GC probes more comfortablely.
changeset 849f72a5a514 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=849f72a5a514
author: Stefan Ring <stefan at complang.tuwien.ac.at>
date: Mon Nov 05 16:53:59 2012 +0100
PR1120: Upgrade CACAO to 2012-11-04 version
Changes:
- Unified version for icedtea6/7
- CA166, CA167: check-langtools fixes for icedtea6
- Implemented sun.misc.Perf.highResCounter
- CACAO now identifies by its own Mercurial revision
- Some memory barrier maintenance
- Ability to run when compiled as Thumb on armv5 (no Thumb JIT though)
2012-11-04 Stefan Ring <stefan at complang.tuwien.ac.at>
* Makefile.am (CACAO_VERSION, CACAO_SHA256SUM): Updated.
(ICEDTEA_PATCHES): Removed patches/cacao/jsig.patch.
(stamps/cacao.stamp): Create Xusage.txt and libjsig.so as for JamVM.
* patches/cacao/jsig.patch: Removed.
changeset 1793e2fb84c5 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1793e2fb84c5
author: Xerxes Ranby <xerxes at zafena.se>
date: Tue Nov 06 18:28:55 2012 +0100
CACAO: PR1120: Added ChangeLog entry, updated NEWS and HACKING.
2012-11-06 Xerxes Ranby <xerxes at zafena.se>
Stefan Ring <stefan at complang.tuwien.ac.at>
* Makefile.am (CACAO_VERSION, CACAO_SHA256SUM): Updated.
(ICEDTEA_PATCHES): Removed patches/cacao/jsig.patch.
(stamps/cacao.stamp): Create Xusage.txt and libjsig.so as for JamVM.
* patches/cacao/jsig.patch: Removed.
* HACKING: Updated.
* NEWS: Updated.
changeset dfe3209fcf64 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=dfe3209fcf64
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Nov 20 16:12:30 2012 +0000
RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive
2012-11-20 Andrew John Hughes <gnu.andrew at redhat.com>
RH513605: Updating/Installing OpenJDK should recreate
the shared class-data archive
* Makefile.am:
(icedtea-against-icedtea): Depend on add-archive.
(clean-icedtea-against-icedtea): Depend on clean-add-archive.
(icedtea-debug-against-icedtea): Depend on add-archive-debug.
(clean-icedtea-against-icedtea): Depend on clean-add-archive-debug.
(add-archive): Run -Xshare:dump on the newly built JDK.
(clean-add-archive): Delete stamp.
(add-archive-debug): Same as add-archive for icedtea-debug.
(clean-add-archive-debug): Same as clean-add-archive for icedtea-debug.
(icedtea-ecj-against-icedtea): Depend on add-archive-ecj.
(clean-icedtea-against-icedtea): Depend on clean-add-archive-ecj.
(add-archive-ecj): Same as add-archive for icedtea-ecj.
(clean-add-archive-ecj): Same as clean-add-archive for icedtea-ecj.
* NEWS: Mention.
changeset ac23a08f7709 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ac23a08f7709
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Nov 28 10:38:33 2012 +0000
Fix bootstrap build with OpenJDK6 by pre-building new CORBA classes.
2012-11-28 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Add the generated
file ORBUtilSystemException.java if the build JDK
has the old version.
* configure.ac:
Add checks for com.sun.corba.se.impl.logging.ORBUtilSystemException
and the method ioExceptionOnClose(Throwable).
* patches/ecj/corba-dependencies.patch:
Regenerated against new version of icedtea.patch.
* patches/ecj/icedtea.patch:
Remove unneeded addition of bootclasspath.
changeset 5e25810d47d2 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5e25810d47d2
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Nov 28 10:39:54 2012 +0000
Add ANT_RESPECT_JAVA_HOME for Gentoo ant support.
2009-07-09 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
Add ANT_RESPECT_JAVA_HOME for Gentoo ant support.
changeset 62ea56e2d58a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=62ea56e2d58a
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Nov 28 13:34:53 2012 +0000
Use javac or ecj binaries in bootstrap rather than always using ecj.jar (largely backported from 7).
2012-11-28 Andrew John Hughes <gnu.andrew at redhat.com>
* acinclude.m4:
(IT_FIND_COMPILER): Invoke IT_USING_ECJ.
* javac.in:
Add final else block which exits with an error.
2011-07-05 Andrew John Hughes <gnu.andrew at redhat.com>
* javac.in: Add -XDignore.symbol.file=true
when using javac to avoid numerous proprietary
warnings.
2010-12-08 Andrew John Hughes <gnu.andrew at redhat.com>
* javac.in:
Pass -Xprefer:source (if javac is used) to
pick up local OpenJDK versions of classes
prior to those in the boot JDK.
2009-07-21 Andrew John Hughes <gnu.andrew at redhat.com>
* acinclude.m4:
(IT_USING_ECJ): Work out whether javac is ecj or not.
* javac.in:
Run @JAVAC@ rather than @ECJ@ and vary arguments as
needed depending on @USING_ECJ at .
changeset 6787928de410 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6787928de410
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Nov 28 14:41:42 2012 +0000
Only run -Xshare:dump when java exists and we aren't building CACAO or JamVM.
2012-11-28 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(add-archive): Only run -Xshare:dump when java
exists and we aren't building CACAO or JamVM.
(add-archive-debug): Likewise.
(add-archive-ecj): Likewise.
changeset cea49ba2afcd in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cea49ba2afcd
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Nov 28 14:42:31 2012 +0000
Restore deferencing of ecj arguments lost when backporting from 7.
2012-11-28 Andrew John Hughes <gnu.andrew at redhat.com>
* javac.in:
Restore deferencing of ecj arguments
lost when backporting from 7.
changeset 5b29b2f26eea in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5b29b2f26eea
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Dec 05 14:55:23 2012 +0000
Merge
diffstat:
ChangeLog | 108 +++++++
HACKING | 6 +-
Makefile.am | 92 +++++-
NEWS | 8 +
acinclude.m4 | 16 +
configure.ac | 12 +-
javac.in | 18 +-
patches/cacao/jsig.patch | 18 -
patches/ecj/corba-dependencies.patch | 17 +-
patches/ecj/icedtea.patch | 16 -
patches/systemtap_gc.patch | 369 ++++++++++++++++++++++++
tapset/hotspot_gc.stp.in | 534 +++++++++++++++++++++++++++++++++++
12 files changed, 1155 insertions(+), 59 deletions(-)
diffs (truncated from 1483 to 500 lines):
diff -r 109033172ae7 -r 5b29b2f26eea ChangeLog
--- a/ChangeLog Wed Oct 31 11:34:40 2012 +0000
+++ b/ChangeLog Wed Dec 05 14:55:23 2012 +0000
@@ -1,9 +1,117 @@
+2012-11-28 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * javac.in:
+ Restore deferencing of ecj arguments
+ lost when backporting from 7.
+
+2012-11-28 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (add-archive): Only run -Xshare:dump when java
+ exists and we aren't building CACAO or JamVM.
+ (add-archive-debug): Likewise.
+ (add-archive-ecj): Likewise.
+
+2012-11-28 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * acinclude.m4:
+ (IT_FIND_COMPILER): Invoke IT_USING_ECJ.
+ * javac.in:
+ Add final else block which exits with an error.
+
+2011-07-05 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * javac.in: Add -XDignore.symbol.file=true
+ when using javac to avoid numerous proprietary
+ warnings.
+
+2010-12-08 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * javac.in:
+ Pass -Xprefer:source (if javac is used) to
+ pick up local OpenJDK versions of classes
+ prior to those in the boot JDK.
+
+2009-07-21 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * acinclude.m4:
+ (IT_USING_ECJ): Work out whether javac is ecj or not.
+ * javac.in:
+ Run @JAVAC@ rather than @ECJ@ and vary arguments as
+ needed depending on @USING_ECJ at .
+
+2009-07-09 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ Add ANT_RESPECT_JAVA_HOME for Gentoo ant support.
+
+2012-11-28 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Add the generated
+ file ORBUtilSystemException.java if the build JDK
+ has the old version.
+ * configure.ac:
+ Add checks for com.sun.corba.se.impl.logging.ORBUtilSystemException
+ and the method ioExceptionOnClose(Throwable).
+ * patches/ecj/corba-dependencies.patch:
+ Regenerated against new version of icedtea.patch.
+ * patches/ecj/icedtea.patch:
+ Remove unneeded addition of bootclasspath.
+
+2012-11-20 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ RH513605: Updating/Installing OpenJDK should recreate
+ the shared class-data archive
+ * Makefile.am:
+ (icedtea-against-icedtea): Depend on add-archive.
+ (clean-icedtea-against-icedtea): Depend on clean-add-archive.
+ (icedtea-debug-against-icedtea): Depend on add-archive-debug.
+ (clean-icedtea-against-icedtea): Depend on clean-add-archive-debug.
+ (add-archive): Run -Xshare:dump on the newly built JDK.
+ (clean-add-archive): Delete stamp.
+ (add-archive-debug): Same as add-archive for icedtea-debug.
+ (clean-add-archive-debug): Same as clean-add-archive for icedtea-debug.
+ (icedtea-ecj-against-icedtea): Depend on add-archive-ecj.
+ (clean-icedtea-against-icedtea): Depend on clean-add-archive-ecj.
+ (add-archive-ecj): Same as add-archive for icedtea-ecj.
+ (clean-add-archive-ecj): Same as clean-add-archive for icedtea-ecj.
+ * NEWS: Mention.
+
+2012-11-06 Xerxes RÃ¥nby <xerxes at zafena.se>
+ Stefan Ring <stefan at complang.tuwien.ac.at>
+
+ * Makefile.am (CACAO_VERSION, CACAO_SHA256SUM): Updated.
+ (ICEDTEA_PATCHES): Removed patches/cacao/jsig.patch.
+ (stamps/cacao.stamp): Create Xusage.txt and libjsig.so as for JamVM.
+ * patches/cacao/jsig.patch: Removed.
+ * HACKING: Updated.
+ * NEWS: Updated.
+
+2012-11-01 Lukas Berk <lberk at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patches/systemtap.patch.
+ (EXTRA_DIST): Add tapset/hotspot_gc.stp.in.
+ (stamps/icedtea.stamp): Build tapset/hotspot_gc.stp.
+ (stamps/icedtea-debug.stamp): Likewise.
+ * configure.ac: Generate tapset/hotspot_gc.stp.
+ * patches/systemtap_gc.patch:
+ Add Garbage Collection dtrace/systemtap probes to hotspot.
+ * tapset/hotspot_gc.stp.in:
+ Systemtap tapset allowing use of GC probes more comfortablely.
+
2012-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Correct bad CVE number given by Oracle.
2012-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b28.
+
+2012-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
+
* generated/com/sun/corba/se/impl/logging/ActivationSystemException.java,
* generated/com/sun/corba/se/impl/logging/IORSystemException.java,
* generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java,
diff -r 109033172ae7 -r 5b29b2f26eea HACKING
--- a/HACKING Wed Oct 31 11:34:40 2012 +0000
+++ b/HACKING Wed Dec 05 14:55:23 2012 +0000
@@ -89,9 +89,6 @@
* icedtea-java2d-mitre-join.patch: Backport fix for mitre join decoration (S6812600).
* icedtea-java2d-stroker-internal-joint.patch: Fix penultimate joint created by GeneralPath.closePath().
* icedtea-java2d-stroker-internal-close-joint.patch: Fix final joint created by GeneralPath.closePath().
-* icedtea-cacao.patch: For the 'java' command, create new thread depending on the current VM.
-* icedtea-cacao-no-mmap-first-page.patch: Don't mmap the first memory page.
-* cacao/no-strict-aliasing.patch: Turn off strict aliasing which causes an issue with the verifier when building with GCC 4.4 (cacao PR129).
* icedtea-shark.patch: Add support for the Shark JIT.
* icedtea-xshm.patch: Support newer X11 headers for awt_GraphicsEnv.h.
@@ -138,6 +135,9 @@
The following patches are only applied when building with the CACAO virtual machine:
+* cacao/launcher.patch: For the 'java' command, create new thread depending on the current VM.
+* cacao/memory.patch: Increase memory while building langtools for cacao builds.
+
The following patches are to support Xrender pipeline (-Dsun.java2d.xrender):
* icedtea-xrender-xxx.patch: Numbered patches from xrender branch
diff -r 109033172ae7 -r 5b29b2f26eea Makefile.am
--- a/Makefile.am Wed Oct 31 11:34:40 2012 +0000
+++ b/Makefile.am Wed Dec 05 14:55:23 2012 +0000
@@ -2,11 +2,11 @@
OPENJDK_DATE = 26_oct_2012
OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0
-OPENJDK_VERSION = b27
+OPENJDK_VERSION = b28
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
-CACAO_VERSION = cff92704c4e0
-CACAO_SHA256SUM = dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f
+CACAO_VERSION = 9968abd511a3
+CACAO_SHA256SUM = 3b1ce9d2205d2afba4614a194484341758ee2cb340396310ac2c00e5a2a20955
CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
@@ -80,6 +80,14 @@
$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
endif
+# Workaround for old OpenJDK versions with older CORBA classes
+if !LACKS_ORBUTILSYSTEMEXCEPTION
+if LACKS_ORBUTILSYSTEMEXCEPTION_IOEXCEPTIONONCLOSE_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(abs_top_srcdir)/generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java
+endif
+endif
+
# Flags
MEMORY_LIMIT = -J-Xmx1024m
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
@@ -433,7 +441,6 @@
if BUILD_CACAO
ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
- patches/cacao/jsig.patch \
patches/cacao/memory.patch
endif
@@ -453,6 +460,7 @@
patches/sdt-dtrace-hpp.patch \
patches/sdt-make.patch \
patches/sdt-arguments.patch \
+ patches/systemtap_gc.patch
patches/systemtap-gcc-4.5.patch \
patches/systemtap-alloc-size-workaround.patch
endif
@@ -561,6 +569,7 @@
JAVAC="" \
JAVA_HOME="" \
JDK_HOME="" \
+ ANT_RESPECT_JAVA_HOME="TRUE" \
DISTRIBUTION_ID="$(DIST_ID)" \
DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
DEBUG_CLASSFILES="true" \
@@ -646,6 +655,7 @@
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
tapset/jstack.stp.in \
+ tapset/hotspot_gc.stp.in \
scripts/jni_create_stap.c \
scripts/jni_desc \
rewriter/agpl-3.0.txt \
@@ -1513,25 +1523,27 @@
stamps/icedtea-against-icedtea.stamp: stamps/icedtea.stamp \
stamps/add-jamvm.stamp stamps/add-cacao.stamp stamps/add-zero.stamp \
- stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp stamps/add-tzdata-support.stamp
+ stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp stamps/add-tzdata-support.stamp \
+ stamps/add-archive.stamp
mkdir -p stamps
touch stamps/icedtea-against-icedtea.stamp
clean-icedtea-against-icedtea: clean-add-jamvm clean-add-zero clean-add-cacao \
- clean-add-systemtap clean-add-pulseaudio \
- clean-add-nss clean-add-tzdata-support
+ clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support \
+ clean-add-archive
rm -f stamps/icedtea-against-icedtea.stamp
stamps/icedtea-debug-against-icedtea.stamp: stamps/icedtea-debug.stamp \
stamps/add-jamvm-debug.stamp stamps/add-cacao-debug.stamp \
stamps/add-zero-debug.stamp stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \
- stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp
+ stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp stamps/add-archive-debug.stamp
mkdir -p stamps
touch stamps/icedtea-debug-against-icedtea.stamp
clean-icedtea-debug-against-icedtea: clean-add-zero-debug \
clean-add-jamvm-debug clean-add-cacao-debug clean-add-systemtap-debug \
- clean-add-pulseaudio-debug clean-add-nss-debug clean-add-tzdata-support-debug
+ clean-add-pulseaudio-debug clean-add-nss-debug clean-add-tzdata-support-debug \
+ clean-add-archive-debug
rm -f stamps/icedtea-debug-against-icedtea.stamp
stamps/add-systemtap.stamp: stamps/icedtea.stamp
@@ -1543,6 +1555,9 @@
< $(abs_top_builddir)/tapset/hotspot.stp \
> $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
sed -e '/\/client\/libjvm.so/d' \
+ < $(abs_top_builddir)/tapset/hotspot_gc.stp \
+ > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+ sed -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_jni.stp \
> $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
else \
@@ -1574,6 +1589,8 @@
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
fi
@@ -1760,6 +1777,32 @@
rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
rm -f stamps/add-tzdata-support-debug.stamp
+stamps/add-archive.stamp: stamps/icedtea.stamp
+if !ENABLE_JAMVM
+if !ENABLE_CACAO
+ if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+ fi
+endif
+endif
+ touch stamps/add-archive.stamp
+
+clean-add-archive:
+ rm -f stamps/add-archive.stamp
+
+stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
+if !ENABLE_JAMVM
+if !ENABLE_CACAO
+ if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+ fi
+endif
+endif
+ touch stamps/add-archive-debug.stamp
+
+clean-add-archive-debug:
+ rm -f stamps/add-archive-debug.stamp
+
# OpenJDK ecj Targets
# ===================
@@ -1780,12 +1823,13 @@
rm -f stamps/icedtea-ecj.stamp
stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp stamps/add-systemtap-ecj.stamp \
- stamps/add-pulseaudio-ecj.stamp stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp
+ stamps/add-pulseaudio-ecj.stamp stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp \
+ stamps/add-archive-ecj.stamp
mkdir -p stamps
touch stamps/icedtea-against-ecj.stamp
clean-icedtea-against-ecj: clean-add-systemtap-ecj clean-add-pulseaudio-ecj clean-add-nss-ecj \
- clean-add-tzdata-support-ecj
+ clean-add-tzdata-support-ecj clean-add-archive-ecj
rm -f stamps/icedtea-against-ecj.stamp
stamps/add-systemtap-ecj.stamp: stamps/icedtea-ecj.stamp
@@ -1797,11 +1841,16 @@
< $(abs_top_builddir)/tapset/hotspot.stp \
> $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
sed -e '/\/client\/libjvm.so/d' \
+ < $(abs_top_builddir)/tapset/hotspot_gc.stp \
+ > $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+ sed -e '/\/client\/libjvm.so/d' \
< $(abs_top_builddir)/tapset/hotspot_jni.stp \
> $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+ cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
fi
@@ -1899,6 +1948,19 @@
rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
rm -f stamps/add-tzdata-support-ecj.stamp
+stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp
+if !ENABLE_JAMVM
+if !ENABLE_CACAO
+ if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+ fi
+endif
+endif
+ touch stamps/add-archive-ecj.stamp
+
+clean-add-archive-ecj:
+ rm -f stamps/add-archive-ecj.stamp
+
# Rebuild targets
rebuild:
@@ -2124,6 +2186,8 @@
--enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
+ touch $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
+ ln -sf client/libjvm.so $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
endif
endif
mkdir -p stamps
@@ -2482,6 +2546,12 @@
# Target Aliases
# ===============
+add-archive: stamps/add-archive.stamp
+
+add-archive-debug: stamps/add-archive-debug.stamp
+
+add-archive-ecj: stamps/add-archive-ecj.stamp
+
bootstrap-directory-ecj: stamps/bootstrap-directory-ecj.stamp
bootstrap-directory: stamps/bootstrap-directory.stamp
diff -r 109033172ae7 -r 5b29b2f26eea NEWS
--- a/NEWS Wed Oct 31 11:34:40 2012 +0000
+++ b/NEWS Wed Dec 05 14:55:23 2012 +0000
@@ -56,6 +56,14 @@
are actually missing from the boot JDK
- PR1114: Provide option to turn off downloading of tarballs (--disable-downloading)
- PR1176: Synchronise CACAO rules between IcedTea6/7/8 where possible
+ - RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive
+* CACAO
+ - PR1120: Unified version for icedtea6/7
+ - CA166, CA167: check-langtools fixes for icedtea6
+ - Implemented sun.misc.Perf.highResCounter
+ - CACAO now identifies by its own Mercurial revision
+ - Some memory barrier maintenance
+ - Ability to run when compiled as Thumb on armv5 (no Thumb JIT though)
* JamVM
- ARMv6 armhf: Changes for Raspbian (Raspberry Pi)
- PPC: Don't use lwsync if it isn't supported
diff -r 109033172ae7 -r 5b29b2f26eea acinclude.m4
--- a/acinclude.m4 Wed Oct 31 11:34:40 2012 +0000
+++ b/acinclude.m4 Wed Dec 05 14:55:23 2012 +0000
@@ -139,6 +139,9 @@
JAVAC="${ECJ} -nowarn"
fi
fi
+
+ IT_USING_ECJ
+
AC_SUBST(ECJ)
AC_SUBST(JAVAC)
])
@@ -1857,3 +1860,16 @@
AM_CONDITIONAL([DOWNLOADING], test x"${enable_downloading}" = "xyes")
AC_SUBST([enable_downloading])
])
+
+AC_DEFUN([IT_USING_ECJ],[
+AC_CACHE_CHECK([if we are using ecj as javac], it_cv_ecj, [
+if $JAVAC -version 2>&1| grep '^Eclipse' >&AS_MESSAGE_LOG_FD ; then
+ it_cv_ecj=yes;
+else
+ it_cv_ecj=no;
+fi
+])
+USING_ECJ=$it_cv_ecj
+AC_SUBST(USING_ECJ)
+AC_PROVIDE([$0])dnl
+])
diff -r 109033172ae7 -r 5b29b2f26eea configure.ac
--- a/configure.ac Wed Oct 31 11:34:40 2012 +0000
+++ b/configure.ac Wed Dec 05 14:55:23 2012 +0000
@@ -58,12 +58,21 @@
IT_DISABLE_JDK_TESTS
IT_CHECK_FOR_METHOD([JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER],
- [javax.swing.plaf.basic.BasicDirectoryModel.addPropertyChangeListener],
+ [javax.swing.plaf.basic.BasicDirectoryModel.addPropertyChangeListener(PropertyChangeListener)],
[javax.swing.plaf.basic.BasicDirectoryModel],
["addPropertyChangeListener",java.beans.PropertyChangeListener.class],
[javax.swing.plaf.basic.BasicDirectoryModel model = new javax.swing.plaf.basic.BasicDirectoryModel(new javax.swing.JFileChooser()); model.addPropertyChangeListener(model)]
)
+# Workaround issue with old CORBA classes in old OpenJDK builds
+IT_CHECK_FOR_CLASS([ORBUTILSYSTEMEXCEPTION],[com.sun.corba.se.impl.logging.ORBUtilSystemException])
+IT_CHECK_FOR_METHOD([ORBUTILSYSTEMEXCEPTION_IOEXCEPTIONONCLOSE_THROWABLE],
+ [com.sun.corba.se.impl.logging.ORBUtilSystemException.ioExceptionOnClose(Throwable)],
+ [com.sun.corba.se.impl.logging.ORBUtilSystemException],
+ ["ioExceptionOnClose",java.lang.Throwable.class],
+ [new com.sun.corba.se.impl.logging.ORBUtilSystemException(null).ioExceptionOnClose(new InternalError())]
+)
+
# 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)
@@ -327,6 +336,7 @@
AC_CONFIG_FILES([tapset/hotspot.stp])
AC_CONFIG_FILES([tapset/hotspot_jni.stp])
AC_CONFIG_FILES([tapset/jstack.stp])
+ AC_CONFIG_FILES([tapset/hotspot_gc.stp])
fi
dnl Check for libpng headers and libraries.
diff -r 109033172ae7 -r 5b29b2f26eea javac.in
--- a/javac.in Wed Oct 31 11:34:40 2012 +0000
+++ b/javac.in Wed Dec 05 14:55:23 2012 +0000
@@ -4,11 +4,13 @@
use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
my $ECJ_WARNINGS="-nowarn";
+my $JAVAC_WARNINGS="-nowarn";
my @bcoption;
push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'
unless grep {$_ eq '-bootclasspath'} @ARGV;
my @ecj_parms = ($ECJ_WARNINGS, @bcoption);
+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.
@@ -49,6 +51,18 @@
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 ;
+ }
+ else
+ {
+ exec '@JAVAC@', @javac_parms, @ARGV ;
+ }
+}
elsif ( -e "@ECJ_JAR@" )
{
my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
@@ -59,6 +73,6 @@
}
else
{
- my $ecj_args = gen_ecj_opts( \@ARGV );
- exec '@ECJ@', @ecj_parms, @$ecj_args ;
+ print STDERR "No Java compiler to run";
+ exit -1;
}
diff -r 109033172ae7 -r 5b29b2f26eea patches/cacao/jsig.patch
--- a/patches/cacao/jsig.patch Wed Oct 31 11:34:40 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
More information about the distro-pkg-dev
mailing list