changeset in /hg/icedtea: Bump to b42.
Andrew John Hughes
gnu_andrew at member.fsf.org
Fri Dec 19 17:40:57 PST 2008
changeset e1279da5a00d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e1279da5a00d
description:
Bump to b42.
2008-12-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
* HACKING: Updated.
* Makefile.am: Bump to b42.
* generated/java/nio/DirectByteBuffer.java,
* generated/java/nio/DirectCharBufferS.java,
* generated/java/nio/DirectCharBufferU.java,
* generated/java/nio/DirectDoubleBufferS.java,
* generated/java/nio/DirectDoubleBufferU.java,
* generated/java/nio/DirectFloatBufferS.java,
* generated/java/nio/DirectFloatBufferU.java,
* generated/java/nio/DirectIntBufferS.java,
* generated/java/nio/DirectIntBufferU.java,
* generated/java/nio/DirectLongBufferS.java,
* generated/java/nio/DirectLongBufferU.java,
* generated/java/nio/DirectShortBufferS.java,
* generated/java/nio/DirectShortBufferU.java,
* generated/java/nio/HeapByteBuffer.java,
* generated/java/nio/HeapCharBuffer.java,
* generated/java/nio/HeapDoubleBuffer.java,
* generated/java/nio/HeapFloatBuffer.java,
* generated/java/nio/HeapIntBuffer.java,
* generated/java/nio/HeapLongBuffer.java,
* generated/java/nio/HeapShortBuffer.java:
Use discardMark() from the S6593946 fix rather than
our own clearMark() (identical other than in name).
* patches/icedtea-bytebuffer-compact.patch:
Remove fixes to template files and addition of the
clearMark() method as these are fixed by S6593946.
Keep the mark = -1/discardMark changes as this is a
cleaner solution.
* patches/icedtea-version.patch:
Remove mjw's patch. Applied upstream as S6775152.
diffstat:
25 files changed, 68 insertions(+), 74 deletions(-)
ChangeLog | 34 ++++++++++++++++++++++
HACKING | 6 ++--
Makefile.am | 6 ++--
generated/java/nio/DirectByteBuffer.java | 2 -
generated/java/nio/DirectCharBufferS.java | 2 -
generated/java/nio/DirectCharBufferU.java | 2 -
generated/java/nio/DirectDoubleBufferS.java | 2 -
generated/java/nio/DirectDoubleBufferU.java | 2 -
generated/java/nio/DirectFloatBufferS.java | 2 -
generated/java/nio/DirectFloatBufferU.java | 2 -
generated/java/nio/DirectIntBufferS.java | 2 -
generated/java/nio/DirectIntBufferU.java | 2 -
generated/java/nio/DirectLongBufferS.java | 2 -
generated/java/nio/DirectLongBufferU.java | 2 -
generated/java/nio/DirectShortBufferS.java | 2 -
generated/java/nio/DirectShortBufferU.java | 2 -
generated/java/nio/HeapByteBuffer.java | 2 -
generated/java/nio/HeapCharBuffer.java | 2 -
generated/java/nio/HeapDoubleBuffer.java | 2 -
generated/java/nio/HeapFloatBuffer.java | 2 -
generated/java/nio/HeapIntBuffer.java | 2 -
generated/java/nio/HeapLongBuffer.java | 2 -
generated/java/nio/HeapShortBuffer.java | 2 -
patches/icedtea-bytebuffer-compact.patch | 40 ++++-----------------------
patches/icedtea-version.patch | 16 ----------
diffs (421 lines):
diff -r d9eec6614be5 -r e1279da5a00d ChangeLog
--- a/ChangeLog Tue Dec 09 20:39:31 2008 +0000
+++ b/ChangeLog Sat Dec 20 01:40:44 2008 +0000
@@ -1,3 +1,37 @@ 2008-12-09 Mark Wielaard <mark at klomp.o
+2008-12-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * HACKING: Updated.
+ * Makefile.am: Bump to b42.
+ * generated/java/nio/DirectByteBuffer.java,
+ * generated/java/nio/DirectCharBufferS.java,
+ * generated/java/nio/DirectCharBufferU.java,
+ * generated/java/nio/DirectDoubleBufferS.java,
+ * generated/java/nio/DirectDoubleBufferU.java,
+ * generated/java/nio/DirectFloatBufferS.java,
+ * generated/java/nio/DirectFloatBufferU.java,
+ * generated/java/nio/DirectIntBufferS.java,
+ * generated/java/nio/DirectIntBufferU.java,
+ * generated/java/nio/DirectLongBufferS.java,
+ * generated/java/nio/DirectLongBufferU.java,
+ * generated/java/nio/DirectShortBufferS.java,
+ * generated/java/nio/DirectShortBufferU.java,
+ * generated/java/nio/HeapByteBuffer.java,
+ * generated/java/nio/HeapCharBuffer.java,
+ * generated/java/nio/HeapDoubleBuffer.java,
+ * generated/java/nio/HeapFloatBuffer.java,
+ * generated/java/nio/HeapIntBuffer.java,
+ * generated/java/nio/HeapLongBuffer.java,
+ * generated/java/nio/HeapShortBuffer.java:
+ Use discardMark() from the S6593946 fix rather than
+ our own clearMark() (identical other than in name).
+ * patches/icedtea-bytebuffer-compact.patch:
+ Remove fixes to template files and addition of the
+ clearMark() method as these are fixed by S6593946.
+ Keep the mark = -1/discardMark changes as this is a
+ cleaner solution.
+ * patches/icedtea-version.patch:
+ Remove mjw's patch. Applied upstream as S6775152.
+
2008-12-09 Mark Wielaard <mark at klomp.org>
* Makefile.am:
diff -r d9eec6614be5 -r e1279da5a00d HACKING
--- a/HACKING Tue Dec 09 20:39:31 2008 +0000
+++ b/HACKING Sat Dec 20 01:40:44 2008 +0000
@@ -13,11 +13,12 @@ The fsg.sh script is also run to delete
The fsg.sh script is also run to delete certain files with dubious licensing and/or only occuring
in binary format.
-The following patches are currently applied before the building of OpenJDK or OpenJDK6 by IcedTea:
+The following patches are currently applied before the building of OpenJDK7 or OpenJDK6 by IcedTea:
* icedtea-ant.patch: Remove use of $(ANT_HOME).
* icedtea-uname.patch: Handle output of uname on arm and mips{,el}.
-* icedtea-bytebuffer-compact.patch: Add clearMark() method to java.nio.Buffer (PR60).
+* icedtea-bytebuffer-compact.patch: Add clearMark() method to java.nio.Buffer (PR60/S6593946).
+ Partially fixed by addition of discardMark() in OpenJDK7.
* icedtea-copy-plugs.patch: Add IcedTea's 'plugs' for Java WebStart support, add
cast to getAnnotation and trapAuthenticationFailure variable to com.sun.jmx.snmp.SnmpPduTrap.
* icedtea-core-build.patch: Add support for building IcedTea core VM.
@@ -92,6 +93,7 @@ The following patches are only applied t
* icedtea-6700047-loopopts.patch: Fix partial peeling issue, bug #6700047.
* icedtea-6712835-ifnode.patch: Fix infinite loop in PhaseIterGVN::transform.
* icedtea-timerqueue.patch: Fix setting of running variable (PR87/S6623943).
+* icedtea-version.patch: Fix (langtools) ant build to honor fcs MILESTONE setting (S6778493).
The following patches are only applied to OpenJDK in IcedTea:
diff -r d9eec6614be5 -r e1279da5a00d Makefile.am
--- a/Makefile.am Tue Dec 09 20:39:31 2008 +0000
+++ b/Makefile.am Sat Dec 20 01:40:44 2008 +0000
@@ -1,6 +1,6 @@ OPENJDK_DATE = 20_nov_2008
-OPENJDK_DATE = 20_nov_2008
-OPENJDK_MD5SUM = b55ade3ce62c4325d5128c7ce67873d7
-OPENJDK_VERSION = b40
+OPENJDK_DATE = 18_dec_2008
+OPENJDK_MD5SUM = 58eb1ce25381165b7b63e5df0a6b94d4
+OPENJDK_VERSION = b42
CACAO_VERSION = 0.99.3
CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectByteBuffer.java
--- a/generated/java/nio/DirectByteBuffer.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectByteBuffer.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectByteBuffer
unsafe.copyMemory(ix(pos), ix(0), rem << 0);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectCharBufferS.java
--- a/generated/java/nio/DirectCharBufferS.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectCharBufferS.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectCharBufferS
unsafe.copyMemory(ix(pos), ix(0), rem << 1);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectCharBufferU.java
--- a/generated/java/nio/DirectCharBufferU.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectCharBufferU.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectCharBufferU
unsafe.copyMemory(ix(pos), ix(0), rem << 1);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectDoubleBufferS.java
--- a/generated/java/nio/DirectDoubleBufferS.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectDoubleBufferS.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectDoubleBufferS
unsafe.copyMemory(ix(pos), ix(0), rem << 3);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectDoubleBufferU.java
--- a/generated/java/nio/DirectDoubleBufferU.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectDoubleBufferU.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectDoubleBufferU
unsafe.copyMemory(ix(pos), ix(0), rem << 3);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectFloatBufferS.java
--- a/generated/java/nio/DirectFloatBufferS.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectFloatBufferS.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectFloatBufferS
unsafe.copyMemory(ix(pos), ix(0), rem << 2);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectFloatBufferU.java
--- a/generated/java/nio/DirectFloatBufferU.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectFloatBufferU.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectFloatBufferU
unsafe.copyMemory(ix(pos), ix(0), rem << 2);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectIntBufferS.java
--- a/generated/java/nio/DirectIntBufferS.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectIntBufferS.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectIntBufferS
unsafe.copyMemory(ix(pos), ix(0), rem << 2);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectIntBufferU.java
--- a/generated/java/nio/DirectIntBufferU.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectIntBufferU.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectIntBufferU
unsafe.copyMemory(ix(pos), ix(0), rem << 2);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectLongBufferS.java
--- a/generated/java/nio/DirectLongBufferS.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectLongBufferS.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectLongBufferS
unsafe.copyMemory(ix(pos), ix(0), rem << 3);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectLongBufferU.java
--- a/generated/java/nio/DirectLongBufferU.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectLongBufferU.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectLongBufferU
unsafe.copyMemory(ix(pos), ix(0), rem << 3);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectShortBufferS.java
--- a/generated/java/nio/DirectShortBufferS.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectShortBufferS.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectShortBufferS
unsafe.copyMemory(ix(pos), ix(0), rem << 1);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/DirectShortBufferU.java
--- a/generated/java/nio/DirectShortBufferU.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/DirectShortBufferU.java Sat Dec 20 01:40:44 2008 +0000
@@ -365,7 +365,7 @@ class DirectShortBufferU
unsafe.copyMemory(ix(pos), ix(0), rem << 1);
position(rem);
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/HeapByteBuffer.java
--- a/generated/java/nio/HeapByteBuffer.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/HeapByteBuffer.java Sat Dec 20 01:40:44 2008 +0000
@@ -222,7 +222,7 @@ class HeapByteBuffer
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/HeapCharBuffer.java
--- a/generated/java/nio/HeapCharBuffer.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/HeapCharBuffer.java Sat Dec 20 01:40:44 2008 +0000
@@ -222,7 +222,7 @@ class HeapCharBuffer
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/HeapDoubleBuffer.java
--- a/generated/java/nio/HeapDoubleBuffer.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/HeapDoubleBuffer.java Sat Dec 20 01:40:44 2008 +0000
@@ -222,7 +222,7 @@ class HeapDoubleBuffer
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/HeapFloatBuffer.java
--- a/generated/java/nio/HeapFloatBuffer.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/HeapFloatBuffer.java Sat Dec 20 01:40:44 2008 +0000
@@ -222,7 +222,7 @@ class HeapFloatBuffer
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/HeapIntBuffer.java
--- a/generated/java/nio/HeapIntBuffer.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/HeapIntBuffer.java Sat Dec 20 01:40:44 2008 +0000
@@ -222,7 +222,7 @@ class HeapIntBuffer
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/HeapLongBuffer.java
--- a/generated/java/nio/HeapLongBuffer.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/HeapLongBuffer.java Sat Dec 20 01:40:44 2008 +0000
@@ -222,7 +222,7 @@ class HeapLongBuffer
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d generated/java/nio/HeapShortBuffer.java
--- a/generated/java/nio/HeapShortBuffer.java Tue Dec 09 20:39:31 2008 +0000
+++ b/generated/java/nio/HeapShortBuffer.java Sat Dec 20 01:40:44 2008 +0000
@@ -222,7 +222,7 @@ class HeapShortBuffer
System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
position(remaining());
limit(capacity());
- clearMark();
+ discardMark();
return this;
diff -r d9eec6614be5 -r e1279da5a00d patches/icedtea-bytebuffer-compact.patch
--- a/patches/icedtea-bytebuffer-compact.patch Tue Dec 09 20:39:31 2008 +0000
+++ b/patches/icedtea-bytebuffer-compact.patch Sat Dec 20 01:40:44 2008 +0000
@@ -6,7 +6,7 @@
position = newPosition;
- if (mark > position) mark = -1;
- return this;
-+ if (mark > position) clearMark();
++ if (mark > position) discardMark();
+ return this;
}
@@ -17,7 +17,7 @@
if (position > limit) position = limit;
- if (mark > limit) mark = -1;
- return this;
-+ if (mark > position) clearMark();
++ if (mark > position) discardMark();
+ return this;
}
@@ -28,7 +28,7 @@
limit = capacity;
- mark = -1;
- return this;
-+ clearMark();
++ discardMark();
+ return this;
}
@@ -38,7 +38,7 @@
limit = position;
position = 0;
- mark = -1;
-+ clearMark();
++ discardMark();
return this;
}
@@ -47,36 +47,8 @@
public final Buffer rewind() {
position = 0;
- mark = -1;
-+ clearMark();
++ discardMark();
return this;
}
-@@ -547,4 +547,8 @@
- throw new IndexOutOfBoundsException();
- }
-
-+ final void clearMark() { // package-private
-+ mark = -1;
-+ }
-+
- }
---- ../openjdkb23/openjdk.old/jdk/src/share/classes/java/nio/Direct-X-Buffer.java 2007-10-30 04:36:08.000000000 -0400
-+++ openjdk/jdk/src/share/classes/java/nio/Direct-X-Buffer.java 2007-11-13 13:34:14.000000000 -0500
-@@ -354,6 +354,7 @@
- unsafe.copyMemory(ix(pos), ix(0), rem << $LG_BYTES_PER_VALUE$);
- position(rem);
- limit(capacity());
-+ clearMark();
- return this;
- #else[rw]
- throw new ReadOnlyBufferException();
---- ../openjdkb23/openjdk.old/jdk/src/share/classes/java/nio/Heap-X-Buffer.java 2007-10-30 04:36:08.000000000 -0400
-+++ openjdk/jdk/src/share/classes/java/nio/Heap-X-Buffer.java 2007-11-13 13:34:27.000000000 -0500
-@@ -222,6 +222,7 @@
- System.arraycopy(hb, ix(position()), hb, ix(0), remaining());
- position(remaining());
- limit(capacity());
-+ clearMark();
- return this;
- #else[rw]
- throw new ReadOnlyBufferException();
+
diff -r d9eec6614be5 -r e1279da5a00d patches/icedtea-version.patch
--- a/patches/icedtea-version.patch Tue Dec 09 20:39:31 2008 +0000
+++ b/patches/icedtea-version.patch Sat Dec 20 01:40:44 2008 +0000
@@ -12,18 +12,4 @@ diff -Nru openjdk.orig/jdk/make/common/s
PRODUCT_SUFFIX = Runtime Environment
JDK_RC_PLATFORM_NAME = Platform
COMPANY_NAME = N/A
-diff -Nru openjdk.orig/langtools/make/Makefile openjdk/langtools/make/Makefile
---- openjdk.orig/langtools/make/Makefile 2008-11-19 12:16:39.000000000 +0000
-+++ openjdk/langtools/make/Makefile 2008-11-19 12:17:38.000000000 +0000
-@@ -82,7 +82,11 @@
- endif
-
- ifdef MILESTONE
-+ifneq ($(MILESTONE),fcs)
- ANT_OPTIONS += -Dmilestone=$(MILESTONE)
-+else
-+ ANT_OPTIONS += -Drelease=$(JDK_VERSION)
-+endif
- endif
-
- ifdef BUILD_NUMBER
+
More information about the distro-pkg-dev
mailing list