/hg/icedtea6-hg: 25 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Mar 21 05:15:24 PDT 2012
changeset c354196308a5 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c354196308a5
author: Mark Wielaard <mark at klomp.org>
date: Tue Mar 13 16:29:10 2012 +0100
* tapset/jstack.stp.in: Don't hard code constantPoolOopDesc_size.
The size of constantPoolOopDesc had changed, but it was hard coded.
We use a trick now to calculate it from the DWARF data. Pretend we have
an array at address zero and take address of second element and we have
the size.
changeset b6af0d776621 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b6af0d776621
author: Mark Wielaard <mark at klomp.org>
date: Tue Mar 13 16:41:32 2012 +0100
jstack.stp support multiple running hotspots by indexing globals by pid().
changeset 131b26ec835a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=131b26ec835a
author: Mark Wielaard <mark at klomp.org>
date: Tue Mar 13 17:24:50 2012 +0100
* tapset/jstack.stp.in: Use @var construct if available.
Newer versions of systemtap (since 1.8) make it possible to use the @var
construct if available to pick target variables from the right CU. Which
is needed by newer DWARF/gcc versions which don't add a defining variable
declaration to each CU anymore.
changeset 1ab9b476f302 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1ab9b476f302
author: Mark Wielaard <mark at klomp.org>
date: Tue Mar 13 23:21:36 2012 +0100
* tapset/jstack.stp.in: Wrap heap accessors in try-catch block.
When we cannot read some part of the hotspot code heap catch that error
and report the frame (address) without trying to decode it.
changeset 6094e670ff67 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6094e670ff67
author: Mark Wielaard <mark at klomp.org>
date: Wed Mar 14 10:55:24 2012 +0100
* Makefile.am (EXTRA_DIST): Add tapset/jstack.stp.in.
changeset 92b8e217ffe9 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=92b8e217ffe9
author: aph
date: Tue Feb 28 04:56:04 2012 -0500
save work in a temporary commit
changeset 8ff8561d6267 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8ff8561d6267
author: aph
date: Tue Feb 28 09:58:50 2012 -0500
save work in a temporary commit
changeset a2b7cc226931 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a2b7cc226931
author: aph
date: Tue Feb 28 12:00:41 2012 -0500
Handlers for _compareAndSwapInt and _compareAndSwapLong
2012-02-28 Andrew Haley <aph at redhat.com>
* openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (IT_MASK_TT)
(IT_MASK_TE, IT_MASK_TTT, IT_MASK_TEE): Add a few new IT
encodings.
(Thumb2_dUnaryOp): Generalize Thumb2_dNeg.
(Thumb2_dNeg, Thumb2_dAbs): Specializations of Thumb2_dUnaryOp.
(handle_special_method): Use intrinsic_id instead of method_kind.
Add handlers for _compareAndSwapInt and _compareAndSwapLong.
(Thumb2_codegen): Call handle_special_method() for invokevirtual.
Pass stackdepth to handle_special_method().
changeset 9b5d9161c9dd in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9b5d9161c9dd
author: aph
date: Wed Feb 29 17:51:34 2012 +0000
Enable compareAndSwap on jlongs.
2012-02-29 Andrew Haley <aph at redhat.com>
* patches/arm.patch (void get_processor_features): New function
that enables compareAndSwap on jlongs.
(atomic_linux_zero.inline.hpp: arm_val_compare_and_swap): New
function.
(atomic_linux_zero.inline.hpp: Atomic::store): Use
arm_val_compare_and_swap.
changeset 5b30d8907b48 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5b30d8907b48
author: aph
date: Fri Mar 02 10:10:47 2012 -0500
Revert ARM-specific code from atomic_linux_zero.inline.hpp
changeset 672784296bca in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=672784296bca
author: aph
date: Fri Mar 02 10:16:07 2012 -0500
Reorganize ARM concurrency inlining patch.
2012-03-02 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/arm_cas.S: New file.
* patches/arm.patch (void get_processor_features): New function
that enables compareAndSwap on jlongs.
(atomic_linux_zero.inline.hpp: arm_val_compare_and_swap): New
function.
(atomic_linux_zero.inline.hpp: Atomic::store): Use
arm_val_compare_and_swap.
* openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (IT_MASK_TT)
(IT_MASK_TE, IT_MASK_TTT, IT_MASK_TEE): Add a few new IT
encodings.
(Thumb2_dUnaryOp): Generalize Thumb2_dNeg.
(Thumb2_dNeg, Thumb2_dAbs): Specializations of Thumb2_dUnaryOp.
(handle_special_method): Use intrinsic_id instead of method_kind.
Add handlers for _compareAndSwapInt and _compareAndSwapLong.
(Thumb2_codegen): Call handle_special_method() for invokevirtual.
Pass stackdepth to handle_special_method().
changeset d549e720bebb in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d549e720bebb
author: aph
date: Fri Mar 02 12:49:43 2012 -0500
Minor reorg of arm.patch.
changeset fd60dc8238c7 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fd60dc8238c7
author: aph
date: Tue Mar 13 16:56:04 2012 +0000
merge
changeset f2b27b309c43 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f2b27b309c43
author: aph
date: Wed Mar 14 05:47:19 2012 -0400
ARM: Replace some obscure constants with symbols.
2012-03-14 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (ldc, ldc_w):
Replace numeric constants for constant pool with symbols.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (build_frame):
Likewise.
(fast_native_entry): Likewise.
changeset 248d25e53f7e in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=248d25e53f7e
author: aph
date: Thu Mar 15 07:48:08 2012 -0400
ARM it(): handle negated conditions.
2012-03-15 Andrew Haley <aph at redhat.com>
* openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (it): Add code to
handle negated conditions.
(handle_special_method): Use blx_reg rather than blx in case the
target is thumb code.
changeset 461a2b36448e in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=461a2b36448e
author: aph
date: Fri Mar 16 08:36:04 2012 -0400
Use unified syntax for thumb code.
2012-03-16 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/arm_cas.S: Use unified syntax
for thumb code.
changeset d5ab30d2a0fc in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d5ab30d2a0fc
author: aph
date: Fri Mar 16 08:50:50 2012 -0400
merge
changeset 0894be5f665e in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0894be5f665e
author: aph
date: Fri Mar 16 13:05:33 2012 -0400
Fix merge
changeset a89d8bca422d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a89d8bca422d
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 20 01:51:56 2012 +0000
PR886: Provide a more general solution to PR600 to cover architectures other than just ARM.
2012-03-16 Andrew John Hughes <ahughes at redhat.com>
PR600, 886:
* patches/pr600-arm-jvm.cfg.patch: Removed.
* Makefile.am:
(extract-openjdk): Copy jvm.cfg over if building cacao.
* acinclude.m4:
(IT_ENABLE_CACAO): Generat jvm.cacao.cfg.
* jvm.cacao.cfg.in: Copied from jvm.cfg.in.
changeset 8b157b07b859 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8b157b07b859
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 20 06:01:53 2012 +0000
Extend previous fix to cover JamVM on all archs.
2012-03-16 Andrew John Hughes <ahughes at redhat.com>
PR600, 886:
* Makefile.am:
(extract-openjdk): Copy jvm.cfg over if building JamVM.
* acinclude.m4:
(IT_ENABLE_JAMVM): Generate jvm.jamvm.cfg.
* jvm.jamvm.cfg.in: Copied from jvm.cfg.in.
changeset af04fa17f62f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=af04fa17f62f
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 20 10:43:41 2012 +0000
Update list of JDK home directories checked.
2012-03-19 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
(IT_CHECK_FOR_JDK): Update JDK home directory
check list, adding some missing 1.6 entries
and removing generic ones which may now pick
up an unwanted 1.7 installation.
changeset 2ec767396557 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2ec767396557
author: Mark Wielaard <mark at klomp.org>
date: Tue Mar 20 13:48:29 2012 +0100
Makefile.am (clean-jtreg): Depend on clean-jtreg-reports.
clean-jtreg wants to remove the empty test build directory. But it can
still contain jtreg report summary files. Clean those up first by depending
on clean-jtreg-reports.
changeset ccdd6a1bd958 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ccdd6a1bd958
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 20 13:34:06 2012 +0000
Bring compiler detection into line with other jdk tools and check java/javac work before running other macros.
2012-03-20 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
(IT_FIND_COMPILER): Define only once and
rename from IT_FIND_JAVAC.
(IT_FIND_ECJ): Use same form as detection
for java, javah, jar and rmic.
(IT_FIND_JAVAC): Likewise.
(IT_CHECK_JAVA_AND_JAVAC_WORK): New macro to check
java and javac actually work together to compile code
before running other tests such as the dtdtype one.
(IT_CHECK_FOR_CLASS): Depend on java/javac working.
(IT_CHECK_IF_INSTANTIABLE): Likewise.
(IT_GETDTDTYPE_CHECK): Likewise. Add -target 5.
(IT_JAVAH): Depend on java/javac working.
* configure.ac: Invoke IT_FIND_COMPILER rather than
IT_FIND_JAVAC.
changeset f4bcb05229c9 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f4bcb05229c9
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Mar 20 13:35:23 2012 +0000
Merge
changeset b3f35e8bcccd in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b3f35e8bcccd
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 21 12:15:10 2012 +0000
Merge
diffstat:
ChangeLog | 147 ++++
Makefile.am | 28 +-
NEWS | 1 +
acinclude.m4 | 155 +++-
arm_port/hotspot/src/cpu/zero/vm/arm_cas.S | 31 +
arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 4 +-
arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 12 +-
arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 195 +++++-
configure.ac | 2 +-
jvm.cacao.cfg.in | 44 +
jvm.jamvm.cfg.in | 44 +
patches/arm.patch | 52 +
patches/ecj/icedtea.patch | 87 +-
patches/openjdk/6633275-shaped_translucent_windows.patch | 7 -
patches/openjdk/6725214-direct3d-01.patch | 7 -
patches/openjdk/6851973-kerberos.patch | 200 ------
patches/openjdk/7091528-javadoc_class_files.patch | 187 ------
patches/openjdk/7102369-7094468-rmiregistry.patch | 466 ---------------
patches/openjdk/7103725-ssl_beast_regression.patch | 21 -
patches/pr600-arm-jvm.cfg.patch | 43 -
patches/security/20120214/7082299.patch | 200 ------
patches/security/20120214/7088367.patch | 43 -
patches/security/20120214/7110683.patch | 169 -----
patches/security/20120214/7110687.patch | 232 -------
patches/security/20120214/7110700.patch | 41 -
patches/security/20120214/7110704.patch | 60 -
patches/security/20120214/7118283.patch | 26 -
patches/security/20120214/7126960.patch | 80 --
tapset/jstack.stp.in | 287 +++++----
29 files changed, 795 insertions(+), 2076 deletions(-)
diffs (truncated from 3712 to 500 lines):
diff -r b8d810f20366 -r b3f35e8bcccd ChangeLog
--- a/ChangeLog Fri Mar 02 16:08:50 2012 +0100
+++ b/ChangeLog Wed Mar 21 12:15:10 2012 +0000
@@ -1,3 +1,131 @@
+2012-03-20 Mark Wielaard <mjw at redhat.com>
+
+ * Makefile.am (clean-jtreg): Depend on clean-jtreg-reports.
+
+2012-03-20 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_FIND_COMPILER): Define only once and
+ rename from IT_FIND_JAVAC.
+ (IT_FIND_ECJ): Use same form as detection
+ for java, javah, jar and rmic.
+ (IT_FIND_JAVAC): Likewise.
+ (IT_CHECK_JAVA_AND_JAVAC_WORK): New macro to check
+ java and javac actually work together to compile code
+ before running other tests such as the dtdtype one.
+ (IT_CHECK_FOR_CLASS): Depend on java/javac working.
+ (IT_CHECK_IF_INSTANTIABLE): Likewise.
+ (IT_GETDTDTYPE_CHECK): Likewise. Add -target 5.
+ (IT_JAVAH): Depend on java/javac working.
+ * configure.ac: Invoke IT_FIND_COMPILER rather than
+ IT_FIND_JAVAC.
+
+2012-03-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_CHECK_FOR_JDK): Update JDK home directory
+ check list, adding some missing 1.6 entries
+ and removing generic ones which may now pick
+ up an unwanted 1.7 installation.
+
+2012-03-16 Andrew John Hughes <ahughes at redhat.com>
+
+ PR600, 886:
+ * Makefile.am:
+ (extract-openjdk): Copy jvm.cfg over if building JamVM.
+ * acinclude.m4:
+ (IT_ENABLE_JAMVM): Generate jvm.jamvm.cfg.
+ * jvm.jamvm.cfg.in: Copied from jvm.cfg.in.
+
+2012-03-16 Andrew John Hughes <ahughes at redhat.com>
+
+ PR600, 886:
+ * patches/pr600-arm-jvm.cfg.patch: Removed.
+ * Makefile.am:
+ (extract-openjdk): Copy jvm.cfg over if building cacao.
+ * acinclude.m4:
+ (IT_ENABLE_CACAO): Generate jvm.cacao.cfg.
+ * jvm.cacao.cfg.in: Copied from jvm.cfg.in.
+
+2012-03-16 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/arm_cas.S: Use unified syntax
+ for thumb code.
+
+2012-03-15 Andrew Haley <aph at redhat.com>
+
+ * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (it): Add code to
+ handle negated conditions.
+ (handle_special_method): Use blx_reg rather than blx in case the
+ target is thumb code.
+ (IT_MASK_TE, IT_MASK_TT, IT_MASK_TTT): Delete.
+ (IT_MASK_TEE): Correct.
+
+2012-03-14 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (ldc, ldc_w):
+ Replace numeric constants for constant pool with symbols.
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (build_frame):
+ Likewise.
+ (fast_native_entry): Likewise.
+
+2012-03-02 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/arm_cas.S: New file.
+ * patches/arm.patch (void get_processor_features): New function
+ that enables compareAndSwap on jlongs.
+ (atomic_linux_zero.inline.hpp: arm_val_compare_and_swap): New
+ function.
+ (atomic_linux_zero.inline.hpp: Atomic::store): Use
+ arm_val_compare_and_swap.
+
+ * openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp (IT_MASK_TT)
+ (IT_MASK_TE, IT_MASK_TTT, IT_MASK_TEE): Add a few new IT
+ encodings.
+ (Thumb2_dUnaryOp): Generalize Thumb2_dNeg.
+ (Thumb2_dNeg, Thumb2_dAbs): Specializations of Thumb2_dUnaryOp.
+ (handle_special_method): Use intrinsic_id instead of method_kind.
+ Add handlers for _compareAndSwapInt and _compareAndSwapLong.
+ (Thumb2_codegen): Call handle_special_method() for invokevirtual.
+ Pass stackdepth to handle_special_method().
+
+2012-03-14 Mark Wielaard <mjw at redhat.com>
+
+ * Makefile.am (EXTRA_DIST): Add tapset/jstack.stp.in.
+
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+
+ * tapset/jstack.stp.in: Wrap heap accessors in try-catch block to be
+ able to report unusual frames.
+
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+
+ * tapset/jstack.stp.in: Use @var construct if available to pick
+ target variable from the right CU (needed by newer DWARF/gcc
+ versions).
+
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+
+ * tapset/jstack.stp.in: Index globals on pid() to support multiple
+ running hotspot jstacks at the same time.
+
+2012-03-13 Mark Wielaard <mjw at redhat.com>
+
+ * tapset/jstack.stp.in: Don't hard code constantPoolOopDesc_size.
+
+2012-03-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/security/20120214/7082299.patch,
+ * patches/security/20120214/7088367.patch,
+ * patches/security/20120214/7110683.patch,
+ * patches/security/20120214/7110687.patch,
+ * patches/security/20120214/7110700.patch,
+ * patches/security/20120214/7110704.patch,
+ * patches/security/20120214/7118283.patch,
+ * patches/security/20120214/7126960.patch:
+ Removed; upstream.
+ * Makefile.am: Drop above patches.
+
2012-03-02 Xerxes RÃ¥nby <xerxes at zafena.se>
Andrew Haley <aph at redhat.com>
@@ -148,6 +276,20 @@
(Thumb2_Return): Pass stackdepth to Thumb2_Safepoint.
(Thumb2_codegen): Pass stackdepth to Thumb2_Return.
+2012-01-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6851973-kerberos.patch,
+ * patches/openjdk/7091528-javadoc_class_files.patch,
+ * patches/openjdk/7102369-7094468-rmiregistry.patch,
+ * patches/openjdk/7103725-ssl_beast_regression.patch:
+ Dropped; upstream.
+ * Makefile.am: Remove dropped patches.
+ * patches/ecj/icedtea.patch: Updated due to 6790292.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch,
+ * patches/openjdk/6725214-direct3d-01.patch:
+ Remove copyright notice changes broken as a result of the annoying
+ 7128474 change.
+
2012-01-18 Xerxes RÃ¥nby <xerxes at zafena.se>
* openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
@@ -1832,6 +1974,11 @@
2011-11-28 Andrew John Hughes <ahughes at redhat.com>
+ * Makefile.am:
+ Bump to b25 (next version in hg).
+
+2011-11-28 Andrew John Hughes <ahughes at redhat.com>
+
* NEWS:
Remove inaccurate line about ARM assembler.
diff -r b8d810f20366 -r b3f35e8bcccd Makefile.am
--- a/Makefile.am Fri Mar 02 16:08:50 2012 +0100
+++ b/Makefile.am Wed Mar 21 12:15:10 2012 +0000
@@ -2,7 +2,7 @@
OPENJDK_DATE = 14_nov_2011
OPENJDK_SHA256SUM = f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227
-OPENJDK_VERSION = b24
+OPENJDK_VERSION = b25
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = cff92704c4e0
@@ -201,15 +201,7 @@
ICEDTEA_FSG_PATCHES =
-SECURITY_PATCHES = \
- patches/security/20120214/7082299.patch \
- patches/security/20120214/7088367.patch \
- patches/security/20120214/7110683.patch \
- patches/security/20120214/7110687.patch \
- patches/security/20120214/7110700.patch \
- patches/security/20120214/7110704.patch \
- patches/security/20120214/7118283.patch \
- patches/security/20120214/7126960.patch
+SECURITY_PATCHES =
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
@@ -332,7 +324,6 @@
patches/jtreg-LastErrorString.patch \
patches/openjdk/6663040-com.sun.awt.patch \
patches/openjdk/6775317-non-AA-simple-shape-performance.patch \
- patches/pr600-arm-jvm.cfg.patch \
patches/openjdk/6887494-NPE-in-pisces.patch \
patches/openjdk/6967436-6967433-floating-pt-conversion.patch \
patches/openjdk/6976265-stroke-control.patch \
@@ -412,10 +403,6 @@
patches/arm-debug.patch \
patches/arm-hsdis.patch \
patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \
- patches/openjdk/7102369-7094468-rmiregistry.patch \
- patches/openjdk/6851973-kerberos.patch \
- patches/openjdk/7091528-javadoc_class_files.patch \
- patches/openjdk/7103725-ssl_beast_regression.patch \
patches/openjdk/6706974-krb5_test_infrastructure.patch \
patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \
patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \
@@ -643,6 +630,7 @@
autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
+ tapset/jstack.stp.in \
scripts/jni_create_stap.c \
scripts/jni_desc \
rewriter/agpl-3.0.txt \
@@ -981,6 +969,14 @@
fi
endif
endif
+if ENABLE_CACAO
+ mkdir -p openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)
+ cp jvm.cacao.cfg openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)/jvm.cfg
+endif
+if ENABLE_JAMVM
+ mkdir -p openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)
+ cp jvm.jamvm.cfg openjdk/jdk/src/solaris/bin/$(JRE_ARCH_DIR)/jvm.cfg
+endif
mkdir -p stamps
touch stamps/extract-openjdk.stamp
@@ -2149,7 +2145,7 @@
mkdir -p stamps
touch $@
-clean-jtreg:
+clean-jtreg: clean-jtreg-reports
rm -rf test/jtreg/classes
if [ -e test/jtreg ] ; then \
rmdir test/jtreg ; \
diff -r b8d810f20366 -r b3f35e8bcccd NEWS
--- a/NEWS Fri Mar 02 16:08:50 2012 +0100
+++ b/NEWS Wed Mar 21 12:15:10 2012 +0000
@@ -14,6 +14,7 @@
* Bug fixes
- PR865: Patching fails with patches/ecj/jaxws-getdtdtype.patch
+ - PR886: 6-1.11.1 fails to build CACAO on ppc
* Backports
- S6706974: Add krb5 test infrastructure
- S6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
diff -r b8d810f20366 -r b3f35e8bcccd acinclude.m4
--- a/acinclude.m4 Fri Mar 02 16:08:50 2012 +0100
+++ b/acinclude.m4 Wed Mar 21 12:15:10 2012 +0000
@@ -129,49 +129,46 @@
AC_SUBST(OS_PATH)
])
-AC_DEFUN([IT_FIND_JAVAC],
+AC_DEFUN_ONCE([IT_FIND_COMPILER],
[
- JAVAC=${SYSTEM_JDK_DIR}/bin/javac
IT_FIND_JAVAC
IT_FIND_ECJ
- AC_SUBST(JAVAC)
-])
-
-AC_DEFUN([IT_FIND_ECJ],
-[
- AC_ARG_WITH([ecj],
- [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
- [
- if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
- IT_CHECK_ECJ(${withval})
- else
- if test "x${withval}" != xno; then
- IT_CHECK_ECJ
- fi
- fi
- ],
- [
- IT_CHECK_ECJ
- ])
if test "x${JAVAC}" = "x"; then
if test "x{ECJ}" != "x"; then
JAVAC="${ECJ} -nowarn"
fi
fi
+ AC_SUBST(ECJ)
+ AC_SUBST(JAVAC)
])
-AC_DEFUN([IT_CHECK_ECJ],
+AC_DEFUN_ONCE([IT_FIND_ECJ],
[
- if test "x$1" != x; then
- if test -f "$1"; then
- AC_MSG_CHECKING(for ecj)
- ECJ="$1"
- AC_MSG_RESULT(${ECJ})
+ ECJ_DEFAULT=/usr/bin/ecj
+ AC_MSG_CHECKING([if an ecj binary was specified])
+ AC_ARG_WITH([ecj],
+ [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
+ [
+ if test "x${withval}" = "xyes"; then
+ ECJ=no
else
- AC_PATH_PROG(ECJ, "$1")
+ ECJ="${withval}"
fi
+ ],
+ [
+ ECJ=no
+ ])
+ AC_MSG_RESULT(${ECJ})
+ if test "x${ECJ}" = "xno"; then
+ ECJ=${ECJ_DEFAULT}
+ fi
+ AC_MSG_CHECKING([if $ECJ is a valid executable file])
+ if test -x "${ECJ}" && test -f "${ECJ}"; then
+ AC_MSG_RESULT([yes])
else
+ AC_MSG_RESULT([no])
+ ECJ=""
AC_PATH_PROG(ECJ, "ecj")
if test -z "${ECJ}"; then
AC_PATH_PROG(ECJ, "ecj-3.1")
@@ -182,43 +179,45 @@
if test -z "${ECJ}"; then
AC_PATH_PROG(ECJ, "ecj-3.3")
fi
+ if test -z "${ECJ}"; then
+ AC_PATH_PROG(ECJ, "ecj-3.4")
+ fi
fi
])
-AC_DEFUN([IT_FIND_JAVAC],
+AC_DEFUN_ONCE([IT_FIND_JAVAC],
[
+ JAVAC_DEFAULT=${SYSTEM_JDK_DIR}/bin/javac
+ AC_MSG_CHECKING([if a javac binary was specified])
AC_ARG_WITH([javac],
[AS_HELP_STRING(--with-javac,bytecode compilation with javac)],
[
- if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
- IT_CHECK_JAVAC(${withval})
+ if test "x${withval}" = "xyes"; then
+ JAVAC=no
else
- if test "x${withval}" != xno; then
- IT_CHECK_JAVAC
- fi
+ JAVAC="${withval}"
fi
],
- [
- IT_CHECK_JAVAC
+ [
+ JAVAC=no
+ ])
+ AC_MSG_RESULT(${JAVAC})
+ if test "x${JAVAC}" = "xno"; then
+ JAVAC=${JAVAC_DEFAULT}
+ fi
+ AC_MSG_CHECKING([if $JAVAC is a valid executable file])
+ if test -x "${JAVAC}" && test -f "${JAVAC}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ JAVAC=""
+ AC_PATH_PROG(JAVAC, "javac")
+ fi
+ AC_SUBST(JAVAC)
])
])
-AC_DEFUN([IT_CHECK_JAVAC],
-[
- if test "x$1" != x; then
- if test -f "$1"; then
- AC_MSG_CHECKING(for javac)
- JAVAC="$1"
- AC_MSG_RESULT(${JAVAC})
- else
- AC_PATH_PROG(JAVAC, "$1")
- fi
- else
- AC_PATH_PROG(JAVAC, "javac")
- fi
-])
-
-AC_DEFUN([IT_FIND_JAVA],
+AC_DEFUN_ONCE([IT_FIND_JAVA],
[
JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
AC_MSG_CHECKING([if a java binary was specified])
@@ -825,6 +824,7 @@
AC_MSG_RESULT(${ENABLE_JAMVM})
AM_CONDITIONAL(ENABLE_JAMVM, test x"${ENABLE_JAMVM}" = "xyes")
AC_SUBST(ENABLE_JAMVM)
+ AC_CONFIG_FILES([jvm.jamvm.cfg])
])
AC_DEFUN([IT_WITH_JAMVM_SRC_ZIP],
@@ -863,6 +863,7 @@
AC_MSG_RESULT(${ENABLE_CACAO})
AM_CONDITIONAL(ENABLE_CACAO, test x"${ENABLE_CACAO}" = "xyes")
AC_SUBST(ENABLE_CACAO)
+ AC_CONFIG_FILES([jvm.cacao.cfg])
])
AC_DEFUN([IT_WITH_CACAO_HOME],
@@ -1140,9 +1141,9 @@
if test "x${enable_bootstrap}" = "xyes"; then
BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao";
fi
- for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-openjdk \
+ for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-1.6.0 \
/usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \
- /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do
+ /usr/lib/jvm/java-1.6.0-openjdk /usr/lib/jvm/icedtea-6 ; do
if test -d $dir; then
SYSTEM_JDK_DIR=$dir
break
@@ -1239,6 +1240,44 @@
fi
])
+dnl check that javac and java work
+AC_DEFUN_ONCE([IT_CHECK_JAVA_AND_JAVAC_WORK],[
+ AC_REQUIRE([IT_FIND_JAVA])
+ AC_REQUIRE([IT_FIND_COMPILER])
+ AC_CACHE_CHECK([if the VM and compiler work together], it_cv_jdk_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
+ if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_jdk_works=yes;
+ else
+ it_cv_jdk_works=no;
+ AC_MSG_ERROR([VM failed to run compiled class.])
+ fi
+ else
+ it_cv_jdk_works=no;
+ AC_MSG_ERROR([Compiler failed to compile Java code.])
+ fi
+ rm -f $CLASS *.class
+ cd ..
+ rmdir tmp.$$
+ ])
+AC_PROVIDE([$0])dnl
+])
+
dnl Generic macro to check for a Java class
dnl Takes two arguments: the name of the macro
dnl and the name of the class. The macro name
@@ -1246,6 +1285,7 @@
dnl replaced by '_' and all letters capitalised.
dnl e.g. IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER],[java.util.Scanner])
AC_DEFUN([IT_CHECK_FOR_CLASS],[
+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
AC_CACHE_CHECK([if $2 is missing], it_cv_$1, [
CLASS=Test.java
BYTECODE=$(echo $CLASS|sed 's#\.java##')
@@ -1289,6 +1329,7 @@
dnl e.g. IT_CHECK_FOR_INSTANTIABLE_CLASS([JAVA_LANG_INTEGER],
dnl [java.lang.Integer],[0],[./bin])
AC_DEFUN([IT_CHECK_IF_INSTANTIABLE],[
+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
AC_CACHE_CHECK([if $2 is instantiable], it_cv_$1, [
CLASS=Test.java
BYTECODE=$(echo $CLASS|sed 's#\.java##')
@@ -1348,7 +1389,8 @@
AC_PROVIDE([$0])dnl
])
More information about the distro-pkg-dev
mailing list