Mercurial > hg > release > icedtea6-1.4
changeset 1227:11c9f28891ca
2008-11-28 Gary Benson <gbenson@redhat.com>
PR icedtea/261:
* patches/icedtea-ecj-pr261.patch: New file.
* Makefile.am (ICEDTEA_ECJ_PATCHES): Apply the above.
* HACKING: Document the above.
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Fri, 28 Nov 2008 09:41:20 -0500 |
| parents | 87340a659b5a |
| children | 8ce80b4e9a73 |
| files | ChangeLog HACKING Makefile.am patches/icedtea-ecj-pr261.patch |
| diffstat | 4 files changed, 51 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Nov 28 12:09:58 2008 +0100 +++ b/ChangeLog Fri Nov 28 09:41:20 2008 -0500 @@ -1,3 +1,10 @@ +2008-11-28 Gary Benson <gbenson@redhat.com> + + PR icedtea/261: + * patches/icedtea-ecj-pr261.patch: New file. + * Makefile.am (ICEDTEA_ECJ_PATCHES): Apply the above. + * HACKING: Document the above. + 2008-11-28 Mark Wielaard <mark@klomp.org> * autogen.sh: Check for autoconf > 2.61.
--- a/HACKING Fri Nov 28 12:09:58 2008 +0100 +++ b/HACKING Fri Nov 28 09:41:20 2008 -0500 @@ -94,7 +94,8 @@ javac executable with Ant, remove -Werror from javac call, don't build JDK demos, don't run sun.awt.X11.ToBin, explicitly pull in timezone data and rt.jar in javac calls, replace hexadecimal floating point literals with decimal variants in - java.lang.Double and java.lang.Float. + java.lang.Double and java.lang.Float. +* icedtea-ecj-pr261.patch: Adds a couple of classes that are omitted from rt.jar. The following patches are only applied for IcedTea builds using the zero-assembler:
--- a/Makefile.am Fri Nov 28 12:09:58 2008 +0100 +++ b/Makefile.am Fri Nov 28 09:41:20 2008 -0500 @@ -776,7 +776,8 @@ # Patch OpenJDK for plug replacements and ecj. ICEDTEA_ECJ_PATCHES = patches/icedtea-ecj.patch \ patches/icedtea-ecj-spp.patch \ - patches/icedtea-ecj-jopt.patch + patches/icedtea-ecj-jopt.patch \ + patches/icedtea-ecj-pr261.patch stamps/patch-ecj.stamp: stamps/extract-ecj.stamp mkdir -p stamps; \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-ecj-pr261.patch Fri Nov 28 09:41:20 2008 -0500 @@ -0,0 +1,40 @@ +diff -r fa4572c7c75f openjdk-ecj/jdk/make/java/nio/Makefile +--- openjdk-ecj/jdk/make/java/nio/Makefile Thu Nov 27 08:42:23 2008 +0000 ++++ openjdk-ecj/jdk/make/java/nio/Makefile Thu Nov 27 10:12:08 2008 +0000 +@@ -85,6 +85,9 @@ ifeq ($(PLATFORM), linux) + ifeq ($(PLATFORM), linux) + FILES_java += \ + sun/nio/ch/AbstractPollSelectorImpl.java \ ++ sun/nio/ch/DevPollArrayWrapper.java \ ++ sun/nio/ch/DevPollSelectorImpl.java \ ++ sun/nio/ch/DevPollSelectorProvider.java \ + sun/nio/ch/EPollArrayWrapper.java \ + sun/nio/ch/EPollSelectorProvider.java \ + sun/nio/ch/EPollSelectorImpl.java \ +@@ -99,6 +102,7 @@ FILES_c += \ + NativeThread.c + + FILES_export += \ ++ sun/nio/ch/DevPollArrayWrapper.java \ + sun/nio/ch/EPollArrayWrapper.java \ + sun/nio/ch/InheritedChannel.java \ + sun/nio/ch/NativeThread.java +diff -r 3ee709488c6c openjdk-ecj/jdk/make/java/nio/FILES_java.gmk +--- openjdk-ecj/jdk/make/java/nio/FILES_java.gmk Thu Nov 27 10:16:56 2008 +0000 ++++ openjdk-ecj/jdk/make/java/nio/FILES_java.gmk Thu Nov 27 11:08:57 2008 +0000 +@@ -31,6 +31,7 @@ FILES_src = \ + java/nio/StringCharBuffer.java \ + \ + java/nio/channels/ByteChannel.java \ ++ java/nio/channels/CancelledKeyException.java \ + java/nio/channels/Channel.java \ + java/nio/channels/Channels.java \ + java/nio/channels/DatagramChannel.java \ +@@ -38,6 +39,7 @@ FILES_src = \ + java/nio/channels/FileLock.java \ + java/nio/channels/GatheringByteChannel.java \ + java/nio/channels/InterruptibleChannel.java \ ++ java/nio/channels/Pipe.java \ + java/nio/channels/ReadableByteChannel.java \ + java/nio/channels/ScatteringByteChannel.java \ + java/nio/channels/SelectableChannel.java \