/hg/icedtea7: 4 new changesets
mark at icedtea.classpath.org
mark at icedtea.classpath.org
Mon Mar 26 13:45:54 PDT 2012
changeset 666844f8bdb4 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=666844f8bdb4
author: Jon VanAlten <jon.vanalten at redhat.com>
date: Fri Mar 23 14:11:00 2012 +0100
Add tapset tests.
* Makefile.am:
Add target to run tapset tests.
* tapset/hotspot_jni.stp.in:
Add notes regarding required JVM option to Get<PrimitiveType>Field
family of probe aliases.
* test/tapset/ClassUnloadedProbeTester.java:
Part of test coverage for hotspot.stp and hotspot_jni.stp tapsets.
* test/tapset/JNIStapTest.c:
Likewise.
* test/tapset/JNITestClass.c:
Likewise.
* test/tapset/JNITestClass.h:
Likewise.
* test/tapset/JNITestClass.java:
Likewise.
* test/tapset/RunWrapper.java:
Likewise.
* test/tapset/StapJNIClassLoader.java:
Likewise.
* test/tapset/StapURLClassLoader.java:
Likewise.
* test/tapset/SystemtapTester.java:
Likewise.
* test/tapset/TestingRunner.java:
Likewise.
* test/tapset/jstaptest.pl:
Wrapper script, compiles and runs tests for tapsets.
changeset f67b9f19ee57 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=f67b9f19ee57
author: Mark Wielaard <mark at klomp.org>
date: Fri Mar 23 22:39:35 2012 +0100
Add jstack tests to test/tapset/jstaptest.pl.
changeset a5c9abaa3f1a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a5c9abaa3f1a
author: Mark Wielaard <mark at klomp.org>
date: Mon Mar 26 19:33:38 2012 +0200
Merge 7u4 update and tapset tests.
No merge conflicts.
Two probes fail:
Probe hotspot.thread_start failed.
Probe hotspot.thread_stop failed.
changeset 81ebf494d83d in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=81ebf494d83d
author: Mark Wielaard <mark at klomp.org>
date: Mon Mar 26 22:07:22 2012 +0200
jstaptest.pl: thread_start and stop thread id can be any positive number.
tid was hard coded as being '8', but newer hotspot might start more
than 7 background threads before the first user thread is started.
So allow tid to be any positive number.
diffstat:
ChangeLog | 80 +
Makefile.am | 60 +-
patches/boot/ant-javac.patch | 10 +-
patches/boot/corba-defs.patch | 14 +-
patches/boot/demos.patch | 18 +-
patches/boot/ecj-diamond.patch | 1773 ++++++++++++--------
patches/boot/ecj-multicatch.patch | 45 +
patches/boot/ecj-trywithresources.patch | 154 +-
patches/boot/hotspot-jdk-dependency.patch | 20 +-
patches/boot/pr39408.patch | 12 +-
patches/cacao/launcher.patch | 20 +-
patches/rhino.patch | 72 +-
patches/systemtap-alloc-size-workaround.patch | 11 -
patches/systemtap.patch | 93 +-
tapset/hotspot_jni.stp.in | 20 +-
test/tapset/ClassUnloadedProbeTester.java | 38 +
test/tapset/JNIStapTest.c | 2107 +++++++++++++++++++++++++
test/tapset/JNITestClass.c | 7 +
test/tapset/JNITestClass.h | 21 +
test/tapset/JNITestClass.java | 121 +
test/tapset/RunWrapper.java | 21 +
test/tapset/StapJNIClassLoader.java | 64 +
test/tapset/StapURLClassLoader.java | 24 +
test/tapset/SystemtapTester.java | 202 ++
test/tapset/TestingRunner.java | 82 +
test/tapset/jstaptest.pl | 1009 +++++++++++
26 files changed, 5166 insertions(+), 932 deletions(-)
diffs (truncated from 8651 to 500 lines):
diff -r 732f30ec8b7b -r 81ebf494d83d ChangeLog
--- a/ChangeLog Fri Mar 16 13:15:15 2012 +0100
+++ b/ChangeLog Mon Mar 26 22:07:22 2012 +0200
@@ -1,3 +1,83 @@
+2012-03-26 Mark Wielaard <mjw at redhat.com>
+
+ * test/tapset/jstaptest.pl: thread_start and thread_stop thread id
+ can be any positive number.
+
+2012-03-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/boot/pr39408.patch,
+ * patches/cacao/launcher.patch:
+ Regenerated.
+
+2012-03-22 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/systemtap-alloc-size-workaround.patch:
+ Removed; upstream.
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to 4.
+ (CORBA_CHANGESET): Update to IcedTea7 forest head.
+ (HOTSPOT_CHANGESET): Likewise.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Drop upstreamed patch.
+ * patches/boot/ant-javac.patch,
+ * patches/boot/corba-defs.patch,
+ * patches/boot/demos.patch:
+ Regenerated.
+ * patches/boot/ecj-diamond.patch,
+ * patches/boot/ecj-multicatch.patch,
+ * patches/boot/ecj-trywithresources.patch:
+ Regenerated; additional cases added.
+ * patches/boot/hotspot-jdk-dependency.patch,
+ * patches/rhino.patch:
+ Regenerated.
+ * patches/systemtap.patch:
+ Rewritten.
+
+2012-03-23 Mark Wielaard <mjw at redhat.com>
+
+ * test/tapset/jstaptest.pl: Add jstack tests.
+
+2012-03-23 Jon VanAlten <jon.vanalten at redhat.com>
+
+ * Makefile.am:
+ Add target to run tapset tests.
+ * tapset/hotspot_jni.stp.in:
+ Add notes regarding required JVM option to Get<PrimitiveType>Field
+ family of probe aliases.
+ * test/tapset/ClassUnloadedProbeTester.java:
+ Part of test coverage for hotspot.stp and hotspot_jni.stp tapsets.
+ * test/tapset/JNIStapTest.c:
+ Likewise.
+ * test/tapset/JNITestClass.c:
+ Likewise.
+ * test/tapset/JNITestClass.h:
+ Likewise.
+ * test/tapset/JNITestClass.java:
+ Likewise.
+ * test/tapset/RunWrapper.java:
+ Likewise.
+ * test/tapset/StapJNIClassLoader.java:
+ Likewise.
+ * test/tapset/StapURLClassLoader.java:
+ Likewise.
+ * test/tapset/SystemtapTester.java:
+ Likewise.
+ * test/tapset/TestingRunner.java:
+ Likewise.
+ * test/tapset/jstaptest.pl:
+ Wrapper script, compiles and runs tests for tapsets.
+
2012-03-16 Mark Wielaard <mjw at redhat.com>
* tapset/jstack.stp.in: Change symbolOopDesc to Symbol to accomodate
diff -r 732f30ec8b7b -r 81ebf494d83d Makefile.am
--- a/Makefile.am Fri Mar 16 13:15:15 2012 +0100
+++ b/Makefile.am Mon Mar 26 22:07:22 2012 +0200
@@ -1,24 +1,24 @@
# Dependencies
OPENJDK_VERSION = b147
-JDK_UPDATE_VERSION = 02
+JDK_UPDATE_VERSION = 04
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 78cd4b4fcb75
-HOTSPOT_CHANGESET = 433e4570d57c
-JAXP_CHANGESET = 7300d2ab9fb2
-JAXWS_CHANGESET = d26ff33070cb
-JDK_CHANGESET = afdcedc27c23
-LANGTOOLS_CHANGESET = 58f6a950cd72
-OPENJDK_CHANGESET = a66b58021165
+CORBA_CHANGESET = c628aeb3d72f
+HOTSPOT_CHANGESET = b1dfb460ee5c
+JAXP_CHANGESET = 9b7a2f21b8a8
+JAXWS_CHANGESET = 9ae185bd7ff2
+JDK_CHANGESET = 3377516da583
+LANGTOOLS_CHANGESET = 54b1383d794c
+OPENJDK_CHANGESET = 3a0fd3cc84a0
-CORBA_SHA256SUM = c25abc052d0e3041c558869ba88f80bf3ff051efbcd20e6c22b862fdd4c066d4
-HOTSPOT_SHA256SUM = 51f4d29c9bfa7bc08a0e70be33b71e2af4f114b78d0a99a4e9c6f6a9977d0568
-JAXP_SHA256SUM = 0774d2acaa47052b8f529edae1ca868721a0164a956455958a6ea51550fa01e0
-JAXWS_SHA256SUM = 5f0a98280219fa8fe2926cfd4471fb0e98391b38a3c4b29743ad361832cea0e2
-JDK_SHA256SUM = 35ad431d5d80e9b77bdbadc5218500e8ea377c3c731ddab0db7179bc5860075f
-LANGTOOLS_SHA256SUM = 3e66400ba51c5de4bf79be50dff41f47134ba2fcdbea845fb1ed0f492cfb0efb
-OPENJDK_SHA256SUM = 714a000514e273bae755f4cc90df839a298583b38bb93518d6cf805dede99b6d
+CORBA_SHA256SUM = b176cf1fd8a461413ab822236753cf455210e97c11a8d4224929582607c212b4
+HOTSPOT_SHA256SUM = 43d83d5209a9f748e6650c792ca8ef8d9a90d6e3c53e461993c6bffb8c37e972
+JAXP_SHA256SUM = 4d38e8a0fc0fcbe3ba8a56f9fc0960ecbf15cd4cef44b76fdc82418c008a33c3
+JAXWS_SHA256SUM = 60c6c62c851eafc15ff33e58aa625e6f58fd31f15328b121602a07891fc1d272
+JDK_SHA256SUM = 5707d697c2dfc44fbf91ec90721055b5a23ea4c77f0cb53abf00a0f53fa0845e
+LANGTOOLS_SHA256SUM = 97821e49028d8d726fac9563c361c682146e037074179cbd68ed5cb80e82f9fa
+OPENJDK_SHA256SUM = abe0c3b348c35f79117ef726bb2580b279024b1f73b6487fda4a1e717c738f9f
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
@@ -267,8 +267,7 @@
endif
if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/systemtap.patch \
- patches/systemtap-alloc-size-workaround.patch
+ICEDTEA_PATCHES += patches/systemtap.patch
endif
if ENABLE_NSS
@@ -725,9 +724,16 @@
all-local: icedtea-stage2
-check-local: jtregcheck
+check-local: jtregcheck check-tapset
-clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
+clean-tests: clean-jtreg clean-tapset-report
+ if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
+ if [ -e test ] ; then \
+ rmdir test ; \
+ fi \
+ fi
+
+clean-local: clean-tests clean-jtreg-reports clean-pulse-java \
clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
@@ -762,7 +768,8 @@
clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \
jtregcheck clean-remove-intree-libraries \
clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
- clean-extract-hotspot clean-sanitise-openjdk
+ clean-extract-hotspot clean-sanitise-openjdk \
+ clean-tests clean-tapset-report
env:
@echo 'unset JAVA_HOME'
@@ -2266,6 +2273,19 @@
$(jtreg_processes); \
fi
+check-tapset:
+if ENABLE_SYSTEMTAP
+ $(abs_top_srcdir)/test/tapset/jstaptest.pl \
+ -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
+ -S $(abs_top_srcdir)/test/tapset \
+ -o test/check-stap.log
+endif
+
+clean-tapset-report:
+if ENABLE_SYSTEMTAP
+ rm -f test/check-stap.log
+endif
+
# Support classes for non-OpenJDK bootstraps
rt-source-files.txt: $(OPENJDK_BOOT_TREE)
diff -r 732f30ec8b7b -r 81ebf494d83d patches/boot/ant-javac.patch
--- a/patches/boot/ant-javac.patch Fri Mar 16 13:15:15 2012 +0100
+++ b/patches/boot/ant-javac.patch Mon Mar 26 22:07:22 2012 +0200
@@ -1,7 +1,7 @@
diff -Nru openjdk-boot.orig/jaxp/build.xml openjdk-boot/jaxp/build.xml
---- openjdk-boot.orig/jaxp/build.xml 2009-12-04 15:29:13.000000000 +0000
-+++ openjdk-boot/jaxp/build.xml 2009-12-14 22:57:23.000000000 +0000
-@@ -122,7 +122,8 @@
+--- openjdk-boot.orig/jaxp/build.xml 2012-02-21 23:55:29.000000000 +0000
++++ openjdk-boot/jaxp/build.xml 2012-03-18 22:26:49.382089457 +0000
+@@ -123,7 +123,8 @@
memoryMaximumSize="${javac.memoryMaximumSize}"
source="${javac.source}"
debug="${javac.debug}"
@@ -10,11 +10,11 @@
+ executable="${jdk.home}/bin/javac">
<compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
<compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
- <src refid="src.dir.id"/>
+ </javac>
diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
---- openjdk-boot.orig/jaxws/build.xml 2009-12-04 15:35:01.000000000 +0000
-+++ openjdk-boot/jaxws/build.xml 2009-12-14 22:57:41.000000000 +0000
-@@ -122,7 +122,8 @@
+--- openjdk-boot.orig/jaxws/build.xml 2012-02-15 17:08:44.000000000 +0000
++++ openjdk-boot/jaxws/build.xml 2012-03-18 22:26:49.382089457 +0000
+@@ -123,7 +123,8 @@
memoryMaximumSize="${javac.memoryMaximumSize}"
source="${javac.source}"
debug="${javac.debug}"
diff -r 732f30ec8b7b -r 81ebf494d83d patches/boot/corba-defs.patch
--- a/patches/boot/corba-defs.patch Fri Mar 16 13:15:15 2012 +0100
+++ b/patches/boot/corba-defs.patch Mon Mar 26 22:07:22 2012 +0200
@@ -1,9 +1,9 @@
-diff -Nru openjdk.orig/corba/make/common/Defs.gmk openjdk/corba/make/common/Defs.gmk
---- openjdk-boot.orig/corba/make/common/Defs.gmk 2010-11-12 01:18:17.000000000 +0000
-+++ openjdk-boot/corba/make/common/Defs.gmk 2010-11-19 22:40:28.154937216 +0000
-@@ -53,6 +53,13 @@
-
- _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
+diff -Nru openjdk-boot.orig/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
+--- openjdk-boot.orig/corba/make/common/Defs.gmk 2012-02-15 17:08:19.000000000 +0000
++++ openjdk-boot/corba/make/common/Defs.gmk 2012-03-18 22:37:54.536815001 +0000
+@@ -75,6 +75,13 @@
+ endif
+ endif
+
+ifdef ALT_LANGTOOLS_DIST
@@ -15,7 +15,7 @@
#
# Get platform definitions
#
-@@ -85,8 +92,6 @@
+@@ -107,8 +114,6 @@
# for build tool jar files
BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars
ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
@@ -24,7 +24,7 @@
# for imported source files
IMPORTSRCDIR = $(OUTPUTDIR)/impsrc
# for imported documents
-@@ -167,7 +172,7 @@
+@@ -189,7 +194,7 @@
# We define an intermediate variable for Java files because
# we use its value later to help define $SOURCEPATH
diff -r 732f30ec8b7b -r 81ebf494d83d patches/boot/demos.patch
--- a/patches/boot/demos.patch Fri Mar 16 13:15:15 2012 +0100
+++ b/patches/boot/demos.patch Mon Mar 26 22:07:22 2012 +0200
@@ -1,8 +1,8 @@
-diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
---- openjdk-boot.orig/jdk/make/common/Release.gmk 2011-03-16 20:59:31.000000000 +0000
-+++ openjdk-boot/jdk/make/common/Release.gmk 2011-03-16 21:29:40.269191529 +0000
-@@ -1071,16 +1071,6 @@
- $(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher
+diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
+--- openjdk-boot.orig/jdk/make/common/Release.gmk 2012-03-18 22:39:44.298585468 +0000
++++ openjdk-boot/jdk/make/common/Release.gmk 2012-03-19 00:50:02.224588936 +0000
+@@ -1104,16 +1104,6 @@
+ $(CP) $(FILES_launcher) $(JDK_IMAGE_DIR)/src/launcher
$(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
$(RM) -r $(JDK_IMAGE_DIR)/src
- @#
@@ -18,12 +18,12 @@
ifneq ($(PLATFORM), windows)
$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
endif # !windows
-diff -Nru openjdk.orig/jdk/make/Makefile openjdk/jdk/make/Makefile
---- openjdk-boot.orig/jdk/make/Makefile 2011-03-14 22:10:30.000000000 +0000
-+++ openjdk-boot/jdk/make/Makefile 2011-03-16 21:29:40.269191529 +0000
-@@ -238,7 +238,7 @@
-
- SUBDIRS = tools java javax sun com
+diff -Nru openjdk-boot.orig/jdk/make/Makefile openjdk-boot/jdk/make/Makefile
+--- openjdk-boot.orig/jdk/make/Makefile 2012-03-12 17:25:51.000000000 +0000
++++ openjdk-boot/jdk/make/Makefile 2012-03-19 00:50:02.224588936 +0000
+@@ -237,7 +237,7 @@
+ SUBDIRS += apple
+ endif
SUBDIRS_tools = launchers
-SUBDIRS_misc = org sunw jpda mkdemo mksample
+SUBDIRS_misc = org sunw jpda mksample
diff -r 732f30ec8b7b -r 81ebf494d83d patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Fri Mar 16 13:15:15 2012 +0100
+++ b/patches/boot/ecj-diamond.patch Mon Mar 26 22:07:22 2012 +0200
@@ -1,5 +1,6 @@
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-03-21 17:09:55.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2012-03-22 11:28:14.027881166 +0000
@@ -103,9 +103,9 @@
return this.def.compareTo(that.def);
}
@@ -70,8 +71,9 @@
// Parse several independent layout bodies: "[foo][bar]...[baz]"
for (int i = 0; i < layout.length(); i++) {
if (layout.charAt(i++) != '[')
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-03-22 11:18:05.190037791 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2012-03-22 11:28:14.047881492 +0000
@@ -257,7 +257,7 @@
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
@@ -139,8 +141,9 @@
prevForAssertMap.put(b, p);
return true;
}
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-03-22 11:18:05.066035805 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2012-03-22 11:28:14.047881492 +0000
@@ -466,7 +466,7 @@
void readInnerClasses(Class cls) throws IOException {
@@ -150,19 +153,9 @@
for (int i = 0; i < nc; i++) {
InnerClass ic =
new InnerClass(readClassRef(),
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
-@@ -402,7 +402,7 @@
- private static Map<Coding, Coding> codeMap;
-
- private static synchronized Coding of(int B, int H, int S, int del) {
-- if (codeMap == null) codeMap = new HashMap<>();
-+ if (codeMap == null) codeMap = new HashMap<Coding, Coding>();
- Coding x0 = new Coding(B, H, S, del);
- Coding x1 = codeMap.get(x0);
- if (x1 == null) codeMap.put(x0, x1 = x0);
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-03-21 17:09:55.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2012-03-22 11:28:14.047881492 +0000
@@ -743,9 +743,9 @@
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
@@ -198,8 +191,21 @@
for (int i = start; i < end; i++) {
if (popset.add(values[i])) popvals.add(values[i]);
}
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-03-21 17:09:55.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2012-03-22 11:28:14.047881492 +0000
+@@ -402,7 +402,7 @@
+ private static Map<Coding, Coding> codeMap;
+
+ private static synchronized Coding of(int B, int H, int S, int del) {
+- if (codeMap == null) codeMap = new HashMap<>();
++ if (codeMap == null) codeMap = new HashMap<Coding, Coding>();
+ Coding x0 = new Coding(B, H, S, del);
+ Coding x1 = codeMap.get(x0);
+ if (x1 == null) codeMap.put(x0, x1 = x0);
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-03-21 17:09:55.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2012-03-22 11:28:14.047881492 +0000
@@ -915,7 +915,7 @@
public static
Index[] partition(Index ix, int[] keys) {
@@ -227,8 +233,9 @@
work.hasPrevious(); ) {
Entry e = work.previous();
work.remove(); // pop stack
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-03-22 11:18:05.190037791 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2012-03-22 11:28:14.047881492 +0000
@@ -59,7 +59,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
@@ -265,8 +272,9 @@
loadOptmap:
for (String optline : options.split("\n")) {
String[] words = optline.split("\\p{Space}+");
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-03-21 17:09:55.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2012-03-22 11:28:14.047881492 +0000
@@ -45,7 +45,7 @@
private final ArrayList<E> flist;
@@ -276,8 +284,9 @@
// initialize the list to null
for (int i = 0 ; i < capacity ; i++) {
flist.add(null);
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-03-21 17:09:55.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java 2012-03-22 11:28:14.051881557 +0000
@@ -126,11 +126,11 @@
public void setBytes(byte[] newBytes) {
if (bytes == newBytes) return;
@@ -301,8 +310,9 @@
}
static final int LOC_SHIFT = 1;
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-03-22 11:18:05.070035870 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2012-03-22 11:28:14.051881557 +0000
@@ -112,7 +112,7 @@
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -466,8 +476,9 @@
for (Class cls : classes) {
// Add to the end of ths list:
if (!fileSet.contains(cls.file))
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-03-22 11:18:05.194037856 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2012-03-22 11:28:14.051881557 +0000
@@ -686,7 +686,7 @@
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
@@ -580,8 +591,9 @@
ClassEntry thisClass = curClass.thisClass;
ClassEntry superClass = curClass.superClass;
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-03-22 11:18:05.194037856 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2012-03-22 11:28:14.051881557 +0000
@@ -116,7 +116,7 @@
int[][] attrCounts; // count attr. occurences
@@ -636,8 +648,9 @@
// First, collect a consistent global set.
for (Class cls : pkg.classes) {
if (!cls.hasInnerClasses()) continue;
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-03-21 17:09:55.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2012-03-22 11:28:14.051881557 +0000
@@ -181,8 +181,8 @@
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
@@ -667,8 +680,9 @@
try {
for (JarEntry je : Collections.list(jf.entries())) {
InFile inFile = new InFile(jf, je);
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-03-21 17:09:55.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2012-03-22 11:28:14.051881557 +0000
@@ -309,7 +309,7 @@
// As each new value is added, we assert that the value
// was not already in the set.
@@ -678,8 +692,9 @@
int fillp = 1;
maxForDebug += fillp;
int min = Integer.MIN_VALUE; // farthest from the center
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-03-22 11:18:05.194037856 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2012-03-22 11:28:14.051881557 +0000
@@ -47,8 +47,8 @@
*/
@@ -700,8 +715,9 @@
res.addAll(values);
while (res.remove(null));
return res;
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java.orig
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-03-21 17:09:55.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2012-03-22 11:28:14.051881557 +0000
@@ -58,12 +58,12 @@
private final Map<String, MemberEntry> memberEntries;
@@ -721,8 +737,9 @@
props = new PropMap();
}
---- openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java.orig
More information about the distro-pkg-dev
mailing list