/hg/release/icedtea6-1.6: 16 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Mar 18 08:01:26 PDT 2010
changeset d7a1543dcb1e in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=d7a1543dcb1e
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 17 16:48:26 2010 +0000
Update NEWS and bump version to 1.6.3.
2010-03-17 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Update for 1.6.3.
* configure.ac: Bump to 1.6.3.
changeset bd932bfc5a03 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=bd932bfc5a03
author: doko at ubuntu.com
date: Thu Aug 27 17:48:27 2009 +0200
2009-08-27 Kees Cook <kees at canonical.com>
* patches/hotspot/default/icedtea-gcc-stack-markings.patch:
New. Adding stack markings to the x86 assembly for not using
executable stack.
changeset f734c3dcd1a0 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=f734c3dcd1a0
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 17 22:12:42 2010 +0000
Remove unnecessary use of $(abs_top_builddir)/rt in rt-source-
files.txt.
2010-03-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (rt-source-files.txt): Don't search
$(abs_top_builddir)/rt; this is only ever going to either do
nothing (due to srcdir=builddir or not builddir/rt
as is the usual case) or produce duplicates.
changeset 5cfd9324c1b7 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=5cfd9324c1b7
author: Mark Wielaard <mark at klomp.org>
date: Wed Oct 14 15:42:32 2009 +0200
Enable systemtap JNI tracing.
2009-10-14 Mark Wielaard <mjw at redhat.com>
* configure.ac: When enabling systemtap support check
sys/sdt.h and g++ are recent enough to allow probes in class
constructors and destructors.
* patches/icedtea-systemtap.patch: Enable compiling probes in
jni.cpp. Rewrite Set<prim>Field and SetStatic<prim>Field macros
to use DTRACE_PROBE interface directly instead of generating
dtrace implementation calls. Clean up dtrace.hpp.
* tapset/hotspot.stp.in: Enable hotspot.monitor_notify. Fix up
comments.
changeset 4ed9452515ba in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=4ed9452515ba
author: Mark Wielaard <mark at klomp.org>
date: Mon Oct 19 21:23:00 2009 +0200
JNI GetObjectArrayElement mark probe ret value shadowed.
2009-10-19 Mark Wielaard <mjw at redhat.com>
* patches/icedtea-systemtap.patch: Add fix for
GetObjectArrayElement return probe ret value.
changeset 3786ee25cc7b in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=3786ee25cc7b
author: Mark Wielaard <mark at klomp.org>
date: Mon Oct 19 21:49:33 2009 +0200
Fix JNI DEFINE_NEWSCALARARRAY usage of DT_RETURN_MARK_DECL_FOR.
2009-10-19 Mark Wielaard <mjw at redhat.com>
* patches/icedtea-systemtap.patch: Add fix for JNI
DEFINE_NEWSCALARARRAY uses DT_RETURN_MARK_DECL_FOR.
changeset c399646ec5d7 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=c399646ec5d7
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 18 14:33:23 2010 +0000
Add hotspot_jni tapset.
2009-10-19 Mark Wielaard <mjw at redhat.com>
* tapset/hotspot_jni.stp.in: New tapset.
* scripts/jni_create_stap.c: New file.
* scripts/jni_desc: Likewise.
* configure.ac (AC_CONFIG_FILES): Add tapset/hotspot_jni.stp.
* Makefile.am (EXTRA_DIST): Add tapsets and scripts.
(stamps/icedtea.stamp): Handle tapset/hotspot_jni.stp.in.
(stamps/icedtea-debug.stamp): Likewise.
changeset a0add50b9ca9 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=a0add50b9ca9
author: Mark Wielaard <mark at klomp.org>
date: Tue Oct 13 11:13:46 2009 +0200
tapsets/hotspot.stp.in (hotspot.gc_end): Match gc__end, not begin.
changeset 969edf771286 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=969edf771286
author: Mark Wielaard <mark at klomp.org>
date: Sun Dec 13 22:32:25 2009 +0100
Add systemtap jstack support.
* Makefile.am (stamps/icedtea.stamp): Install jstack.stp. (stamps
/icedtea-debug.stamp): Likewise.
* configure.ac (AC_CONFIG_FILES): Add tapset/jstack.stp.
* tapset/jstack.stp.in: New tapset.
changeset 52fd6360b0ef in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=52fd6360b0ef
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 18 14:50:14 2010 +0000
Corrected Pulse Audio library build on PPC32 and PPC64
2010-03-10 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: Corrected Pulse Audio library build
on PPC32 and PPC64
changeset 5d2b941b522e in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=5d2b941b522e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 15 17:25:12 2010 +0000
Add class file rewriter which will be used to solve the Rhino issue:
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179 once
hooked into the build.
2010-02-15 Andrew John Hughes <ahughes at redhat.com>
* rewriter/agpl-3.0.txt,
* rewriter/com/redhat/rewriter/ClassRewriter.java: Add class
rewriter for fixing Rhino classes to use the
com.sun.org.mozilla namespace, along with corresponding
license.
changeset 9ad8a3d44a67 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=9ad8a3d44a67
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 18 14:56:35 2010 +0000
Fix a number of issues and enable the Rhino rewriter in the build.
2010-02-17 Andrew John Hughes <ahughes at redhat.com>
PR icedtea/179
* ChangeLog: Remove rogue whitespace highlighted by emacs.
* Makefile.am: (REWRITER_SRCS): Sources for class file
rewriter. Only set RHINO_JAR when WITH_RHINO is set. Point
to rewritten JAR file in build directory. Add rewriter and
license to EXTRA_DIST. Make icedtea, icedtea-debug and
icedtea-ecj depend on rewrite-rhino.stamp.
(stamps/rewriter.stamp): Build the class file rewriter.
(stamps/rewrite-rhino.stamp): Rewrite the system Rhino JAR
file to use the sun.org.mozilla namespace to avoid conflicts.
(rewriter): New alias for stamps/rewriter.stamp. (rewrite-
rhino): Likewise for stamps/rewrite-rhino.stamp.
* patches/icedtea-rhino.patch: Copy rather than symlink the
JAR file. Only drop the internal suffix on the javascript
package names.
* rewriter/com/redhat/rewriter/ClassRewriter.java: (executor):
Use a single threaded executor when debugging is enabled.
(tasks): Store the Futures returned by the executor for
later checking. (main(String[])): Log what happens when
processFile returns and handle any exceptions using Futures.
(call()): Ensure srcDir/destDir replacement always matches
with a trailing slash to avoid odd rewrites. Loop directory
creation to avoid possible race issues. Increase logging and
fix a number of issues with the rewrite:
* Fix off-by-one loop bug so final entry is inspected.
* Handle double entries which occur with 8-byte entries
(doubles and longs): http://java.sun.com/docs/books/jvms/sec
ond_edition/html/ClassFile.doc.html#16628
changeset 0fe3a89b2dfb in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=0fe3a89b2dfb
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 19 14:19:25 2010 +0000
Make sure the RHINO_JAR variable always refers to a valid file.
2010-02-19 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (FIND_RHINO_JAR): Clear RHINO_JAR
variable if it still contains "no" at the end of the
macro.
changeset 017e76a6cef2 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=017e76a6cef2
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 20:56:59 2010 +0000
Use full path to jar application when rewriting Rhino files.
2010-02-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (rewrite-rhino.stamp): Use full path
to jar application to avoid relying on the one on
the path.
changeset 065f8d5c9ce8 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=065f8d5c9ce8
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 23:30:18 2010 +0000
Ensure THANKYOU is distributed in the tarball. Remove duplicate
AUTHORS file.
2010-02-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add THANKYOU to EXTRA_DIST.
* pulseaudio/AUTHORS: Removed; duplicates top-level file.
changeset 47a2b1b5ef65 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=47a2b1b5ef65
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 01 15:26:06 2010 +0000
Explicitly create destination directory for Rhino as Sun's javac
doesn't.
2010-02-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (rewriter.stamp): Explicitly create
destination directory as Sun's javac doesn't.
diffstat:
16 files changed, 10876 insertions(+), 64 deletions(-)
ChangeLog | 139
Makefile.am | 106
NEWS | 8
acinclude.m4 | 4
configure.ac | 41
patches/hotspot/default/icedtea-gcc-stack-markings.patch | 14
patches/icedtea-rhino.patch | 20
patches/icedtea-systemtap.patch | 90
pulseaudio/AUTHORS | 5
rewriter/agpl-3.0.txt | 661 +
rewriter/com/redhat/rewriter/ClassRewriter.java | 293
scripts/jni_create_stap.c | 190
scripts/jni_desc | 1471 ++
tapset/hotspot.stp.in | 11
tapset/hotspot_jni.stp.in | 7384 ++++++++++++++
tapset/jstack.stp.in | 503
diffs (truncated from 11302 to 500 lines):
diff -r 833ee1f40cf8 -r 47a2b1b5ef65 ChangeLog
--- a/ChangeLog Thu Mar 11 23:34:09 2010 +0000
+++ b/ChangeLog Mon Mar 01 15:26:06 2010 +0000
@@ -1,3 +1,142 @@ 2010-03-11 Andrew John Hughes <ahughes
+2010-02-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (rewriter.stamp): Explicitly create destination
+ directory as Sun's javac doesn't.
+
+2010-02-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add THANKYOU to
+ EXTRA_DIST.
+ * pulseaudio/AUTHORS: Removed; duplicates
+ top-level file.
+
+2010-02-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (rewrite-rhino.stamp): Use full path to
+ jar application to avoid relying on the one
+ on the path.
+
+2010-02-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (FIND_RHINO_JAR): Clear RHINO_JAR variable
+ if it still contains "no" at the end of the
+ macro.
+
+2010-02-17 Andrew John Hughes <ahughes at redhat.com>
+
+ PR icedtea/179
+ * ChangeLog: Remove rogue whitespace highlighted
+ by emacs.
+ * Makefile.am:
+ (REWRITER_SRCS): Sources for class file rewriter.
+ Only set RHINO_JAR when WITH_RHINO is set. Point
+ to rewritten JAR file in build directory. Add
+ rewriter and license to EXTRA_DIST. Make icedtea,
+ icedtea-debug and icedtea-ecj depend on rewrite-rhino.stamp.
+ (stamps/rewriter.stamp): Build the class file rewriter.
+ (stamps/rewrite-rhino.stamp): Rewrite the system Rhino JAR
+ file to use the sun.org.mozilla namespace to avoid conflicts.
+ (rewriter): New alias for stamps/rewriter.stamp.
+ (rewrite-rhino): Likewise for stamps/rewrite-rhino.stamp.
+ * patches/icedtea-rhino.patch:
+ Copy rather than symlink the JAR file. Only drop the
+ internal suffix on the javascript package names.
+ * rewriter/com/redhat/rewriter/ClassRewriter.java:
+ (executor): Use a single threaded executor when
+ debugging is enabled.
+ (tasks): Store the Futures returned by the executor
+ for later checking.
+ (main(String[])): Log what happens when processFile
+ returns and handle any exceptions using Futures.
+ (call()): Ensure srcDir/destDir replacement always
+ matches with a trailing slash to avoid odd rewrites.
+ Loop directory creation to avoid possible race issues.
+ Increase logging and fix a number of issues with the rewrite:
+ * Fix off-by-one loop bug so final entry is inspected.
+ * Handle double entries which occur with 8-byte entries
+ (doubles and longs):
+ http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#16628
+
+2010-02-15 Andrew John Hughes <ahughes at redhat.com>
+
+ * rewriter/agpl-3.0.txt,
+ * rewriter/com/redhat/rewriter/ClassRewriter.java:
+ Add class rewriter for fixing Rhino classes
+ to use the com.sun.org.mozilla namespace,
+ along with corresponding license.
+
+2010-03-10 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Corrected Pulse Audio
+ library build on PPC32 and PPC64
+
+2010-03-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (rt-source-files.txt): Don't search
+ $(abs_top_builddir)/rt; this is only
+ ever going to either do nothing (due
+ to srcdir=builddir or not builddir/rt
+ as is the usual case) or produce
+ duplicates.
+
+2009-08-27 Kees Cook <kees at canonical.com>
+
+ * patches/hotspot/default/icedtea-gcc-stack-markings.patch: New.
+ Adding stack markings to the x86 assembly for not using executable
+ stack.
+
+2009-10-14 Mark Wielaard <mjw at redhat.com>
+
+ * configure.ac: When enabling systemtap support check sys/sdt.h
+ and g++ are recent enough to allow probes in class constructors
+ and destructors.
+ * patches/icedtea-systemtap.patch: Enable compiling probes in
+ jni.cpp. Rewrite Set<prim>Field and SetStatic<prim>Field macros
+ to use DTRACE_PROBE interface directly instead of generating
+ dtrace implementation calls. Clean up dtrace.hpp.
+ * tapset/hotspot.stp.in: Enable hotspot.monitor_notify. Fix up
+ comments.
+
+2009-12-13 Mark Wielaard <mjw at redhat.com>
+
+ * Makefile.am (stamps/icedtea.stamp): Install jstack.stp.
+ (stamps/icedtea-debug.stamp): Likewise.
+ * configure.ac (AC_CONFIG_FILES): Add tapset/jstack.stp.
+ * tapset/jstack.stp.in: New tapset.
+
+2009-10-13 Mark Wielaard <mjw at redhat.com>
+
+ * tapsets/hotspot.stp.in (hotspot.gc_end): Match gc__end, not begin.
+
+2009-10-19 Mark Wielaard <mjw at redhat.com>
+
+ * tapset/hotspot_jni.stp.in: New tapset.
+ * scripts/jni_create_stap.c: New file.
+ * scripts/jni_desc: Likewise.
+ * configure.ac (AC_CONFIG_FILES): Add tapset/hotspot_jni.stp.
+ * Makefile.am (EXTRA_DIST): Add tapsets and scripts.
+ (stamps/icedtea.stamp): Handle tapset/hotspot_jni.stp.in.
+ (stamps/icedtea-debug.stamp): Likewise.
+
+2009-10-19 Mark Wielaard <mjw at redhat.com>
+
+ * patches/icedtea-systemtap.patch: Add fix for JNI
+ DEFINE_NEWSCALARARRAY uses DT_RETURN_MARK_DECL_FOR.
+
+2009-10-19 Mark Wielaard <mjw at redhat.com>
+
+ * patches/icedtea-systemtap.patch: Add fix for GetObjectArrayElement
+ return probe ret value.
+
+2010-03-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Update for 1.6.3.
+ * configure.ac: Bump to 1.6.3.
+
2010-03-11 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
diff -r 833ee1f40cf8 -r 47a2b1b5ef65 Makefile.am
--- a/Makefile.am Thu Mar 11 23:34:09 2010 +0000
+++ b/Makefile.am Mon Mar 01 15:26:06 2010 +0000
@@ -112,7 +112,14 @@ EXTRA_DIST = rt generated \
plugin \
hotspot.map \
autogen.sh \
- mkbc.c
+ mkbc.c \
+ tapset/hotspot.stp.in \
+ tapset/hotspot_jni.stp.in \
+ scripts/jni_create_stap.c \
+ scripts/jni_desc \
+ rewriter/agpl-3.0.txt \
+ $(REWRITER_SRCS) \
+ THANKYOU
# The Binary plugs directory is called jdk1.7.0 for historical reasons. The
# name is completely irrelevant; only contains the plugs to build IcedTea.
@@ -186,7 +193,6 @@ ICEDTEA_ENV = \
ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
JAVAC="" \
- RHINO_JAR="$(RHINO_JAR)" \
DISTRIBUTION_ID="$(DIST_ID)"
if WITH_CACAO
@@ -219,6 +225,11 @@ env:
env:
@echo 'unset JAVA_HOME'
@echo 'export $(ICEDTEA_ENV)'
+
+if WITH_RHINO
+ICEDTEA_ENV += \
+ RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
+endif
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
@@ -267,7 +278,6 @@ ICEDTEA_ENV_ECJ = \
ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
JAVAC="" \
- RHINO_JAR="$(RHINO_JAR)" \
JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)"
@@ -292,6 +302,11 @@ ICEDTEA_ENV_ECJ += \
ICEDTEA_ENV_ECJ += \
CROSS_COMPILATION="true" \
CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)"
+endif
+
+if WITH_RHINO
+ICEDTEA_ENV_ECJ += \
+ RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
endif
env-ecj:
@@ -729,6 +744,7 @@ ICEDTEA_PATCHES += \
patches/hotspot/$(HSBUILD)/icedtea-explicit-target-arch.patch \
patches/openjdk/6648816.patch \
patches/openjdk/oj100103-debugger-socket-overflow.patch \
+ patches/hotspot/$(HSBUILD)/icedtea-gcc-stack-markings.patch \
$(DISTRIBUTION_PATCHES)
stamps/extract.stamp: stamps/download.stamp
@@ -1157,7 +1173,8 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
- stamps/pulse-java.stamp $(ZERO_ASM_BC_ASM_COND)
+ stamps/pulse-java.stamp $(ZERO_ASM_BC_ASM_COND) \
+ stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1228,10 +1245,17 @@ if ENABLE_SYSTEMTAP
sed -e '/\/client\/libjvm.so/d' \
< $(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_jni.stp \
+ > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
- fi
+ cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi; \
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
endif
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
mkdir -p stamps
@@ -1242,7 +1266,8 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
- stamps/pulse-java.stamp $(ZERO_ASM_BC_ASM_COND)
+ stamps/pulse-java.stamp $(ZERO_ASM_BC_ASM_COND) \
+ stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1313,10 +1338,17 @@ if ENABLE_SYSTEMTAP
sed -e '/\/client\/libjvm.so/d' \
< $(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_jni.stp \
+ > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
else \
cp $(abs_top_builddir)/tapset/hotspot.stp \
$(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
- fi
+ cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+ fi; \
+ cp $(abs_top_builddir)/tapset/jstack.stp \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
endif
@echo "IcedTea (debug build) is served:" \
$(BUILD_OUTPUT_DIR)-debug
@@ -1355,7 +1387,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstr
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp \
- $(ZERO_ASM_BC_ASM_COND)
+ $(ZERO_ASM_BC_ASM_COND) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/ \
@@ -1555,7 +1587,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
# rt-closed.jar class files.
rt-source-files.txt: stamps/replace-hotspot.stamp stamps/copy-source-files.stamp
- find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt $(LIVECONNECT_SRCS) -name '*.java' \
+ find $(abs_top_srcdir)/rt $(LIVECONNECT_SRCS) -name '*.java' \
| sort -u > $@
stamps/rt-class-files.stamp: rt-source-files.txt
@@ -1744,13 +1776,13 @@ endif
stamps/pulse-java.stamp: stamps/pulse-java-jar.stamp stamps/pulse-java-headers.stamp
if ENABLE_PULSE_JAVA
- $(CC) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/jni-common.c
- $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_EventLoop.c
- $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c
- $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c
- $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c
- $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c
- $(CC) $(LDFLAGS) -shared org_*pulseaudio*.o jni-common.o $(LIBPULSE_LIBS) -o libpulse-java.so
+ $(CC) $(CFLAGS) $(ZERO_ARCHFLAG) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/jni-common.c
+ $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) $(ZERO_ARCHFLAG) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_EventLoop.c
+ $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) $(ZERO_ARCHFLAG) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c
+ $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) $(ZERO_ARCHFLAG) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c
+ $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) $(ZERO_ARCHFLAG) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c
+ $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) $(ZERO_ARCHFLAG) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c
+ $(CC) $(LDFLAGS) $(ZERO_ARCHFLAG) -shared org_*pulseaudio*.o jni-common.o $(LIBPULSE_LIBS) -o libpulse-java.so
mv org_classpath_icedtea_pulseaudio_*.o $(PULSE_JAVA_CLASS_DIR)
mv jni-common.o $(PULSE_JAVA_CLASS_DIR)
endif
@@ -2025,6 +2057,41 @@ jtregcheck: jtreg check-hotspot check-la
check-local: jtregcheck
+# Rhino support
+
+stamps/rewriter.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
+if WITH_RHINO
+ mkdir -p $(abs_top_builddir)/rewriter
+ (cd $(abs_top_srcdir)/rewriter ; \
+ $(ICEDTEA_BOOT_DIR)/bin/javac -g \
+ -d $(abs_top_builddir)/rewriter $(REWRITER_SRCS) \
+ )
+endif
+ mkdir -p stamps
+ touch stamps/rewriter.stamp
+
+stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
+if WITH_RHINO
+ mkdir -p rhino/rhino.{old,new}
+ (cd rhino/rhino.old ; jar xf $(RHINO_JAR))
+ $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \
+ com.redhat.rewriter.ClassRewriter \
+ $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
+ org.mozilla sun.org.mozilla
+ (cd rhino/rhino.old ; \
+ for files in `find -type f -not -name '*.class'` ; do \
+ new_file=../rhino.new/`echo $$files|sed -e 's#org#sun/org#'` ; \
+ mkdir -p `dirname $$new_file` ; \
+ cp -v $$files $$new_file ; \
+ sed -ie 's#org\.mozilla#sun.org.mozilla#g' $$new_file ; \
+ done \
+ )
+ (cd rhino/rhino.new ; \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cfm ../rhino.jar META-INF/MANIFEST.MF sun )
+endif
+ mkdir -p stamps
+ touch stamps/rewrite-rhino.stamp
+
# VisualVM
stamps/visualvm.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/download.stamp \
@@ -2084,6 +2151,9 @@ dist-openjdk-fsg: stamps/patch-fsg.stamp
dist-openjdk-fsg: stamps/patch-fsg.stamp
$(ZIP) -r openjdk-fsg-$(OPENJDK_VERSION) openjdk/
+REWRITER_SRCS = $(abs_top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
+
+
# Target Aliases
# ===============
@@ -2127,6 +2197,10 @@ patch-fsg: stamps/patch-fsg.stamp
overlay: stamps/overlay.stamp
+rewriter: stamps/rewriter.stamp
+
+rewrite-rhino: stamps/rewrite-rhino.stamp
+
plugs: stamps/plugs.stamp
rt-class-files: stamps/rt-class-files.stamp
diff -r 833ee1f40cf8 -r 47a2b1b5ef65 NEWS
--- a/NEWS Thu Mar 11 23:34:09 2010 +0000
+++ b/NEWS Mon Mar 01 15:26:06 2010 +0000
@@ -1,3 +1,11 @@ New in release 1.6.2 (2009-11-09)
+New in release 1.6.3 (2010-03-XX)
+- Enable debuginfo for saproc and jsig
+- Add missing mkbc.c
+- Backport of 6822370:
+ ReentrantReadWriteLock: threads hung when there are no threads holding onto the lock
+- Increase ThreadStackSize by 512kb on 32-bit Zero platforms
+- Make the original HotSpot build work for normal builds and disable Zero/Shark builds with it
+
New in release 1.6.2 (2009-11-09)
- Latest security updates:
- (CVE-2009-3728) ICC_Profile file existence detection information leak (6631533)
diff -r 833ee1f40cf8 -r 47a2b1b5ef65 acinclude.m4
--- a/acinclude.m4 Thu Mar 11 23:34:09 2010 +0000
+++ b/acinclude.m4 Mon Mar 01 15:26:06 2010 +0000
@@ -639,6 +639,10 @@ AC_DEFUN([FIND_RHINO_JAR],
fi
AC_MSG_RESULT(${RHINO_JAR})
AM_CONDITIONAL(WITH_RHINO, test x"${RHINO_JAR}" != "xno")
+dnl Clear RHINO_JAR if it doesn't contain a valid filename
+ if test x"${RHINO_JAR}" = "xno"; then
+ RHINO_JAR=
+ fi
AC_SUBST(RHINO_JAR)
])
diff -r 833ee1f40cf8 -r 47a2b1b5ef65 configure.ac
--- a/configure.ac Thu Mar 11 23:34:09 2010 +0000
+++ b/configure.ac Mon Mar 01 15:26:06 2010 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.6.2], [distro-pkg
-AC_INIT([icedtea6], [1.6.2], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6], [1.6.3], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
@@ -326,6 +326,43 @@ AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUN
[SDT_H_FOUND='no';
AC_MSG_ERROR([systemtap support needs sys/sdt.h header])])
+ AC_MSG_CHECKING([working sys/sdt.h and g++ support])
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/sdt.h>
+class ProbeClass
+{
+private:
+ int& ref;
+ const char *name;
+
+public:
+ ProbeClass(int& v, const char *n) : ref(v), name(n)
+ {
+ DTRACE_PROBE2(_test_, cons, name, ref);
+ }
+
+ void method(int min)
+ {
+ DTRACE_PROBE3(_test_, meth, name, ref, min);
+ ref -= min;
+ }
+
+ ~ProbeClass()
+ {
+ DTRACE_PROBE2(_test_, dest, name, ref);
+ }
+};
+]],
+[[
+ int i = 64;
+ DTRACE_PROBE1(_test_, call, i);
+ ProbeClass inst = ProbeClass(i, "call");
+ inst.method(24);
+]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([systemtap sdt.h or g++ too old])])
+ AC_LANG_RESTORE
+
AC_MSG_CHECKING([for absolute java home install dir])
AC_ARG_WITH([abs-install-dir],
[AS_HELP_STRING([--with-abs-install-dir],
@@ -342,6 +379,8 @@ AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUN
AC_SUBST(ABS_CLIENT_LIBJVM_SO)
AC_SUBST(ABS_SERVER_LIBJVM_SO)
AC_CONFIG_FILES([tapset/hotspot.stp])
+ AC_CONFIG_FILES([tapset/hotspot_jni.stp])
+ AC_CONFIG_FILES([tapset/jstack.stp])
fi
dnl Check for libpng headers and libraries.
diff -r 833ee1f40cf8 -r 47a2b1b5ef65 patches/hotspot/default/icedtea-gcc-stack-markings.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/default/icedtea-gcc-stack-markings.patch Mon Mar 01 15:26:06 2010 +0000
@@ -0,0 +1,14 @@
+--- openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s~ 2009-08-06 01:08:57.000000000 -0700
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s 2009-08-06 01:09:27.000000000 -0700
+@@ -650,3 +650,4 @@ _Atomic_cmpxchg_long:
+ popl %ebx
+ ret
+
++.section .note.GNU-stack, "", @progbits
+--- openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s~ 2009-08-06 01:08:57.000000000 -0700
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s 2009-08-06 01:09:27.000000000 -0700
+@@ -400,3 +400,4 @@ _Atomic_cmpxchg_long:
+ addq $4,%rdx
+ jg 4b
+ ret
++.section .note.GNU-stack, "", @progbits
diff -r 833ee1f40cf8 -r 47a2b1b5ef65 patches/icedtea-rhino.patch
--- a/patches/icedtea-rhino.patch Thu Mar 11 23:34:09 2010 +0000
+++ b/patches/icedtea-rhino.patch Mon Mar 01 15:26:06 2010 +0000
@@ -44,7 +44,7 @@
$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
-+ $(LN) -sf $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
++ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
@# Generate meta-index to make boot and extension class loaders lazier
$(CD) $(JRE_IMAGE_DIR)/lib && \
$(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
@@ -55,7 +55,7 @@
package com.sun.script.javascript;
-import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
More information about the distro-pkg-dev
mailing list