Mercurial > hg > icedtea11
changeset 2351:ca86748424fa
Bump to b117. Move to using drops from the IcedTea server.
2010-11-24 Andrew John Hughes <ahughes@redhat.com>
Bump to b117.
* patches/boot/corba-libgcj.patch,
* patches/icedtea-stroker-finish.patch,
* Makefile.am:
(OPENJDK_VERSION): Set to b117.
(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_URL): Set to IcedTea server.
(JAXWS_DROP_ZIP): Updated.
(JAXWS_DROP_SHA256SUM): Likewise.
(JAF_DROP_URL): Set to IcedTea server.
(JAF_DROP_ZIP): Updated.
(JAF_DROP_SHA256SUM): Likewise.
(JAXP_DROP_URL): Set to IcedTea server.
(JAXP_DROP_ZIP): Updated.
(JAXP_DROP_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Drop stroker-finish (upstream).
(ICEDTEA_BOOT_PATCHES): Drop corba-libgcj (redundant
due to native elements of corba build being removed).
Add new patches to work around new bootstrap issues.
* patches/boot/corba-defs.patch: Rerolled.
* patches/boot/ecj-diamond.patch: Handle use in java.util.jar.
* patches/boot/ecj-stringswitch.patch:
New patch to replace switch statement using a String in NTLM driver.
* patches/boot/genstubs-nofork.patch: Rerolled.
* patches/boot/icedteart.patch: Drop dead ICEDTEA_JCE. Put CLASSDESTDIR
first so that new classes are found first.
* patches/boot/revert-6941137.patch: Revert change to use java.nio.file.FileSystems
in ZoneInfoFile. Avoids trying to load file system providers and failing.
* patches/boot/xbootclasspath.patch: Rerolled.
* patches/cacao/arch.patch: Remove CORBA chunk.
* patches/extensions/netx.patch: Rerolled.
* patches/icedtea-gcc-suffix.patch: Remove CORBA chunk.
* patches/icedtea-lc_ctype.patch: Recreated.
* patches/icedtea-libraries.patch: Rerolled.
* patches/sh4-support.patch: Remove CORBA chunk.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 24 Nov 2010 13:13:23 +0000 |
| parents | edaaf37351c4 |
| children | 68ccdcc3cbb1 |
| files | ChangeLog Makefile.am patches/boot/corba-defs.patch patches/boot/corba-libgcj.patch patches/boot/ecj-diamond.patch patches/boot/ecj-stringswitch.patch patches/boot/genstubs-nofork.patch patches/boot/icedteart.patch patches/boot/revert-6941137.patch patches/boot/xbootclasspath.patch patches/cacao/arch.patch patches/extensions/netx.patch patches/icedtea-gcc-suffix.patch patches/icedtea-lc_ctype.patch patches/icedtea-libraries.patch patches/icedtea-stroker-finish.patch patches/sh4-support.patch |
| diffstat | 17 files changed, 693 insertions(+), 374 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Sep 14 15:59:59 2010 +0100 +++ b/ChangeLog Wed Nov 24 13:13:23 2010 +0000 @@ -1,3 +1,55 @@ +2010-11-24 Andrew John Hughes <ahughes@redhat.com> + + Bump to b117. Move to using drops from + the IcedTea server. + * patches/boot/corba-libgcj.patch, + * patches/icedtea-stroker-finish.patch, + * Makefile.am: + (OPENJDK_VERSION): Set to b117. + (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_URL): Set to IcedTea server. + (JAXWS_DROP_ZIP): Updated. + (JAXWS_DROP_SHA256SUM): Likewise. + (JAF_DROP_URL): Set to IcedTea server. + (JAF_DROP_ZIP): Updated. + (JAF_DROP_SHA256SUM): Likewise. + (JAXP_DROP_URL): Set to IcedTea server. + (JAXP_DROP_ZIP): Updated. + (JAXP_DROP_SHA256SUM): Likewise. + (ICEDTEA_PATCHES): Drop stroker-finish (upstream). + (ICEDTEA_BOOT_PATCHES): Drop corba-libgcj (redundant + due to native elements of corba build being removed). + Add new patches to work around new bootstrap issues. + * patches/boot/corba-defs.patch: Rerolled. + * patches/boot/ecj-diamond.patch: Handle use in java.util.jar. + * patches/boot/ecj-stringswitch.patch: + New patch to replace switch statement using a String in NTLM driver. + * patches/boot/genstubs-nofork.patch: Rerolled. + * patches/boot/icedteart.patch: Drop dead ICEDTEA_JCE. Put CLASSDESTDIR + first so that new classes are found first. + * patches/boot/revert-6941137.patch: Revert change to use java.nio.file.FileSystems + in ZoneInfoFile. Avoids trying to load file system providers and failing. + * patches/boot/xbootclasspath.patch: Rerolled. + * patches/cacao/arch.patch: Remove CORBA chunk. + * patches/extensions/netx.patch: Rerolled. + * patches/icedtea-gcc-suffix.patch: Remove CORBA chunk. + * patches/icedtea-lc_ctype.patch: Recreated. + * patches/icedtea-libraries.patch: Rerolled. + * patches/sh4-support.patch: Remove CORBA chunk. + 2010-09-14 Andrew John Hughes <ahughes@redhat.com> * Makefile.am,
--- a/Makefile.am Tue Sep 14 15:59:59 2010 +0100 +++ b/Makefile.am Wed Nov 24 13:13:23 2010 +0000 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b106 +OPENJDK_VERSION = b117 -CORBA_CHANGESET = 00a2834117ff -HOTSPOT_CHANGESET = 7f4113719dc5 -JAXP_CHANGESET = 679653c22ae1 -JAXWS_CHANGESET = 191a3ec51d79 -JDK_CHANGESET = a094068f4c7b -LANGTOOLS_CHANGESET = 68035813467d -OPENJDK_CHANGESET = b79fce47b7c6 +CORBA_CHANGESET = 06146786b141 +HOTSPOT_CHANGESET = 81685aa89446 +JAXP_CHANGESET = 43658f98c582 +JAXWS_CHANGESET = f3444af18aff +JDK_CHANGESET = c981a387cd86 +LANGTOOLS_CHANGESET = fdf1b74d3437 +OPENJDK_CHANGESET = c94d1673451e -CORBA_SHA256SUM = 5648b189c94df46bbec9bc7c8640957befffbde68ff7ef9f8f8de9bd7fbe8e7d -HOTSPOT_SHA256SUM = 8ff4445304680ca7b09edd2b5713e5c04b0f68308c593d84429691ff4f7e8cfb -JAXP_SHA256SUM = c7d58a5dd2859ccb8b2d0897a26ce9b37895f530a94a5912179afc25cc1d14ea -JAXWS_SHA256SUM = 6fd65fd23c085c9c89f904da1b6448460af32d97d76bb0ba49630ee61d70a4d6 -JDK_SHA256SUM = 8b20e0686667a03cf028d57695b4bc2196c51db2d9c0873db7694624c384c446 -LANGTOOLS_SHA256SUM = 81b48f5f5782e62b0555735be24e294d3274c48fa1e027a63eb005465a505385 -OPENJDK_SHA256SUM = edb332586e2442bdbd4eed19c059535ade56dba5b436257031a0e5e827b89f12 +CORBA_SHA256SUM = 8d5a566e2d51d791d75f1ff25d5ae499317ec9391ed6bbc86eef483d15551d55 +HOTSPOT_SHA256SUM = 7ca6831eb7505c21b8607c7cf8d12cb182fca21c3a40c4696db737d56d80e54b +JAXP_SHA256SUM = e0aa77b166b30d4d4052110956da831c59c43e22f8d6feeac62a06775bb083b6 +JAXWS_SHA256SUM = ff4124f3765ac5ebac5ecfd0391cb2a54857d80ac7f967f60630ce0879cfd1f4 +JDK_SHA256SUM = d211d0f1ec2baae5560e076eb60e313421c087e85ead4592256c2885a99d8b85 +LANGTOOLS_SHA256SUM = d200c9bcf1c1805e0800a8cd8017e99ff6d12db14a1fcca8e9b67c59dc5ed448 +OPENJDK_SHA256SUM = d7a3a531f0e064898e511f08f1127447b9171adce21ae4cecb3bca84b3f7b531 CACAO_VERSION = e321b101a9ee CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444 @@ -24,15 +24,15 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -JAXWS_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150896 -JAXWS_DROP_ZIP = jdk7-jaxws-b100.zip -JAXWS_DROP_SHA256SUM = 06e5f564430954211322fca353b0b8d916ffa8ae051412b7d9b5a5398090d887 -JAF_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download -JAF_DROP_ZIP = jdk7-jaf-2009_08_28.zip -JAF_DROP_SHA256SUM = 8c81940b3017c0058367d7e7453123442f2cdd77c2bfe74acd9035f97e4db8e8 -JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150785 -JAXP_DROP_ZIP = jdk7-jaxp-m7.zip -JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156 +JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops +JAXWS_DROP_ZIP = jdk7-jaxws2_2-2010_08_19.zip +JAXWS_DROP_SHA256SUM = b8877aafbb15a348babcaee4ee372fb3e2ea0282f8fe93d306272fd24d7847de +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 ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7 @@ -319,7 +319,6 @@ patches/icedtea-signed-types.patch \ patches/icedtea-lc_ctype.patch \ patches/icedtea-tests-jdk.patch \ - patches/icedtea-stroker-finish.patch \ patches/icedtea-linker-libs-order.patch \ patches/icedtea-testenv.patch \ patches/icedtea-samejvm-safe.patch \ @@ -397,7 +396,6 @@ ICEDTEA_BOOT_PATCHES = patches/boot/ant-javac.patch \ patches/boot/corba-defs.patch \ patches/boot/corba-idlj.patch \ - patches/boot/corba-libgcj.patch \ patches/boot/corba-no-gen.patch \ patches/boot/corba-orb.patch \ patches/boot/demos.patch \ @@ -419,7 +417,9 @@ patches/boot/genstubs-nofork.patch \ patches/boot/getannotation-cast.patch \ patches/boot/break-processbuilder-dependency.patch \ - patches/boot/revert-6973616.patch + patches/boot/revert-6973616.patch \ + patches/boot/revert-6941137.patch \ + patches/boot/ecj-stringswitch.patch if CP39408_JAVAH ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch
--- a/patches/boot/corba-defs.patch Tue Sep 14 15:59:59 2010 +0100 +++ b/patches/boot/corba-defs.patch Wed Nov 24 13:13:23 2010 +0000 @@ -1,6 +1,6 @@ -diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk ---- ../openjdk.orig/openjdk-boot/corba/make/common/Defs.gmk 2009-10-03 00:02:43.000000000 +0100 -+++ openjdk-boot/corba/make/common/Defs.gmk 2009-10-30 16:59:16.000000000 +0000 +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) @@ -15,16 +15,16 @@ # # Get platform definitions # -@@ -129,8 +136,6 @@ +@@ -85,8 +92,6 @@ # for build tool jar files BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars -# for generated java source files -GENSRCDIR = $(OUTPUTDIR)/gensrc - # for generated C source files (not javah) - GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc # for imported source files -@@ -231,7 +236,7 @@ + IMPORTSRCDIR = $(OUTPUTDIR)/impsrc + # for imported documents +@@ -167,7 +172,7 @@ # We define an intermediate variable for Java files because # we use its value later to help define $SOURCEPATH
--- a/patches/boot/corba-libgcj.patch Tue Sep 14 15:59:59 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -Nru openjdk-boot.orig/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk ---- openjdk-boot.orig/corba/make/common/Defs-linux.gmk 2009-12-13 23:10:09.000000000 +0000 -+++ openjdk-boot/corba/make/common/Defs-linux.gmk 2009-12-14 15:54:17.000000000 +0000 -@@ -271,7 +271,7 @@ - # - VM_NAME = server - JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm --JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB) -+JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB) - - # - # We want to privatize JVM symbols on Solaris. This is so the user can
--- a/patches/boot/ecj-diamond.patch Tue Sep 14 15:59:59 2010 +0100 +++ b/patches/boot/ecj-diamond.patch Wed Nov 24 13:13:23 2010 +0000 @@ -156,3 +156,333 @@ for (int i = 0; i < urls.length; i++) { String server = urls[i].getHost(); +diff -r 240d4d3f2db7 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 Tue Sep 14 17:29:58 2010 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java Wed Sep 15 00:00:17 2010 +0100 +@@ -96,9 +96,9 @@ + } + + 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<Layout, Attribute> attributes = new HashMap<Layout, Attribute>(); ++ private static final Map<Layout, Attribute> standardDefs = new HashMap<Layout, Attribute>(); + + // Canonicalized lists of trivial attrs (Deprecated, etc.) + // are used by trimToSize, in order to reduce footprint +@@ -108,7 +108,7 @@ + synchronized (canonLists) { + List<Attribute> cl = canonLists.get(al); + if (cl == null) { +- cl = new ArrayList<>(al.size()); ++ cl = new ArrayList<Attribute>(al.size()); + cl.addAll(al); + cl = Collections.unmodifiableList(cl); + canonLists.put(al, cl); +@@ -329,9 +329,9 @@ + + public void addAttribute(Attribute a) { + if (attributes == null) +- attributes = new ArrayList<>(3); ++ attributes = new ArrayList<Attribute>(3); + else if (!(attributes instanceof ArrayList)) +- attributes = new ArrayList<>(attributes); // unfreeze it ++ attributes = new ArrayList<Attribute>(attributes); // unfreeze it + attributes.add(a); + } + +@@ -339,7 +339,7 @@ + if (attributes == null) return null; + if (!attributes.contains(a)) return null; + if (!(attributes instanceof ArrayList)) +- attributes = new ArrayList<>(attributes); // unfreeze it ++ attributes = new ArrayList<Attribute>(attributes); // unfreeze it + attributes.remove(a); + return a; + } +@@ -824,7 +824,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()); + tokenizeLayout(self, curCble, layout, col); + Layout.Element[] res = new Layout.Element[col.size()]; + col.toArray(res); +@@ -889,7 +889,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>(); + for (;;) { + // Keep parsing cases until we hit the default case. + if (layout.charAt(i++) != '(') +@@ -1043,7 +1043,7 @@ + } + static //private + String[] splitBodies(String layout) { +- ArrayList<String> bodies = new ArrayList<>(); ++ ArrayList<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 -r 240d4d3f2db7 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 Tue Sep 14 17:29:58 2010 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java Wed Sep 15 00:00:17 2010 +0100 +@@ -909,7 +909,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>>(); + Entry[] cpMap = ix.cpMap; + assert(keys.length == cpMap.length); + for (int i = 0; i < keys.length; i++) { +@@ -920,7 +920,7 @@ + } + List<Entry> part = parts.get(key); + if (part == null) { +- parts.set(key, part = new ArrayList<>()); ++ parts.set(key, part = new ArrayList<Entry>()); + } + part.add(cpMap[i]); + } +diff -r 240d4d3f2db7 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 Tue Sep 14 17:29:58 2010 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java Wed Sep 15 00:00:17 2010 +0100 +@@ -90,7 +90,7 @@ + public static final Attribute.Layout attrSourceFileSpecial; + public static final Map attrDefs; + static { +- HashMap<Layout, Attribute> ad = new HashMap<>(3); ++ HashMap<Layout, Attribute> ad = new HashMap<Layout, Attribute>(3); + attrCodeEmpty = Attribute.define(ad, ATTR_CONTEXT_METHOD, + "Code", "").layout(); + attrInnerClassesEmpty = Attribute.define(ad, ATTR_CONTEXT_CLASS, +@@ -160,7 +160,7 @@ + } + } + +- ArrayList<Package.Class> classes = new ArrayList<>(); ++ ArrayList<Package.Class> classes = new ArrayList<Package.Class>(); + + public List<Package.Class> getClasses() { + return classes; +@@ -271,7 +271,7 @@ + if (a != olda) { + if (verbose > 2) + Utils.log.fine("recoding obvious SourceFile="+obvious); +- List<Attribute> newAttrs = new ArrayList<>(getAttributes()); ++ List<Attribute> newAttrs = new ArrayList<Attribute>(getAttributes()); + int where = newAttrs.indexOf(olda); + newAttrs.set(where, a); + setAttributes(newAttrs); +@@ -320,7 +320,7 @@ + * with that of Package.this.allInnerClasses. + */ + public List<InnerClass> computeGloballyImpliedICs() { +- HashSet<Entry> cpRefs = new HashSet<>(); ++ HashSet<Entry> cpRefs = new HashSet<Entry>(); + { // This block temporarily displaces this.innerClasses. + ArrayList<InnerClass> innerClassesSaved = innerClasses; + innerClasses = null; // ignore for the moment +@@ -329,7 +329,7 @@ + } + ConstantPool.completeReferencesIn(cpRefs, true); + +- HashSet<Entry> icRefs = new HashSet<>(); ++ HashSet<Entry> icRefs = new HashSet<Entry>(); + for (Entry e : cpRefs) { + // Restrict cpRefs to InnerClasses entries only. + if (!(e instanceof ClassEntry)) continue; +@@ -345,7 +345,7 @@ + // This loop is structured this way so as to accumulate + // entries into impliedICs in an order which reflects + // the order of allInnerClasses. +- ArrayList<InnerClass> impliedICs = new ArrayList<>(); ++ ArrayList<InnerClass> impliedICs = new ArrayList<InnerClass>(); + for (InnerClass ic : allInnerClasses) { + // This one is locally relevant if it describes + // a member of the current class, or if the current +@@ -388,8 +388,8 @@ + // Diff is A since I is empty. + } + // (I*A) is non-trivial +- HashSet<InnerClass> center = new HashSet<>(actualICs); +- center.retainAll(new HashSet<>(impliedICs)); ++ HashSet<InnerClass> center = new HashSet<InnerClass>(actualICs); ++ center.retainAll(new HashSet<InnerClass>(impliedICs)); + impliedICs.addAll(actualICs); + impliedICs.removeAll(center); + // Diff is now I^A = (I+A)-(I*A). +@@ -518,7 +518,7 @@ + super(flags, descriptor); + assert(!descriptor.isMethod()); + if (fields == null) +- fields = new ArrayList<>(); ++ fields = new ArrayList<Field>(); + boolean added = fields.add(this); + assert(added); + order = fields.size(); +@@ -543,7 +543,7 @@ + super(flags, descriptor); + assert(descriptor.isMethod()); + if (methods == null) +- methods = new ArrayList<>(); ++ methods = new ArrayList<Method>(); + boolean added = methods.add(this); + assert(added); + } +@@ -713,14 +713,14 @@ + } + + // What non-class files are in this unit? +- ArrayList<File> files = new ArrayList<>(); ++ ArrayList<File> files = new ArrayList<File>(); + + public List<File> getFiles() { + return files; + } + + public List<File> getClassStubs() { +- ArrayList<File> classStubs = new ArrayList<>(classes.size()); ++ ArrayList<File> classStubs = new ArrayList<File>(classes.size()); + for (Class cls : classes) { + assert(cls.file.isClassStub()); + classStubs.add(cls.file); +@@ -839,7 +839,7 @@ + public InputStream getInputStream() { + InputStream in = new ByteArrayInputStream(append.toByteArray()); + if (prepend.size() == 0) return in; +- ArrayList<InputStream> isa = new ArrayList<>(prepend.size()+1); ++ ArrayList<InputStream> isa = new ArrayList<InputStream>(prepend.size()+1); + for (Iterator i = prepend.iterator(); i.hasNext(); ) { + byte[] bytes = (byte[]) i.next(); + isa.add(new ByteArrayInputStream(bytes)); +@@ -876,7 +876,7 @@ + } + + // Is there a globally declared table of inner classes? +- ArrayList<InnerClass> allInnerClasses = new ArrayList<>(); ++ ArrayList<InnerClass> allInnerClasses = new ArrayList<InnerClass>(); + HashMap<ClassEntry, InnerClass> allInnerClassesByThis; + + public +@@ -891,7 +891,7 @@ + allInnerClasses.addAll(ics); + + // Make an index: +- allInnerClassesByThis = new HashMap<>(allInnerClasses.size()); ++ allInnerClassesByThis = new HashMap<ClassEntry,InnerClass>(allInnerClasses.size()); + for (InnerClass ic : allInnerClasses) { + Object pic = allInnerClassesByThis.put(ic.thisClass, ic); + assert(pic == null); // caller must ensure key uniqueness! +@@ -1288,7 +1288,7 @@ + + // Use this before writing the class files. + void ensureAllClassFiles() { +- HashSet<File> fileSet = new HashSet<>(files); ++ HashSet<File> fileSet = new HashSet<File>(files); + for (Class cls : classes) { + // Add to the end of ths list: + if (!fileSet.contains(cls.file)) +diff -r 240d4d3f2db7 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 Tue Sep 14 17:29:58 2010 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java Wed Sep 15 00:00:17 2010 +0100 +@@ -599,7 +599,7 @@ + + List<InFile> scanJar(JarFile jf) throws IOException { + // Collect jar entries, preserving order. +- List<InFile> inFiles = new ArrayList<>(); ++ List<InFile> inFiles = new ArrayList<InFile>(); + for (JarEntry je : Collections.list(jf.entries())) { + InFile inFile = new InFile(jf, je); + assert(je.isDirectory() == inFile.name.endsWith("/")); +diff -r 240d4d3f2db7 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 Tue Sep 14 17:29:58 2010 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java Wed Sep 15 00:00:17 2010 +0100 +@@ -58,12 +58,12 @@ + private final Map<String, MemberEntry> memberEntries; + + TLGlobals() { +- utf8Entries = new HashMap<>(); +- classEntries = new HashMap<>(); +- literalEntries = new HashMap<>(); +- signatureEntries = new HashMap<>(); +- descriptorEntries = new HashMap<>(); +- memberEntries = new HashMap<>(); ++ utf8Entries = new HashMap<String,Utf8Entry>(); ++ classEntries = new HashMap<String,ClassEntry>(); ++ literalEntries = new HashMap<Object,LiteralEntry>(); ++ signatureEntries = new HashMap<String,SignatureEntry>(); ++ descriptorEntries = new HashMap<String,DescriptorEntry>(); ++ memberEntries = new HashMap<String,MemberEntry>(); + props = new PropMap(); + } + +diff -r 240d4d3f2db7 src/share/classes/com/sun/java/util/jar/pack/Utils.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java Tue Sep 14 17:29:58 2010 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java Wed Sep 15 00:00:17 2010 +0100 +@@ -123,7 +123,7 @@ + // Keep a TLS point to the global data and environment. + // This makes it simpler to supply environmental options + // to the engine code, especially the native code. +- static final ThreadLocal<TLGlobals> currentInstance = new ThreadLocal<>(); ++ static final ThreadLocal<TLGlobals> currentInstance = new ThreadLocal<TLGlobals>(); + + // convenience methods to access the TL globals + static TLGlobals getTLGlobals() { +diff -r 240d4d3f2db7 src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java Tue Sep 14 17:29:58 2010 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java Wed Sep 15 14:34:26 2010 +0100 +@@ -199,7 +199,7 @@ + props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); + pkg.ensureAllClassFiles(); + // Now write out the files. +- HashSet<Package.Class> classesToWrite = new HashSet<>(pkg.getClasses()); ++ HashSet<Package.Class> classesToWrite = new HashSet<Package.Class>(pkg.getClasses()); + for (Iterator i = pkg.getFiles().iterator(); i.hasNext(); ) { + Package.File file = (Package.File) i.next(); + String name = file.nameString; +diff -r 240d4d3f2db7 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 Tue Sep 14 17:29:58 2010 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java Wed Sep 15 15:25:40 2010 +0100 +@@ -38,7 +38,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)); + + boolean doPack = true; + boolean doUnpack = false; +@@ -61,7 +61,7 @@ + } + + // Collect engine properties here: +- HashMap<String,String> engProps = new HashMap<>(); ++ HashMap<String,String> engProps = new HashMap<String,String>(); + engProps.put(verboseProp, System.getProperty(verboseProp)); + + String optionMap; +@@ -75,7 +75,7 @@ + } + + // Collect argument properties here: +- HashMap<String,String> avProps = new HashMap<>(); ++ HashMap<String,String> avProps = new HashMap<String,String>(); + try { + for (;;) { + String state = parseCommandOptions(av, optionMap, avProps); +@@ -494,7 +494,7 @@ + String resultString = null; + + // Convert options string into optLines dictionary. +- TreeMap<String,String[]> optmap = new TreeMap<>(); ++ TreeMap<String,String[]> optmap = new TreeMap<String,String[]>(); + loadOptmap: + for (String optline : options.split("\n")) { + String[] words = optline.split("\\p{Space}+");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/ecj-stringswitch.patch Wed Nov 24 13:13:23 2010 +0000 @@ -0,0 +1,38 @@ +diff -r c981a387cd86 src/share/classes/com/sun/security/ntlm/NTLM.java +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java Mon Nov 22 21:55:09 2010 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java Wed Nov 24 00:34:39 2010 +0000 +@@ -64,17 +64,23 @@ + + protected NTLM(String version) throws NTLMException { + if (version == null) version = "LMv2/NTLMv2"; +- switch (version) { +- case "LM": v = NTLM; writeLM = true; writeNTLM = false; break; +- case "NTLM": v = NTLM; writeLM = false; writeNTLM = true; break; +- case "LM/NTLM": v = NTLM; writeLM = writeNTLM = true; break; +- case "NTLM2": v = NTLM2; writeLM = writeNTLM = true; break; +- case "LMv2": v = NTLMv2; writeLM = true; writeNTLM = false; break; +- case "NTLMv2": v = NTLMv2; writeLM = false; writeNTLM = true; break; +- case "LMv2/NTLMv2": v = NTLMv2; writeLM = writeNTLM = true; break; +- default: throw new NTLMException(NTLMException.BAD_VERSION, +- "Unknown version " + version); +- } ++ if (version.equals("LM")) ++ { v = NTLM; writeLM = true; writeNTLM = false; } ++ else if (version.equals("NTLM")) ++ { v = NTLM; writeLM = false; writeNTLM = true; } ++ else if (version.equals("LM/NTLM")) ++ { v = NTLM; writeLM = writeNTLM = true; } ++ else if (version.equals("NTLM2")) ++ { v = NTLM2; writeLM = writeNTLM = true; } ++ else if (version.equals("LMv2")) ++ { v = NTLMv2; writeLM = true; writeNTLM = false; } ++ else if (version.equals("NTLMv2")) ++ { v = NTLMv2; writeLM = false; writeNTLM = true; } ++ else if (version.equals("LMv2/NTLMv2")) ++ { v = NTLMv2; writeLM = writeNTLM = true; } ++ else ++ throw new NTLMException(NTLMException.BAD_VERSION, ++ "Unknown version " + version); + try { + fac = SecretKeyFactory.getInstance ("DES"); + cipher = Cipher.getInstance ("DES/ECB/NoPadding");
--- a/patches/boot/genstubs-nofork.patch Tue Sep 14 15:59:59 2010 +0100 +++ b/patches/boot/genstubs-nofork.patch Wed Nov 24 13:13:23 2010 +0000 @@ -1,12 +1,12 @@ -diff -r bab75805f846 make/build.xml ---- openjdk-boot.orig/langtools/make/build.xml Fri Feb 19 17:14:22 2010 +0000 -+++ openjdk-boot/langtools/make/build.xml Tue Feb 23 19:26:20 2010 +0000 -@@ -433,7 +433,7 @@ +diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml +--- openjdk-boot.orig/langtools/make/build.xml 2010-11-12 01:18:44.000000000 +0000 ++++ openjdk-boot/langtools/make/build.xml 2010-11-22 17:50:52.747031959 +0000 +@@ -622,7 +622,7 @@ <genstubs srcdir="${import.jdk.src.dir}" destdir="${build.genstubs.dir}" includes="${import.jdk.stub.files}" -- fork="true" classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar" -+ fork="false" classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar" +- fork="true" classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.core.lib}" ++ fork="false" classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.core.lib}" /> </target>
--- a/patches/boot/icedteart.patch Tue Sep 14 15:59:59 2010 +0100 +++ b/patches/boot/icedteart.patch Wed Nov 24 13:13:23 2010 +0000 @@ -20,9 +20,9 @@ $(ECHO) "# Running javac:"; \ - $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ - $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ -+ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \ ++ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(CLASSDESTDIR):$(ICEDTEA_RT)" \ + -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ -+ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ ++ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(CLASSDESTDIR):$(ICEDTEA_RT)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ fi @$(java-vm-cleanup)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/revert-6941137.patch Wed Nov 24 13:13:23 2010 +0000 @@ -0,0 +1,12 @@ +diff -r c981a387cd86 src/share/classes/sun/util/calendar/ZoneInfoFile.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Mon Nov 22 21:55:09 2010 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java Tue Nov 23 23:05:24 2010 +0000 +@@ -486,7 +486,7 @@ + String otherDir = getZoneInfoDir(homeDir); + if (otherDir != null) + zi = otherDir; +- zi = FileSystems.getDefault().getPath(zi).toRealPath(true).toString(); ++ zi = new File(zi).getCanonicalPath(); + } catch(Exception e) { + } + return zi;
--- a/patches/boot/xbootclasspath.patch Tue Sep 14 15:59:59 2010 +0100 +++ b/patches/boot/xbootclasspath.patch Wed Nov 24 13:13:23 2010 +0000 @@ -1,7 +1,7 @@ -diff -Nru openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk ---- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk 2009-09-04 02:41:12.000000000 +0100 -+++ openjdk-boot/corba/make/common/shared/Defs-java.gmk 2010-05-04 13:45:49.000000000 +0100 -@@ -131,35 +131,18 @@ +diff -Nru openjdk.orig/corba/make/common/shared/Defs-java.gmk openjdk/corba/make/common/shared/Defs-java.gmk +--- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk 2010-11-12 01:18:17.000000000 +0000 ++++ openjdk-boot/corba/make/common/shared/Defs-java.gmk 2010-11-22 17:37:26.447519804 +0000 +@@ -131,26 +131,14 @@ CLASS_VERSION = -target $(TARGET_CLASS_VERSION) JAVACFLAGS += $(CLASS_VERSION) JAVACFLAGS += -encoding ascii @@ -9,22 +9,14 @@ +JAVACFLAGS += -classpath $(BOOTDIR)/lib/rt.jar JAVACFLAGS += $(OTHER_JAVACFLAGS) - # Needed for javah --JAVAHFLAGS += -classpath $(CLASSBINDIR) -+JAVAHFLAGS += -classpath $(CLASSBINDIR):$(ICEDTEA_RT):$(CLASSDESTDIR) - # Langtools -ifdef LANGTOOLS_DIST - JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar -- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar - JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar - DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar - JAVAC_CMD = $(BOOT_JAVA_CMD) \ - "-Xbootclasspath/p:$(JAVAC_JAR)" \ - -jar $(JAVAC_JAR) $(JAVACFLAGS) -- JAVAH_CMD = $(BOOT_JAVA_CMD) \ -- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \ -- -jar $(JAVAH_JAR) $(JAVAHFLAGS) - JAVADOC_CMD = $(BOOT_JAVA_CMD) \ - "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \ - -jar $(JAVADOC_JAR) @@ -32,21 +24,18 @@ - # If no explicit tools, use boot tools (add VM flags in this case) - JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ - $(JAVACFLAGS) -- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ -- $(JAVAHFLAGS) - JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) -endif +# If no explicit tools, use boot tools (add VM flags in this case) +JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ -+ $(JAVACFLAGS) -+JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ -+ $(JAVAHFLAGS) ++ $(JAVACFLAGS) ++JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) # Override of what javac to use (see deploy workspace) ifdef JAVAC -diff -Nru openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk ---- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk 2010-05-04 13:32:33.000000000 +0100 -+++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2010-05-04 13:45:49.000000000 +0100 +diff -Nru openjdk.orig/jdk/make/common/shared/Defs-java.gmk openjdk/jdk/make/common/shared/Defs-java.gmk +--- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk 2010-11-22 17:32:24.000000000 +0000 ++++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2010-11-22 17:35:30.752202773 +0000 @@ -136,7 +136,7 @@ JAVACFLAGS += $(OTHER_JAVACFLAGS) @@ -84,9 +73,9 @@ endif # Override of what javac to use (see deploy workspace) -diff -Nru openjdk-boot.orig/jdk/make/java/text/base/Makefile openjdk-boot/jdk/make/java/text/base/Makefile ---- openjdk-boot.orig/jdk/make/java/text/base/Makefile 2010-04-28 22:05:27.000000000 +0100 -+++ openjdk-boot/jdk/make/java/text/base/Makefile 2010-05-04 13:48:14.000000000 +0100 +diff -Nru openjdk.orig/jdk/make/java/text/base/Makefile openjdk/jdk/make/java/text/base/Makefile +--- openjdk-boot.orig/jdk/make/java/text/base/Makefile 2010-07-29 21:55:27.000000000 +0100 ++++ openjdk-boot/jdk/make/java/text/base/Makefile 2010-11-22 17:35:30.768201571 +0000 @@ -81,8 +81,8 @@ -sourcepath $(TEXT_SRCDIR) \ $(TEXT_SOURCES) @@ -98,9 +87,9 @@ -o $(TEXT_CLASSDIR) \ -spec $(UNICODEDATA)/UnicodeData.txt @$(java-vm-cleanup) -diff -Nru openjdk-boot.orig/jdk/make/sun/text/Makefile openjdk-boot/jdk/make/sun/text/Makefile ---- openjdk-boot.orig/jdk/make/sun/text/Makefile 2010-02-22 15:15:20.000000000 +0000 -+++ openjdk-boot/jdk/make/sun/text/Makefile 2010-05-04 13:45:49.000000000 +0100 +diff -Nru openjdk.orig/jdk/make/sun/text/Makefile openjdk/jdk/make/sun/text/Makefile +--- openjdk-boot.orig/jdk/make/sun/text/Makefile 2010-07-29 21:55:29.000000000 +0100 ++++ openjdk-boot/jdk/make/sun/text/Makefile 2010-11-22 17:35:30.768201571 +0000 @@ -86,8 +86,9 @@ $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \ -sourcepath $(TEXT_SRCDIR) \
--- a/patches/cacao/arch.patch Tue Sep 14 15:59:59 2010 +0100 +++ b/patches/cacao/arch.patch Wed Nov 24 13:13:23 2010 +0000 @@ -1,29 +1,6 @@ -diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk ---- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-07-24 00:15:26.000000000 +0100 -+++ openjdk/corba/make/common/Defs-linux.gmk 2009-07-24 00:19:32.000000000 +0100 -@@ -92,9 +92,19 @@ - # We need this frame pointer to make it easy to walk the stacks. - # This should be the default on X86, but ia64 and amd64 may not have this - # as the default. -+CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN - CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN -+CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN -+CFLAGS_REQUIRED_hppa += - CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN - CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN -+CFLAGS_REQUIRED_m68k += -+CFLAGS_REQUIRED_mips += -+CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN -+CFLAGS_REQUIRED_ppc += -m32 -+CFLAGS_REQUIRED_ppc64 += -m64 -+CFLAGS_REQUIRED_s390 += -+CFLAGS_REQUIRED_s390x += -m64 - CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 - LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 - CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk ---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-07-24 00:15:28.000000000 +0100 -+++ openjdk/jdk/make/common/Defs-linux.gmk 2009-07-24 00:19:32.000000000 +0100 +--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2010-07-29 21:55:26.000000000 +0100 ++++ openjdk/jdk/make/common/Defs-linux.gmk 2010-11-12 17:41:50.090328335 +0000 @@ -109,9 +109,19 @@ # We need this frame pointer to make it easy to walk the stacks. # This should be the default on X86, but ia64 and amd64 may not have this @@ -45,9 +22,9 @@ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk ---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2009-07-24 00:15:26.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2009-07-24 00:19:32.000000000 +0100 -@@ -71,6 +71,52 @@ +--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2010-11-12 16:56:45.000000000 +0000 ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2010-11-12 17:41:50.090328335 +0000 +@@ -66,6 +66,52 @@ else CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX) endif @@ -101,8 +78,8 @@ SHARED_LIBRARY_FLAG = -shared -mimpure-text SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk ---- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2009-07-15 17:35:01.000000000 +0100 -+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2009-07-24 00:19:32.000000000 +0100 +--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2010-07-29 21:55:27.000000000 +0100 ++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2010-11-12 17:41:50.094328182 +0000 @@ -58,10 +58,54 @@ ifeq ($(ZERO_BUILD), true) CPPFLAGS += -DX_ARCH=X_ZERO @@ -159,8 +136,8 @@ CPPFLAGS += -DX_ARCH=X_SPARC endif # ARCH sparc diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h ---- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-07-15 17:35:01.000000000 +0100 -+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-07-24 00:19:32.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-07-29 21:56:11.000000000 +0100 ++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-11-12 17:41:50.094328182 +0000 @@ -33,12 +33,21 @@ #define X_LINUX 3
--- a/patches/extensions/netx.patch Tue Sep 14 15:59:59 2010 +0100 +++ b/patches/extensions/netx.patch Wed Nov 24 13:13:23 2010 +0000 @@ -1,27 +1,27 @@ diff -Nru openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk openjdk/jdk/make/docs/NON_CORE_PKGS.gmk ---- openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk 2009-08-04 14:58:33.000000000 +0100 -+++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2009-08-04 14:59:43.000000000 +0100 +--- openjdk.orig/jdk/make/docs/NON_CORE_PKGS.gmk 2010-11-12 01:20:48.000000000 +0000 ++++ openjdk/jdk/make/docs/NON_CORE_PKGS.gmk 2010-11-19 15:52:19.339315874 +0000 @@ -93,6 +93,8 @@ - TRACING_PKGS = com.sun.tracing \ - com.sun.tracing.dtrace + + ORACLENET_PKGS = com.oracle.net +JNLP_PKGS = javax.jnlp + # non-core packages in rt.jar NON_CORE_PKGS = $(DOMAPI_PKGS) \ $(MGMT_PKGS) \ -@@ -103,6 +105,7 @@ +@@ -102,6 +104,7 @@ $(OLD_JSSE_PKGS) \ $(HTTPSERVER_PKGS) \ $(SMARTCARDIO_PKGS) \ + $(JNLP_PKGS) \ $(TRACING_PKGS) \ - $(SCTPAPI_PKGS) - + $(SCTPAPI_PKGS) \ + $(ORACLENET_PKGS) diff -Nru openjdk.orig/jdk/make/launchers/Makefile openjdk/jdk/make/launchers/Makefile ---- openjdk.orig/jdk/make/launchers/Makefile 2009-07-25 04:30:42.000000000 +0100 -+++ openjdk/jdk/make/launchers/Makefile 2009-08-04 14:59:15.000000000 +0100 -@@ -67,6 +67,7 @@ +--- openjdk.orig/jdk/make/launchers/Makefile 2010-07-29 21:55:27.000000000 +0100 ++++ openjdk/jdk/make/launchers/Makefile 2010-11-19 15:52:19.339315874 +0000 +@@ -57,6 +57,7 @@ $(call make-launcher, javadoc, com.sun.tools.javadoc.Main, , ) $(call make-launcher, javah, com.sun.tools.javah.Main, , ) $(call make-launcher, javap, com.sun.tools.javap.Main, , ) @@ -30,8 +30,8 @@ -J-Djconsole.showOutputViewer, ) $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , ) diff -Nru openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java ---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java 2009-08-04 14:57:54.000000000 +0100 -+++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java 2009-08-04 14:59:15.000000000 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/applet/AppletPanel.java 2010-07-29 21:55:50.000000000 +0100 ++++ openjdk/jdk/src/share/classes/sun/applet/AppletPanel.java 2010-11-19 15:52:19.339315874 +0000 @@ -67,7 +67,7 @@ /** * The applet (if loaded). @@ -71,8 +71,8 @@ showAppletStatus("notdisposed"); return; diff -Nru openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java ---- openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java 2009-08-04 14:57:54.000000000 +0100 -+++ openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java 2009-08-04 14:59:15.000000000 +0100 +--- openjdk.orig/jdk/src/share/classes/sun/applet/AppletViewerPanel.java 2010-07-29 21:55:50.000000000 +0100 ++++ openjdk/jdk/src/share/classes/sun/applet/AppletViewerPanel.java 2010-11-19 15:52:19.359315121 +0000 @@ -42,25 +42,25 @@ * * @author Arthur van Hoff
--- a/patches/icedtea-gcc-suffix.patch Tue Sep 14 15:59:59 2010 +0100 +++ b/patches/icedtea-gcc-suffix.patch Wed Nov 24 13:13:23 2010 +0000 @@ -1,28 +1,3 @@ -diff -Nru openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk openjdk/corba/make/common/shared/Compiler-gcc.gmk ---- openjdk.orig/corba/make/common/shared/Compiler-gcc.gmk 2009-07-15 17:35:01.000000000 +0100 -+++ openjdk/corba/make/common/shared/Compiler-gcc.gmk 2009-07-23 16:16:30.000000000 +0100 -@@ -58,17 +58,17 @@ - ifeq ($(PLATFORM), linux) - - # Settings specific to Linux -- CC = $(COMPILER_PATH)gcc -- CPP = $(COMPILER_PATH)gcc -E -+ CC = $(COMPILER_PATH)gcc$(GCC_SUFFIX) -+ CPP = $(COMPILER_PATH)gcc$(GCC_SUFFIX) -E - # statically link libstdc++ before C++ ABI is stablized on Linux - STATIC_CXX = true - ifeq ($(STATIC_CXX),true) - # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++" - # We need to use gcc to statically link the C++ runtime. gcc and g++ use - # the same subprocess to compile C++ files, so it is OK to build using gcc. -- CXX = $(COMPILER_PATH)gcc -+ CXX = $(COMPILER_PATH)gcc$(GCC_SUFFIX) - else -- CXX = $(COMPILER_PATH)g++ -+ CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX) - endif - ifeq ($(ZERO_BUILD), true) - # zero diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk --- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2009-03-30 23:08:42.000000000 +0100 +++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2009-07-23 16:16:30.000000000 +0100
--- a/patches/icedtea-lc_ctype.patch Tue Sep 14 15:59:59 2010 +0100 +++ b/patches/icedtea-lc_ctype.patch Wed Nov 24 13:13:23 2010 +0000 @@ -1,23 +1,31 @@ ---- oldopenjdk6/jdk/src/solaris/native/java/lang/java_props_md.c 2008-08-28 04:15:51.000000000 -0400 -+++ openjdk/jdk/src/solaris/native/java/lang/java_props_md.c 2008-09-15 10:37:26.000000000 -0400 -@@ -211,7 +211,9 @@ - * <language name>_<country name>.<encoding name>@<variant name> - * <country name>, <encoding name>, and <variant name> are optional. - */ -- char temp[64]; -+ char * temp; -+ temp = (char*) malloc(strlen(lc)+1); +diff -Nru openjdk.orig/jdk/src/solaris/native/java/lang/java_props_md.c openjdk/jdk/src/solaris/native/java/lang/java_props_md.c +--- openjdk.orig/jdk/src/solaris/native/java/lang/java_props_md.c 2010-11-12 01:20:49.000000000 +0000 ++++ openjdk/jdk/src/solaris/native/java/lang/java_props_md.c 2010-11-12 18:31:00.049493600 +0000 +@@ -118,7 +118,7 @@ + #endif + + static int ParseLocale(int cat, char ** std_language, char ** std_country, char ** std_variant, char ** std_encoding) { +- char temp[64]; ++ char *temp; + char *language = NULL, *country = NULL, *variant = NULL, + *encoding = NULL; + char *p, encoding_variant[64]; +@@ -162,6 +162,7 @@ + * <country name>, <encoding name>, and <variant name> are optional. + */ + ++ temp = (char*) malloc(strlen(lc)+1); + strcpy(temp, lc); + + /* Parse the language, country, encoding, and variant from the +@@ -282,6 +283,10 @@ + #endif + } + ++ ++ /* Free temp */ ++ free(temp); + - char *language = NULL, *country = NULL, *variant = NULL, - *encoding = NULL; - char *std_language = NULL, *std_country = NULL, *std_variant = NULL, -@@ -323,6 +325,9 @@ - /* return same result nl_langinfo would return for en_UK, - * in order to use optimizations. */ - std_encoding = (*p != '\0') ? p : "ISO8859-1"; -+ -+ /* Free temp */ -+ free(temp); + return 1; + } - - #ifdef __linux__
--- a/patches/icedtea-libraries.patch Tue Sep 14 15:59:59 2010 +0100 +++ b/patches/icedtea-libraries.patch Wed Nov 24 13:13:23 2010 +0000 @@ -1,7 +1,7 @@ diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile ---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-09-21 17:09:41.000000000 +0100 -+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-11-04 01:18:41.000000000 +0000 -@@ -74,12 +74,10 @@ +--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2010-07-29 21:55:26.000000000 +0100 ++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2010-11-12 16:49:46.685716881 +0000 +@@ -75,12 +75,10 @@ $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \ $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX) @@ -16,7 +16,7 @@ endif CXXFLAGS_DBG += -DFULL -@@ -98,12 +96,12 @@ +@@ -99,12 +97,12 @@ RES = $(OBJDIR)/$(PGRM).res else LDOUTPUT = -o #Have a space @@ -32,9 +32,9 @@ endif #LINUX endif #PLATFORM diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk ---- openjdk.orig/jdk/make/common/Program.gmk 2009-11-04 00:40:21.000000000 +0000 -+++ openjdk/jdk/make/common/Program.gmk 2009-11-04 01:18:41.000000000 +0000 -@@ -85,7 +85,7 @@ +--- openjdk.orig/jdk/make/common/Program.gmk 2010-07-29 21:55:26.000000000 +0100 ++++ openjdk/jdk/make/common/Program.gmk 2010-11-12 16:49:46.685716881 +0000 +@@ -83,7 +83,7 @@ endif endif ifeq ($(PLATFORM), linux) @@ -43,7 +43,7 @@ LDFLAGS += -Wl,--allow-shlib-undefined LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli -@@ -256,7 +256,6 @@ +@@ -255,7 +255,6 @@ endif OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin @@ -52,9 +52,9 @@ OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"' VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"' diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile ---- openjdk.orig/jdk/make/java/jli/Makefile 2009-11-04 00:40:21.000000000 +0000 -+++ openjdk/jdk/make/java/jli/Makefile 2009-11-04 01:18:41.000000000 +0000 -@@ -44,7 +44,6 @@ +--- openjdk.orig/jdk/make/java/jli/Makefile 2010-07-29 21:55:27.000000000 +0100 ++++ openjdk/jdk/make/java/jli/Makefile 2010-11-12 16:49:46.685716881 +0000 +@@ -45,7 +45,6 @@ include $(BUILDDIR)/common/Defs.gmk @@ -62,7 +62,7 @@ LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin -@@ -69,13 +68,7 @@ +@@ -70,13 +69,7 @@ parse_manifest.c \ version_comp.c \ wildcard.c \ @@ -77,7 +77,7 @@ ifneq ($(PLATFORM), windows) -@@ -100,7 +93,7 @@ +@@ -102,7 +95,7 @@ # Note: its important to keep this order meaning -lc is the # last library otherwise it could cause compatibility issues # by pulling in SUNW_private symbols from libc @@ -86,7 +86,7 @@ ifeq ($(USE_PTHREADS),true) LDLIBS += -lpthread endif # USE_PTHREADS -@@ -124,7 +117,6 @@ +@@ -126,7 +119,6 @@ OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC) @@ -94,15 +94,15 @@ # # Library to compile. -@@ -165,4 +157,4 @@ +@@ -166,4 +158,4 @@ # # Add to ambient vpath so we pick up the library files # -vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC) +vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC) diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk ---- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2009-09-21 17:09:41.000000000 +0100 -+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2010-07-29 21:55:27.000000000 +0100 ++++ openjdk/jdk/make/java/zip/FILES_c.gmk 2010-11-12 16:49:46.685716881 +0000 @@ -29,16 +29,4 @@ Deflater.c \ Inflater.c \ @@ -122,9 +122,9 @@ - zutil.c + zip_util.c diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile ---- openjdk.orig/jdk/make/java/zip/Makefile 2009-09-21 17:09:41.000000000 +0100 -+++ openjdk/jdk/make/java/zip/Makefile 2009-11-04 01:18:41.000000000 +0000 -@@ -71,16 +71,10 @@ +--- openjdk.orig/jdk/make/java/zip/Makefile 2010-07-29 21:55:27.000000000 +0100 ++++ openjdk/jdk/make/java/zip/Makefile 2010-11-12 16:49:46.697716427 +0000 +@@ -72,16 +72,10 @@ CPPFLAGS += -UDEBUG endif @@ -143,8 +143,8 @@ -OTHER_LDLIBS = $(JVMLIB) +OTHER_LDLIBS = $(JVMLIB) -lz diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk ---- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2009-03-30 17:23:03.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2010-07-29 21:55:29.000000000 +0100 ++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2010-11-12 16:49:46.697716427 +0000 @@ -25,51 +25,7 @@ FILES_c = \ @@ -199,9 +199,9 @@ ifndef OPENJDK FILES_c += \ diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile ---- openjdk.orig/jdk/make/sun/jpeg/Makefile 2009-03-30 17:23:03.000000000 +0100 -+++ openjdk/jdk/make/sun/jpeg/Makefile 2009-11-04 01:18:41.000000000 +0000 -@@ -67,6 +67,8 @@ +--- openjdk.orig/jdk/make/sun/jpeg/Makefile 2010-07-29 21:55:29.000000000 +0100 ++++ openjdk/jdk/make/sun/jpeg/Makefile 2010-11-12 16:49:46.697716427 +0000 +@@ -68,6 +68,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk @@ -211,8 +211,8 @@ # Add to ambient vpath to get files in a subdirectory # diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk ---- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2009-09-21 17:09:42.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk 2010-07-29 21:55:29.000000000 +0100 ++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk 2010-11-12 16:49:46.697716427 +0000 @@ -30,79 +30,5 @@ splashscreen_impl.c \ splashscreen_jpeg.c \ @@ -295,9 +295,9 @@ + splashscreen_sys.c diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile ---- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2009-09-21 17:09:42.000000000 +0100 -+++ openjdk/jdk/make/sun/splashscreen/Makefile 2009-11-04 01:18:41.000000000 +0000 -@@ -59,12 +59,12 @@ +--- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2010-07-29 21:55:29.000000000 +0100 ++++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-11-12 16:49:46.697716427 +0000 +@@ -60,12 +60,12 @@ # C Flags # @@ -312,7 +312,7 @@ else # PLATFORM CFLAGS += -DWITH_WIN32 OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll -@@ -76,14 +76,10 @@ +@@ -77,14 +77,10 @@ # vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen vpath %.c $(SHARE_SRC)/native/$(PKGDIR) @@ -328,8 +328,8 @@ # Shun the less than portable MMX assembly code in pnggccrd.c, # and use alternative implementations in C. diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h ---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-08-20 00:00:45.000000000 +0100 -+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-07-29 21:56:11.000000000 +0100 ++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-11-12 16:49:46.697716427 +0000 @@ -89,11 +89,7 @@ // bytes and byte arrays @@ -343,8 +343,8 @@ typedef LONGLONG jlong; typedef DWORDLONG julong; diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2009-03-30 17:23:07.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c 2010-07-29 21:56:11.000000000 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c 2010-11-12 16:49:46.697716427 +0000 @@ -29,7 +29,7 @@ #include "jni.h" @@ -355,8 +355,8 @@ #include "java_util_zip_Adler32.h" diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2009-03-30 17:23:07.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c 2010-07-29 21:56:11.000000000 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c 2010-11-12 16:49:46.697716427 +0000 @@ -29,7 +29,7 @@ #include "jni.h" @@ -367,8 +367,8 @@ #include "java_util_zip_CRC32.h" diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2009-06-30 14:05:51.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c 2010-07-29 21:56:11.000000000 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c 2010-11-12 16:49:46.697716427 +0000 @@ -32,7 +32,7 @@ #include "jlong.h" #include "jni.h" @@ -379,8 +379,8 @@ #include "java_util_zip_Deflater.h" diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2009-06-30 14:05:51.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c 2010-11-12 01:20:49.000000000 +0000 ++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c 2010-11-12 16:49:46.701716276 +0000 @@ -35,7 +35,7 @@ #include "jni.h" #include "jvm.h" @@ -389,10 +389,10 @@ +#include <zlib.h> #include "java_util_zip_Inflater.h" - #define ThrowDataFormatException(env, msg) \ + #define MIN2(x, y) ((x) < (y) ? (x) : (y)) diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c ---- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2009-07-14 09:14:42.000000000 +0100 -+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c 2010-07-29 21:56:11.000000000 +0100 ++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c 2010-11-12 16:49:46.701716276 +0000 @@ -44,7 +44,8 @@ #include "io_util.h" #include "io_util_md.h" @@ -404,8 +404,8 @@ /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */ #ifdef USE_MMAP diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2009-11-03 23:40:31.000000000 +0000 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2010-11-12 01:20:49.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2010-11-12 16:49:46.701716276 +0000 @@ -51,7 +51,9 @@ /* headers from the JPEG library */ @@ -480,7 +480,7 @@ /* * Defined in jpegdecoder.c. Copy code from there if and * when that disappears. */ -@@ -606,7 +664,7 @@ +@@ -609,7 +667,7 @@ return; } @@ -489,7 +489,7 @@ } -@@ -631,7 +689,7 @@ +@@ -634,7 +692,7 @@ return; } @@ -498,7 +498,7 @@ } -@@ -649,7 +707,7 @@ +@@ -652,7 +710,7 @@ free(cinfo->dest); cinfo->dest = NULL; } @@ -507,7 +507,7 @@ free(info); } } -@@ -689,14 +747,14 @@ +@@ -692,14 +750,14 @@ decomp = (j_decompress_ptr) cinfo; if (decomp->quant_tbl_ptrs[i] == NULL) { decomp->quant_tbl_ptrs[i] = @@ -524,7 +524,7 @@ } quant_ptr = comp->quant_tbl_ptrs[i]; } -@@ -787,14 +845,14 @@ +@@ -790,14 +848,14 @@ decomp = (j_decompress_ptr) cinfo; if (decomp->dc_huff_tbl_ptrs[i] == NULL) { decomp->dc_huff_tbl_ptrs[i] = @@ -541,7 +541,7 @@ } huff_ptr = comp->dc_huff_tbl_ptrs[i]; } -@@ -812,14 +870,14 @@ +@@ -815,14 +873,14 @@ decomp = (j_decompress_ptr) cinfo; if (decomp->ac_huff_tbl_ptrs[i] == NULL) { decomp->ac_huff_tbl_ptrs[i] = @@ -558,7 +558,7 @@ } huff_ptr = comp->ac_huff_tbl_ptrs[i]; } -@@ -1379,6 +1437,8 @@ +@@ -1382,6 +1440,8 @@ jclass ImageInputStreamClass, jclass qTableClass, jclass huffClass) { @@ -567,7 +567,7 @@ ImageInputStream_readID = (*env)->GetMethodID(env, ImageInputStreamClass, -@@ -1464,7 +1524,7 @@ +@@ -1468,7 +1528,7 @@ } /* We set up the normal JPEG error routines, then override error_exit. */ @@ -576,7 +576,7 @@ jerr->pub.error_exit = sun_jpeg_error_exit; /* We need to setup our own print routines */ jerr->pub.output_message = sun_jpeg_output_message; -@@ -1481,11 +1541,11 @@ +@@ -1485,11 +1545,11 @@ } /* Perform library initialization */ @@ -590,7 +590,7 @@ /* * Now set up our source. -@@ -1503,7 +1563,7 @@ +@@ -1508,7 +1568,7 @@ cinfo->src->init_source = imageio_init_source; cinfo->src->fill_input_buffer = imageio_fill_input_buffer; cinfo->src->skip_input_data = imageio_skip_input_data; @@ -599,7 +599,7 @@ cinfo->src->term_source = imageio_term_source; /* set up the association to persist for future calls */ -@@ -1622,7 +1682,7 @@ +@@ -1628,7 +1688,7 @@ src->bytes_in_buffer = 0; } @@ -608,7 +608,7 @@ if (ret == JPEG_HEADER_TABLES_ONLY) { retval = JNI_TRUE; -@@ -1751,7 +1811,7 @@ +@@ -1757,7 +1817,7 @@ cinfo->num_components, profileData); if (reset) { @@ -617,7 +617,7 @@ } } -@@ -1947,7 +2007,7 @@ +@@ -1954,7 +2014,7 @@ TRUE); } @@ -626,7 +626,7 @@ if (progressive) { cinfo->buffered_image = TRUE; cinfo->input_scan_number = minProgressivePass+1; // Java count from 0 -@@ -1959,7 +2019,7 @@ +@@ -1966,7 +2026,7 @@ data->streamBuf.suspendable = FALSE; @@ -635,7 +635,7 @@ if (numBands != cinfo->output_components) { JNU_ThrowByName(env, "javax/imageio/IIOException", -@@ -1984,7 +2044,7 @@ +@@ -1991,7 +2051,7 @@ if (progressive) { // initialize the next pass. Note that this skips up to // the first interesting pass. @@ -644,7 +644,7 @@ if (wantUpdates) { (*env)->CallVoidMethod(env, this, JPEGImageReader_passStartedID, -@@ -2000,7 +2060,7 @@ +@@ -2007,7 +2067,7 @@ // Skip until the first interesting line while ((data->abortFlag == JNI_FALSE) && ((jint)cinfo->output_scanline < sourceYStart)) { @@ -653,7 +653,7 @@ } scanlineLimit = sourceYStart+sourceHeight; -@@ -2013,7 +2073,7 @@ +@@ -2020,7 +2080,7 @@ while ((data->abortFlag == JNI_FALSE) && ((jint)cinfo->output_scanline < scanlineLimit)) { @@ -662,7 +662,7 @@ // Now mangle it into our buffer out = data->pixelBuf.buf.bp; -@@ -2061,13 +2121,13 @@ +@@ -2075,13 +2135,13 @@ skipLines = linesLeft; } for(i = 0; i < skipLines; i++) { @@ -679,7 +679,7 @@ || (cinfo->input_scan_number > maxProgressivePass)) { done = TRUE; } -@@ -2087,9 +2147,9 @@ +@@ -2101,9 +2161,9 @@ if (cinfo->output_scanline == cinfo->output_height) { // if ((cinfo->output_scanline == cinfo->output_height) && //(jpeg_input_complete(cinfo))) { // We read the whole file @@ -691,7 +691,7 @@ } free(scanLinePtr); -@@ -2135,7 +2195,7 @@ +@@ -2149,7 +2209,7 @@ cinfo = (j_decompress_ptr) data->jpegObj; @@ -700,7 +700,7 @@ } -@@ -2341,6 +2401,150 @@ +@@ -2355,6 +2415,150 @@ /********************** end of destination manager ************/ @@ -851,7 +851,7 @@ /********************** Writer JNI calls **********************/ -@@ -2352,6 +2548,8 @@ +@@ -2366,6 +2570,8 @@ jclass qTableClass, jclass huffClass) { @@ -860,7 +860,7 @@ ImageOutputStream_writeID = (*env)->GetMethodID(env, IOSClass, "write", -@@ -2425,7 +2623,7 @@ +@@ -2439,7 +2645,7 @@ } /* We set up the normal JPEG error routines, then override error_exit. */ @@ -869,7 +869,7 @@ jerr->pub.error_exit = sun_jpeg_error_exit; /* We need to setup our own print routines */ jerr->pub.output_message = sun_jpeg_output_message; -@@ -2442,7 +2640,7 @@ +@@ -2456,7 +2662,7 @@ } /* Perform library initialization */ @@ -878,7 +878,7 @@ /* Now set up the destination */ dest = malloc(sizeof(struct jpeg_destination_mgr)); -@@ -2551,7 +2749,7 @@ +@@ -2563,7 +2769,7 @@ return; } @@ -887,7 +887,7 @@ data->streamBuf.suspendable = FALSE; if (qtables != NULL) { -@@ -2566,7 +2764,7 @@ +@@ -2578,7 +2784,7 @@ DCHuffmanTables, ACHuffmanTables, TRUE); } @@ -896,7 +896,7 @@ RELEASE_ARRAYS(env, data, NULL); } -@@ -2730,9 +2928,9 @@ +@@ -2750,9 +2956,9 @@ cinfo->input_components = numBands; cinfo->in_color_space = inCs; @@ -908,7 +908,7 @@ cinfo->optimize_coding = optimize; -@@ -2769,7 +2967,7 @@ +@@ -2789,7 +2995,7 @@ (*env)->ReleaseIntArrayElements(env, QtableSelectors, qsels, JNI_ABORT); @@ -917,7 +917,7 @@ qlen = setQTables(env, (j_common_ptr) cinfo, qtables, writeDQT); -@@ -2794,7 +2992,7 @@ +@@ -2814,7 +3020,7 @@ if (progressive) { if (numScans == 0) { // then use default scans @@ -926,7 +926,7 @@ } else { cinfo->num_scans = numScans; // Copy the scanInfo to a local array -@@ -2836,7 +3034,7 @@ +@@ -2856,7 +3062,7 @@ #endif // start the compressor; tables must already be set @@ -935,7 +935,7 @@ if (haveMetadata) { // Flush the buffer -@@ -2897,7 +3095,7 @@ +@@ -2919,7 +3125,7 @@ } } // write it out @@ -944,7 +944,7 @@ targetLine += stepY; } -@@ -2906,9 +3104,9 @@ +@@ -2928,9 +3134,9 @@ * so use jpeg_abort instead of jpeg_finish_compress. */ if (cinfo->next_scanline == cinfo->image_height) { @@ -957,7 +957,7 @@ if (scale != NULL) { diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,284 +0,0 @@ -/* @@ -1245,7 +1245,7 @@ - */ -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,165 +0,0 @@ -/* @@ -1414,7 +1414,7 @@ - return lines_per_iMCU_row; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,453 +0,0 @@ -/* @@ -1871,7 +1871,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jccolor.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,462 +0,0 @@ -/* @@ -2337,7 +2337,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,391 +0,0 @@ -/* @@ -2732,7 +2732,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,913 +0,0 @@ -/* @@ -3649,7 +3649,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jchuff.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -/* @@ -3704,7 +3704,7 @@ -EXTERN(void) jpeg_gen_optimal_table - JPP((j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[])); diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcinit.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -/* @@ -3784,7 +3784,7 @@ - (*cinfo->marker->write_file_header) (cinfo); -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,297 +0,0 @@ -/* @@ -4085,7 +4085,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,682 +0,0 @@ -/* @@ -4771,7 +4771,7 @@ - marker->last_restart_interval = 0; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,594 +0,0 @@ -/* @@ -5369,7 +5369,7 @@ - master->total_passes = cinfo->num_scans; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,110 +0,0 @@ -/* @@ -5483,7 +5483,7 @@ - return tbl; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jconfig.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -/* jconfig.cfg --- source file edited by configure script */ @@ -5530,7 +5530,7 @@ - -#endif /* JPEG_CJPEG_DJPEG */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcparam.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,614 +0,0 @@ -/* @@ -6148,7 +6148,7 @@ - -#endif /* C_PROGRESSIVE_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,837 +0,0 @@ -/* @@ -6989,7 +6989,7 @@ - -#endif /* C_PROGRESSIVE_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,358 +0,0 @@ -/* @@ -7351,7 +7351,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcsample.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,523 +0,0 @@ -/* @@ -7878,7 +7878,7 @@ -#endif -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jctrans.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,392 +0,0 @@ -/* @@ -8274,7 +8274,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,399 +0,0 @@ -/* @@ -8677,7 +8677,7 @@ - return TRUE; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,279 +0,0 @@ -/* @@ -8960,7 +8960,7 @@ - -#endif /* D_MULTISCAN_FILES_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,740 +0,0 @@ -/* @@ -9704,7 +9704,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,398 +0,0 @@ -/* @@ -10106,7 +10106,7 @@ - cinfo->output_components = cinfo->out_color_components; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdct.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdct.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,180 +0,0 @@ -/* @@ -10290,7 +10290,7 @@ -#define MULTIPLY16V16(var1,var2) ((var1) * (var2)) -#endif diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,273 +0,0 @@ -/* @@ -10567,7 +10567,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,655 +0,0 @@ -/* @@ -11226,7 +11226,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdhuff.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,205 +0,0 @@ -/* @@ -11435,7 +11435,7 @@ - JPP((bitread_working_state * state, register bit_buf_type get_buffer, - register int bits_left, d_derived_tbl * htbl, int min_bits)); diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdinput.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,385 +0,0 @@ -/* @@ -11824,7 +11824,7 @@ - inputctl->inheaders = TRUE; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,516 +0,0 @@ -/* @@ -12344,7 +12344,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1384 +0,0 @@ -/* @@ -13732,7 +13732,7 @@ - ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code); -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,561 +0,0 @@ -/* @@ -14297,7 +14297,7 @@ - master_selection(cinfo); -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,404 +0,0 @@ -/* @@ -14705,7 +14705,7 @@ - -#endif /* UPSAMPLE_MERGING_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,672 +0,0 @@ -/* @@ -15381,7 +15381,7 @@ - -#endif /* D_PROGRESSIVE_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,294 +0,0 @@ -/* @@ -15679,7 +15679,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdsample.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,482 +0,0 @@ -/* @@ -16165,7 +16165,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,147 +0,0 @@ -/* @@ -16316,7 +16316,7 @@ - } -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,272 +0,0 @@ -/* @@ -16592,7 +16592,7 @@ - return err; -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.h 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jerror.h 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jerror.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,295 +0,0 @@ -/* @@ -16891,7 +16891,7 @@ - -#endif /* JERROR_H */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,172 +0,0 @@ -/* @@ -17067,7 +17067,7 @@ - -#endif /* DCT_FLOAT_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,228 +0,0 @@ -/* @@ -17299,7 +17299,7 @@ - -#endif /* DCT_IFAST_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,287 +0,0 @@ -/* @@ -17590,7 +17590,7 @@ - -#endif /* DCT_ISLOW_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,246 +0,0 @@ -/* @@ -17840,7 +17840,7 @@ - -#endif /* DCT_FLOAT_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,372 +0,0 @@ -/* @@ -18216,7 +18216,7 @@ - -#endif /* DCT_IFAST_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctint.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,393 +0,0 @@ -/* @@ -18613,7 +18613,7 @@ - -#endif /* DCT_ISLOW_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jidctred.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,402 +0,0 @@ -/* @@ -19019,7 +19019,7 @@ - -#endif /* IDCT_SCALING_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jinclude.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -/* @@ -19118,7 +19118,7 @@ -#define JFWRITE(file,buf,sizeofbuf) \ - ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file))) diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1122 +0,0 @@ -/* @@ -20244,7 +20244,7 @@ - -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -/* @@ -20361,7 +20361,7 @@ - /* no work */ -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmemsys.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,202 +0,0 @@ -/* @@ -20567,7 +20567,7 @@ -EXTERN(long) jpeg_mem_init JPP((j_common_ptr cinfo)); -EXTERN(void) jpeg_mem_term JPP((j_common_ptr cinfo)); diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,375 +0,0 @@ -/* @@ -20946,8 +20946,8 @@ - -#endif /* JPEG_INTERNAL_OPTIONS */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2009-03-30 17:23:07.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2010-07-29 21:56:12.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2010-11-12 16:49:46.717715668 +0000 @@ -45,7 +45,9 @@ #undef boolean #undef FAR @@ -21069,7 +21069,7 @@ sendHeaderInfoID = (*env)->GetMethodID(env, cls, "sendHeaderInfo", "(IIZZZ)Z"); sendPixelsByteID = (*env)->GetMethodID(env, cls, "sendPixels", "([BI)Z"); -@@ -519,7 +609,7 @@ +@@ -519,7 +617,7 @@ /* Step 1: allocate and initialize JPEG decompression object */ /* We set up the normal JPEG error routines, then override error_exit. */ @@ -21078,7 +21078,7 @@ jerr.pub.error_exit = sun_jpeg_error_exit; /* We need to setup our own print routines */ -@@ -530,7 +620,7 @@ +@@ -530,7 +628,7 @@ /* If we get here, the JPEG code has signaled an error. * We need to clean up the JPEG object, close the input file, and return. */ @@ -21087,7 +21087,7 @@ RELEASE_ARRAYS(env, &jsrc); if (!(*env)->ExceptionOccurred(env)) { char buffer[JMSG_LENGTH_MAX]; -@@ -541,7 +631,7 @@ +@@ -541,7 +639,7 @@ return; } /* Now we can initialize the JPEG decompression object. */ @@ -21096,7 +21096,7 @@ /* Step 2: specify data source (eg, a file) */ -@@ -555,17 +645,17 @@ +@@ -555,17 +653,17 @@ jsrc.pub.init_source = sun_jpeg_init_source; jsrc.pub.fill_input_buffer = sun_jpeg_fill_input_buffer; jsrc.pub.skip_input_data = sun_jpeg_skip_input_data; @@ -21118,7 +21118,7 @@ grayscale = (cinfo.out_color_space == JCS_GRAYSCALE); #ifdef YCCALPHA hasalpha = (cinfo.out_color_space == JCS_RGBA); -@@ -584,7 +674,7 @@ +@@ -584,7 +682,7 @@ grayscale, hasalpha, buffered_mode); if ((*env)->ExceptionOccurred(env) || !ret) { /* No more interest in this image... */ @@ -21127,7 +21127,7 @@ return; } /* Make a one-row-high sample array with enough room to expand to ints */ -@@ -595,7 +685,7 @@ +@@ -595,7 +693,7 @@ } if (jsrc.hOutputBuffer == 0 || !GET_ARRAYS(env, &jsrc)) { @@ -21136,7 +21136,7 @@ return; } -@@ -613,7 +703,7 @@ +@@ -613,7 +711,7 @@ /* Step 5: Start decompressor */ @@ -21145,7 +21145,7 @@ /* We may need to do some setup of our own at this point before reading * the data. After jpeg_start_decompress() we have the correct scaled -@@ -638,28 +728,28 @@ +@@ -638,28 +736,28 @@ do { sun_jpeg_fill_suspended_buffer(&cinfo); jsrc.suspendable = TRUE; @@ -21178,7 +21178,7 @@ if (grayscale) { RELEASE_ARRAYS(env, &jsrc); -@@ -695,18 +785,18 @@ +@@ -695,18 +793,18 @@ if ((*env)->ExceptionOccurred(env) || !ret || !GET_ARRAYS(env, &jsrc)) { /* No more interest in this image... */ @@ -21200,7 +21200,7 @@ /* We can ignore the return value since suspension is not possible * with the stdio data source. * (nor with the Java data source) -@@ -715,7 +805,7 @@ +@@ -715,7 +813,7 @@ /* Step 8: Release JPEG decompression object */ /* This is an important step since it will release a good deal of memory. */ @@ -21210,7 +21210,7 @@ /* After finish_decompress, we can close the input file. * Here we postpone it until after no more JPEG errors are possible, diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpegint.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,396 +0,0 @@ -/* @@ -21610,7 +21610,7 @@ -#endif -#endif /* INCOMPLETE_TYPES_BROKEN */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,1100 +0,0 @@ -/* @@ -22714,7 +22714,7 @@ - -#endif /* JPEGLIB_H */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant1.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,860 +0,0 @@ -/* @@ -23578,7 +23578,7 @@ - -#endif /* QUANT_1PASS_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jquant2.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1314 +0,0 @@ -/* @@ -24896,7 +24896,7 @@ - -#endif /* QUANT_2PASS_SUPPORTED */ diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jutils.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/jutils.c ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jutils.c 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jutils.c 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jutils.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,183 +0,0 @@ -/* @@ -25083,7 +25083,7 @@ -#endif -} diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jversion.h openjdk/jdk/src/share/native/sun/awt/image/jpeg/jversion.h ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jversion.h 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/jversion.h 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/jversion.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -/* @@ -25105,7 +25105,7 @@ - -#define JCOPYRIGHT "Copyright (C) 1998, Thomas G. Lane" diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/README openjdk/jdk/src/share/native/sun/awt/image/jpeg/README ---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/README 2009-03-30 17:23:07.000000000 +0100 +--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/README 2010-06-15 16:55:03.000000000 +0100 +++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,385 +0,0 @@ -The Independent JPEG Group's JPEG software @@ -25494,8 +25494,8 @@ - -Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net. diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c ---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2009-05-08 16:10:59.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2010-11-12 01:20:49.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2010-11-12 16:49:46.721715517 +0000 @@ -26,7 +26,7 @@ #include "splashscreen_impl.h" #include "splashscreen_gfx.h" @@ -25506,8 +25506,8 @@ #define GIF_TRANSPARENT 0x01 #define GIF_USER_INPUT 0x02 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c ---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2009-08-20 00:00:45.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2010-07-29 21:56:12.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c 2010-11-12 16:49:46.721715517 +0000 @@ -25,9 +25,8 @@ #include "splashscreen_impl.h" @@ -25538,8 +25538,8 @@ src = (stream_src_ptr) cinfo->src; diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c ---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2009-04-14 16:51:17.000000000 +0100 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2009-11-04 01:18:41.000000000 +0000 +--- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2010-07-29 21:56:12.000000000 +0100 ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c 2010-11-12 16:49:46.721715517 +0000 @@ -25,7 +25,7 @@ #include "splashscreen_impl.h"
--- a/patches/icedtea-stroker-finish.patch Tue Sep 14 15:59:59 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ ---- openjdk6/jdk/src/share/classes/sun/java2d/pisces/Stroker.java -+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Stroker.java -@@ -695,7 +695,7 @@ - long ldx = (long)(px0 - x0); - long ldy = (long)(py0 - y0); - long llen = lineLength(ldx, ldy); -- long s = (long)lineWidth2*65536/llen; -+ long s = (llen == 0) ? 0 : (long)lineWidth2*65536/llen; - - int capx = x0 - (int)(ldx*s >> 16); - int capy = y0 - (int)(ldy*s >> 16); -@@ -717,7 +717,7 @@ - long ldx = (long)(sx1 - sx0); - long ldy = (long)(sy1 - sy0); - long llen = lineLength(ldx, ldy); -- long s = (long)lineWidth2*65536/llen; -+ long s = (llen == 0) ? 0 : (long)lineWidth2*65536/llen; - - int capx = sx0 - (int)(ldx*s >> 16); - int capy = sy0 - (int)(ldy*s >> 16);
--- a/patches/sh4-support.patch Tue Sep 14 15:59:59 2010 +0100 +++ b/patches/sh4-support.patch Wed Nov 24 13:13:23 2010 +0000 @@ -1,33 +1,3 @@ -diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk ---- openjdk.orig/corba/make/common/Defs-linux.gmk 2010-09-01 17:36:18.000000000 +0100 -+++ openjdk/corba/make/common/Defs-linux.gmk 2010-09-01 17:57:24.737476265 +0100 -@@ -109,6 +109,7 @@ - LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 - CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 - LDFLAGS_COMMON_sparc += -m32 -mcpu=v9 -+CFLAGS_REQUIRED_sh += -mieee - ifeq ($(ZERO_BUILD), true) - CFLAGS_REQUIRED = $(ZERO_ARCHFLAG) - ifeq ($(ZERO_ENDIANNESS), little) -@@ -188,11 +189,15 @@ - - CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' - --# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here) --ifneq ($(ARCH),alpha) -- CPP_ARCH_FLAGS += -D$(ARCH) -+# Alpha and sh archs do not like "alpha" or "sh" defined (potential general arch cleanup issue here) -+ifeq ($(ARCH),alpha) -+ CPP_ARCH_FLAGS += -D_$(ARCH)_ - else -+ifeq ($(ARCH),sh) - CPP_ARCH_FLAGS += -D_$(ARCH)_ -+else -+ CPP_ARCH_FLAGS += -D$(ARCH) -+endif - endif - - CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \ diff -Nru openjdk.orig/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk --- openjdk.orig/corba/make/common/shared/Platform.gmk 2010-09-01 17:36:18.000000000 +0100 +++ openjdk/corba/make/common/shared/Platform.gmk 2010-09-01 17:44:42.267438042 +0100