/hg/icedtea: Bump to b130. Add script to remove in-tree libraries.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Apr 18 08:29:48 PDT 2011
changeset fef8fe66fdf5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fef8fe66fdf5
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Apr 18 16:29:18 2011 +0100
Bump to b130. Add script to remove in-tree libraries.
2011-04-18 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-freetypeversion.patch: Moved
upstream.
* patches/icedtea-jdk-use-ssize_t.patch: No longer applicable
(patched file was part of HPI which is now gone).
* .hgignore: Don't hide scripts.
* Makefile.am: (OPENJDK_VERSION): Bump to b130.
(CORBA_CHANGESET): Updated. (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. (JAXWS_DROP_ZIP): Likewise.
(JAXWS_DROP_SHA256SUM): Likewise. (JAXP_DROP_ZIP): Likewise.
(JAXP_DROP_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Drop
above patches. (ICEDTEA_BOOT_PATCHES): Add multicatch
and trywithresources patches. (.PHONY): Add clean-remove-
intree-libraries. (extract): Depend on remove-intree-
libraries. (clean-extract-openjdk): Depend on clean-remove-
intree-libraries. (remove-intree-libraries): Run a script to
remove intree copies of libjpeg, zlib, libpng and giflib.
(clean-remove-intree-libraries): Remove the stamp.
(versioning): Don't alter the original file as it may be
hardlinked to an OpenJDK source tree. Move the original and
create a new file.
* patches/boot/ecj-diamond.patch: Extended with new cases.
* patches/boot/ecj-multicatch.patch: Remove instances of
multicatch (Project Coin feature).
* patches/boot/ecj-stringswitch.patch: Extended with new cases.
* patches/boot/ecj-trywithresources.patch: Remove instances of
try-with-resources (Project Coin feature).
* patches/boot/fontconfig.patch: Regenerated.
* patches/boot/revert-6973616.patch: Likewise.
* patches/boot/xbootclasspath.patch: Likewise.
* patches/hotspot/default/icedtea-text-relocations.patch: Likewise.
* patches/icedtea-libraries.patch: Drop removal of libjpeg
files from patch. Now achieved using remove-intree-
libraries script.
* patches/systemtap-alloc-size-workaround.patch: Regenerated.
* remove-intree-libraries.sh: New script to remove intree
libraries.
diffstat:
.hgignore | 2 +-
ChangeLog | 58 +
Makefile.am | 61 +-
patches/boot/ecj-diamond.patch | 4651 ++-
patches/boot/ecj-multicatch.patch | 67 +
patches/boot/ecj-stringswitch.patch | 177 +-
patches/boot/ecj-trywithresources.patch | 201 +
patches/boot/fontconfig.patch | 6 +-
patches/boot/revert-6973616.patch | 8 +-
patches/boot/xbootclasspath.patch | 18 +-
patches/hotspot/default/icedtea-text-relocations.patch | 18 +-
patches/icedtea-freetypeversion.patch | 11 -
patches/icedtea-jdk-use-ssize_t.patch | 32 -
patches/icedtea-libraries.patch | 24217 ---------------
patches/systemtap-alloc-size-workaround.patch | 13 +-
remove-intree-libraries.sh | 60 +
16 files changed, 5152 insertions(+), 24448 deletions(-)
diffs (truncated from 30376 to 500 lines):
diff -r 7f137bd40e46 -r fef8fe66fdf5 .hgignore
--- a/.hgignore Wed Mar 30 01:27:14 2011 +0100
+++ b/.hgignore Mon Apr 18 16:29:18 2011 +0100
@@ -10,4 +10,4 @@
config.status
install-sh
Makefile.in
-*.sh
+
diff -r 7f137bd40e46 -r fef8fe66fdf5 ChangeLog
--- a/ChangeLog Wed Mar 30 01:27:14 2011 +0100
+++ b/ChangeLog Mon Apr 18 16:29:18 2011 +0100
@@ -1,3 +1,61 @@
+2011-04-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-freetypeversion.patch:
+ Moved upstream.
+ * patches/icedtea-jdk-use-ssize_t.patch:
+ No longer applicable (patched file was
+ part of HPI which is now gone).
+ * .hgignore: Don't hide scripts.
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to b130.
+ (CORBA_CHANGESET): Updated.
+ (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.
+ (JAXWS_DROP_ZIP): Likewise.
+ (JAXWS_DROP_SHA256SUM): Likewise.
+ (JAXP_DROP_ZIP): Likewise.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Drop above patches.
+ (ICEDTEA_BOOT_PATCHES): Add multicatch
+ and trywithresources patches.
+ (.PHONY): Add clean-remove-intree-libraries.
+ (extract): Depend on remove-intree-libraries.
+ (clean-extract-openjdk): Depend on clean-remove-intree-libraries.
+ (remove-intree-libraries): Run a script to remove
+ intree copies of libjpeg, zlib, libpng and giflib.
+ (clean-remove-intree-libraries): Remove the stamp.
+ (versioning): Don't alter the original file as it may
+ be hardlinked to an OpenJDK source tree. Move the original
+ and create a new file.
+ * patches/boot/ecj-diamond.patch: Extended with new cases.
+ * patches/boot/ecj-multicatch.patch: Remove instances of
+ multicatch (Project Coin feature).
+ * patches/boot/ecj-stringswitch.patch: Extended with new cases.
+ * patches/boot/ecj-trywithresources.patch: Remove instances
+ of try-with-resources (Project Coin feature).
+ * patches/boot/fontconfig.patch: Regenerated.
+ * patches/boot/revert-6973616.patch: Likewise.
+ * patches/boot/xbootclasspath.patch: Likewise.
+ * patches/hotspot/default/icedtea-text-relocations.patch: Likewise.
+ * patches/icedtea-libraries.patch:
+ Drop removal of libjpeg files from patch. Now
+ achieved using remove-intree-libraries script.
+ * patches/systemtap-alloc-size-workaround.patch:
+ Regenerated.
+ * remove-intree-libraries.sh: New script to remove
+ intree libraries.
+
2011-03-29 Andrew John Hughes <ahughes at redhat.com>
PR616, PR99: Don't statically link libstdc++
diff -r 7f137bd40e46 -r fef8fe66fdf5 Makefile.am
--- a/Makefile.am Wed Mar 30 01:27:14 2011 +0100
+++ b/Makefile.am Mon Apr 18 16:29:18 2011 +0100
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b123
+OPENJDK_VERSION = b130
-CORBA_CHANGESET = eac2b25431d9
-HOTSPOT_CHANGESET = 011f8af78ea1
-JAXP_CHANGESET = 17aa584100e9
-JAXWS_CHANGESET = 98bca2ec154b
-JDK_CHANGESET = 3b8e4a1215bb
-LANGTOOLS_CHANGESET = a75f9777ae63
-OPENJDK_CHANGESET = 714f89350919
+CORBA_CHANGESET = 59f02c101698
+HOTSPOT_CHANGESET = bbfa41dad6d4
+JAXP_CHANGESET = b6f201c0649a
+JAXWS_CHANGESET = 4c04de31900b
+JDK_CHANGESET = d5404dcb1265
+LANGTOOLS_CHANGESET = 4659da7bff78
+OPENJDK_CHANGESET = d39d0c08731a
-CORBA_SHA256SUM = 106b6ff3765db0d608a7e5542a7b606fe10a2c1ebb155b866aef09f88ce481a7
-HOTSPOT_SHA256SUM = cb89a70159a7f124904ecaf17683a5709787e079f476faea4e11645e4676c44d
-JAXP_SHA256SUM = 009baa056f2b01e313470b71542b40baab511e179b63decca00b16081e6730bd
-JAXWS_SHA256SUM = 5990beb8e8f2144838d52f0948b088bf74ae3ddd748b996ddbb7e7ff1605389b
-JDK_SHA256SUM = 5ad0f1d0c4b4ae32675d530d5d786f5b81083fa6a51cb24a823a229f366241b7
-LANGTOOLS_SHA256SUM = c60849a838df72cb7b95562a97af75fa1e3e56fcc15678885a8e154463df8417
-OPENJDK_SHA256SUM = 66137d24a545e15f7be6925ebf92e456c4a42e7c862db2f6eb12cafb8cd4288b
+CORBA_SHA256SUM = 4c6db5299947c3ed11a7f72da55a3cd89197c143f10d77c75036aa2f2cf296a6
+HOTSPOT_SHA256SUM = bf4f93ae5782e4110ffc33fdc997c4c43f798eca9dff6db4784f8da51ff0f2c3
+JAXP_SHA256SUM = a1a5c6b2671f83d4675f9ba25013c6a16a4cf4d1040fcd2ff4143c92bd5496a3
+JAXWS_SHA256SUM = 8fe84a61142d579487bee98133fc26e57aedb97f781dc925ad3803aa40f5c061
+JDK_SHA256SUM = 78ff05e5128898830612dd117e7799f982663132d5fb518835cc5871a18d0427
+LANGTOOLS_SHA256SUM = 1df1bb1edd5f912405398c0024f8290f6a9030172dd1196c52e2c461769a1a07
+OPENJDK_SHA256SUM = 937930cb6c3174f8bdbf3d0034832fbde539fd62591087f1d6fcec695ed20519
CACAO_VERSION = e321b101a9ee
CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
@@ -25,14 +25,14 @@
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXWS_DROP_ZIP = jdk7-jaxws2_2-2010_08_19.zip
-JAXWS_DROP_SHA256SUM = b8877aafbb15a348babcaee4ee372fb3e2ea0282f8fe93d306272fd24d7847de
+JAXWS_DROP_ZIP = jdk7-jaxws2_2_2-2010_12_14.zip
+JAXWS_DROP_SHA256SUM = ef3115dde8ed9a7129e65aab8b1499e11621e343559e6e5a8df9c4542848fb9b
JAF_DROP_URL = http://icedtea.classpath.org/download/drops
JAF_DROP_ZIP = jdk7-jaf-2010_08_19.zip
JAF_DROP_SHA256SUM = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jaxp-1_4_4.zip
-JAXP_DROP_SHA256SUM = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
+JAXP_DROP_ZIP = jaxp-1_4_5-dev.zip
+JAXP_DROP_SHA256SUM = 938cce9d3f0afaa5d076c62a2de081862102d10bfe04a0767122f2dff5bd975e
ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
@@ -249,7 +249,6 @@
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
patches/debian/icedtea-uname.patch \
- patches/icedtea-freetypeversion.patch \
patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
@@ -257,7 +256,6 @@
patches/icedtea-hotspot-gcc-pr36917.patch \
patches/icedtea-alpha-fixes.patch \
patches/icedtea-alt-jar.patch \
- patches/icedtea-jdk-use-ssize_t.patch \
patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \
patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \
patches/icedtea-clean-crypto.patch \
@@ -362,7 +360,9 @@
patches/boot/corba-dependencies.patch \
patches/boot/jaxws-langtools-dependency.patch \
patches/boot/jaxws-jdk-dependency.patch \
- patches/boot/hotspot-jdk-dependency.patch
+ patches/boot/hotspot-jdk-dependency.patch \
+ patches/boot/ecj-multicatch.patch \
+ patches/boot/ecj-trywithresources.patch
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch
@@ -730,7 +730,7 @@
clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \
clean-icedtea icedtea-stage2 clean-icedtea-boot \
clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \
- clean-drops jtregcheck
+ clean-drops jtregcheck clean-remove-intree-libraries
env:
@echo 'unset JAVA_HOME'
@@ -1073,7 +1073,8 @@
rm -f stamps/download-cacao.stamp
stamps/extract.stamp: stamps/extract-openjdk.stamp \
- stamps/extract-cacao.stamp stamps/extract-jaxws.stamp
+ stamps/extract-cacao.stamp stamps/extract-jaxws.stamp \
+ stamps/remove-intree-libraries.stamp
mkdir -p stamps
touch $@
@@ -1191,7 +1192,7 @@
touch $@
clean-extract-openjdk: clean-overlay clean-versioning \
- clean-patch-fsg
+ clean-patch-fsg clean-remove-intree-libraries
rm -rf openjdk
rm -f stamps/extract-openjdk.stamp
@@ -1237,6 +1238,13 @@
mkdir -p stamps
rm -f stamps/extract-jaxws.stamp
+stamps/remove-intree-libraries.stamp: stamps/extract-openjdk.stamp
+ sh $(srcdir)/remove-intree-libraries.sh
+ touch stamps/remove-intree-librares.stamp
+
+clean-remove-intree-libraries:
+ rm -f stamps/remove-intree-libraries.stamp
+
stamps/generated.stamp: stamps/extract.stamp
set -e ; \
if [ ! -e $(abs_top_builddir)/generated.build ]; then \
@@ -1380,7 +1388,8 @@
fi
stamps/versioning.stamp: stamps/patch.stamp
- cp openjdk/jdk/make/common/shared/Defs.gmk Defs.gmk.bak
+ mv openjdk/jdk/make/common/shared/Defs.gmk Defs.gmk.bak
+ cat Defs.gmk.bak > openjdk/jdk/make/common/shared/Defs.gmk
icedtea_version="$(PACKAGE_VERSION)$(ICEDTEA_REV)" ; \
if ! test "x$(WITH_CACAO)" = "xno"; then \
echo "JDK_DERIVATIVE_NAME=$${icedtea_version}" \
diff -r 7f137bd40e46 -r fef8fe66fdf5 patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patch Wed Mar 30 01:27:14 2011 +0100
+++ b/patches/boot/ecj-diamond.patch Mon Apr 18 16:29:18 2011 +0100
@@ -1,14 +1,14 @@
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 2011-03-14 22:10:30.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-03-16 22:41:33.034195793 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-11 12:34:30.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-13 15:10:03.590190441 +0100
@@ -104,9 +104,9 @@
+ return this.def.compareTo(that.def);
}
- private static final byte[] noBytes = {};
- private static final Map<List<Attribute>, List<Attribute>> canonLists = new HashMap<>();
- private static final Map<Layout, Attribute> attributes = new HashMap<>();
- private static final Map<Layout, Attribute> standardDefs = new HashMap<>();
-+ private static final Map<List<Attribute>, List<Attribute>> canonLists = new HashMap<List<Attribute>,List<Attribute>>();
++ private static final Map<List<Attribute>, List<Attribute>> canonLists = new HashMap<List<Attribute>, List<Attribute>>();
+ private static final Map<Layout, Attribute> attributes = new HashMap<Layout, Attribute>();
+ private static final Map<Layout, Attribute> standardDefs = new HashMap<Layout, Attribute>();
@@ -44,46 +44,172 @@
attributes.remove(a);
return a;
}
-@@ -832,7 +832,7 @@
+@@ -838,7 +838,7 @@
*/
static //private
Layout.Element[] tokenizeLayout(Layout self, int curCble, String layout) {
-- ArrayList<Layout.Element> col = new ArrayList<>(layout.length());
-+ ArrayList<Layout.Element> col = new ArrayList<Layout.Element>(layout.length());
+- List<Layout.Element> col = new ArrayList<>(layout.length());
++ List<Layout.Element> col = new ArrayList<Layout.Element>(layout.length());
tokenizeLayout(self, curCble, layout, col);
Layout.Element[] res = new Layout.Element[col.size()];
col.toArray(res);
-@@ -897,7 +897,7 @@
+@@ -903,7 +903,7 @@
case 'T': // union: 'T' any_int union_case* '(' ')' '[' body ']'
kind = EK_UN;
i = tokenizeSInt(e, layout, i);
-- ArrayList<Layout.Element> cases = new ArrayList<>();
-+ ArrayList<Layout.Element> cases = new ArrayList<Layout.Element>();
+- List<Layout.Element> cases = new ArrayList<>();
++ List<Layout.Element> cases = new ArrayList<Layout.Element>();
for (;;) {
// Keep parsing cases until we hit the default case.
if (layout.charAt(i++) != '(')
-@@ -1051,7 +1051,7 @@
+@@ -1057,7 +1057,7 @@
}
static //private
String[] splitBodies(String layout) {
-- ArrayList<String> bodies = new ArrayList<>();
-+ ArrayList<String> bodies = new ArrayList<String>();
+- List<String> bodies = new ArrayList<>();
++ List<String> bodies = new ArrayList<String>();
// Parse several independent layout bodies: "[foo][bar]...[baz]"
for (int i = 0; i < layout.length(); i++) {
if (layout.charAt(i++) != '[')
+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 2011-04-12 00:18:33.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-04-13 15:10:03.606190699 +0100
+@@ -257,7 +257,7 @@
+ assert(basicCodings[_meta_default] == null);
+ assert(basicCodings[_meta_canon_min] != null);
+ assert(basicCodings[_meta_canon_max] != null);
+- Map<Coding, Integer> map = new HashMap<>();
++ Map<Coding, Integer> map = new HashMap<Coding, Integer>();
+ for (int i = 0; i < basicCodings.length; i++) {
+ Coding c = basicCodings[i];
+ if (c == null) continue;
+@@ -1050,8 +1050,8 @@
+
+ // Bootstrap support for CPRefBands. These are needed to record
+ // intended CP indexes, before the CP has been created.
+- private final List<CPRefBand> allKQBands = new ArrayList<>();
+- private List<Object[]> needPredefIndex = new ArrayList<>();
++ private final List<CPRefBand> allKQBands = new ArrayList<CPRefBand>();
++ private List<Object[]> needPredefIndex = new ArrayList<Object[]>();
+
+
+ int encodeRef(Entry e, Index ix) {
+@@ -1686,7 +1686,7 @@
+ protected int attrClassFileVersionMask;
+
+ // Mapping from Attribute.Layout to Band[] (layout element bands).
+- protected Map<Attribute.Layout, Band[]> attrBandTable = new HashMap<>();
++ protected Map<Attribute.Layout, Band[]> attrBandTable = new HashMap<Attribute.Layout, Band[]>();
+
+ // Well-known attributes:
+ protected final Attribute.Layout attrCodeEmpty;
+@@ -1695,11 +1695,11 @@
+ protected final Attribute.Layout attrConstantValue;
+
+ // Mapping from Attribute.Layout to Integer (inverse of attrDefs)
+- Map<Attribute.Layout, Integer> attrIndexTable = new HashMap<>();
++ Map<Attribute.Layout, Integer> attrIndexTable = new HashMap<Attribute.Layout, Integer>();
+
+ // Mapping from attribute index (<32 are flag bits) to attributes.
+ protected List<List<Attribute.Layout>> attrDefs =
+- new FixedList<>(ATTR_CONTEXT_LIMIT);
++ new FixedList<List<Attribute.Layout>>(ATTR_CONTEXT_LIMIT);
+ {
+ for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) {
+ assert(attrIndexLimit[i] == 0);
+@@ -1894,7 +1894,7 @@
+
+ protected List getPredefinedAttrs(int ctype) {
+ assert(attrIndexLimit[ctype] != 0);
+- List<Attribute.Layout> res = new ArrayList<>(attrIndexLimit[ctype]);
++ List<Attribute.Layout> res = new ArrayList<Attribute.Layout>(attrIndexLimit[ctype]);
+ // Remove nulls and non-predefs.
+ for (int ai = 0; ai < attrIndexLimit[ctype]; ai++) {
+ if (testBit(attrDefSeen[ctype], 1L<<ai)) continue;
+@@ -2518,7 +2518,7 @@
+ // DEBUG ONLY: Record something about the band order.
+ boolean notePrevForAssert(Band b, Band p) {
+ if (prevForAssertMap == null)
+- prevForAssertMap = new HashMap<>();
++ prevForAssertMap = new HashMap<Band, Band>();
+ prevForAssertMap.put(b, p);
+ return true;
+ }
+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 2011-04-12 00:18:33.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2011-04-13 15:10:03.606190699 +0100
+@@ -469,7 +469,7 @@
+
+ void readInnerClasses(Class cls) throws IOException {
+ int nc = readUnsignedShort();
+- ArrayList<InnerClass> ics = new ArrayList<>(nc);
++ ArrayList<InnerClass> ics = new ArrayList<InnerClass>(nc);
+ for (int i = 0; i < nc; i++) {
+ InnerClass ic =
+ new InnerClass(readClassRef(),
+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 2011-04-12 00:18:33.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2011-04-13 15:10:03.606190699 +0100
+@@ -743,9 +743,9 @@
+ // Steps 1/2/3 are interdependent, and may be iterated.
+ // Steps 4 and 5 may be decided independently afterward.
+ int[] LValuesCoded = PopulationCoding.LValuesCoded;
+- List<Coding> bestFits = new ArrayList<>();
+- List<Coding> fullFits = new ArrayList<>();
+- List<Coding> longFits = new ArrayList<>();
++ List<Coding> bestFits = new ArrayList<Coding>();
++ List<Coding> fullFits = new ArrayList<Coding>();
++ List<Coding> longFits = new ArrayList<Coding>();
+ final int PACK_TO_MAX_S = 1;
+ if (bestPopFVC <= 255) {
+ bestFits.add(BandStructure.BYTE1);
+@@ -785,7 +785,7 @@
+ }
+ }
+ }
+- List<Coding> allFits = new ArrayList<>();
++ List<Coding> allFits = new ArrayList<Coding>();
+ for (Iterator<Coding> i = bestFits.iterator(),
+ j = fullFits.iterator(),
+ k = longFits.iterator();
+@@ -1230,10 +1230,10 @@
+ Histogram hist = getValueHistogram();
+ int fVlen = stressLen(hist.getTotalLength());
+ if (fVlen == 0) return coding;
+- List<Integer> popvals = new ArrayList<>();
++ List<Integer> popvals = new ArrayList<Integer>();
+ if (stress.nextBoolean()) {
+ // Build the population from the value list.
+- Set<Integer> popset = new HashSet<>();
++ Set<Integer> popset = new HashSet<Integer>();
+ for (int i = start; i < end; i++) {
+ if (popset.add(values[i])) popvals.add(values[i]);
+ }
+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 2011-04-12 00:18:33.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2011-04-13 15:10:03.606190699 +0100
+@@ -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 2011-03-14 22:10:30.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-03-16 22:41:33.034195793 +0000
-@@ -916,7 +916,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-04-11 23:07:01.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2011-04-13 15:10:03.606190699 +0100
+@@ -919,7 +919,7 @@
public static
Index[] partition(Index ix, int[] keys) {
// %%% Should move this into class Index.
-- ArrayList<List<Entry>> parts = new ArrayList<>();
-+ ArrayList<List<Entry>> parts = new ArrayList<List<Entry>>();
+- List<List<Entry>> parts = new ArrayList<>();
++ List<List<Entry>> parts = new ArrayList<List<Entry>>();
Entry[] cpMap = ix.cpMap;
assert(keys.length == cpMap.length);
for (int i = 0; i < keys.length; i++) {
-@@ -927,7 +927,7 @@
+@@ -930,7 +930,7 @@
}
List<Entry> part = parts.get(key);
if (part == null) {
@@ -92,37 +218,46 @@
}
part.add(cpMap[i]);
}
+@@ -1137,7 +1137,7 @@
+ void completeReferencesIn(Set<Entry> cpRefs, boolean flattenSigs) {
+ cpRefs.remove(null);
+ for (ListIterator<Entry> work =
+- new ArrayList<>(cpRefs).listIterator(cpRefs.size());
++ new ArrayList<Entry>(cpRefs).listIterator(cpRefs.size());
+ work.hasPrevious(); ) {
+ Entry e = work.previous();
+ work.remove(); // pop stack
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 2011-03-14 22:10:30.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-03-16 22:41:33.034195793 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-04-11 12:34:30.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2011-04-13 15:10:03.606190699 +0100
@@ -59,7 +59,7 @@
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
public static void main(String[] ava) throws IOException {
-- ArrayList<String> av = new ArrayList<>(Arrays.asList(ava));
-+ ArrayList<String> av = new ArrayList<String>(Arrays.asList(ava));
+- List<String> av = new ArrayList<>(Arrays.asList(ava));
++ List<String> av = new ArrayList<String>(Arrays.asList(ava));
boolean doPack = true;
boolean doUnpack = false;
-@@ -82,7 +82,7 @@
+@@ -84,7 +84,7 @@
}
// Collect engine properties here:
-- HashMap<String,String> engProps = new HashMap<>();
-+ HashMap<String,String> engProps = new HashMap<String,String>();
+- Map<String,String> engProps = new HashMap<>();
++ Map<String,String> engProps = new HashMap<String, String>();
engProps.put(verboseProp, System.getProperty(verboseProp));
String optionMap;
-@@ -96,7 +96,7 @@
+@@ -98,7 +98,7 @@
}
// Collect argument properties here:
-- HashMap<String,String> avProps = new HashMap<>();
-+ HashMap<String,String> avProps = new HashMap<String,String>();
+- Map<String,String> avProps = new HashMap<>();
++ Map<String,String> avProps = new HashMap<String, String>();
try {
for (;;) {
String state = parseCommandOptions(av, optionMap, avProps);
-@@ -515,7 +515,7 @@
+@@ -525,7 +525,7 @@
String resultString = null;
// Convert options string into optLines dictionary.
@@ -131,15 +266,27 @@
loadOptmap:
for (String optline : options.split("\n")) {
String[] words = optline.split("\\p{Space}+");
+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 2011-04-12 00:18:33.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2011-04-13 15:10:03.606190699 +0100
+@@ -45,7 +45,7 @@
+ private final ArrayList<E> flist;
+
+ protected FixedList(int capacity) {
+- flist = new ArrayList<>(capacity);
++ flist = new ArrayList<E>(capacity);
+ // initialize the list to null
+ for (int i = 0 ; i < capacity ; i++) {
+ flist.add(null);
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 2011-03-14 22:10:30.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2011-03-16 22:41:33.034195793 +0000
More information about the distro-pkg-dev
mailing list