/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Dec 26 06:30:33 PST 2013
changeset dc90cfc3e8a1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=dc90cfc3e8a1
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Dec 26 14:05:20 2013 +0000
Fix test in 8003992 to build on OpenJDK 6.
2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add patch.
* patches/8003992_support_6.patch:
Fix test in 8003992 to build on OpenJDK 6
by removing multi-catch and NIO2.
changeset 4072a64e3f8e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4072a64e3f8e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Dec 26 14:30:15 2013 +0000
Drop extra argument to compile_method, removed in 7083786, from sharkCompiler.cpp.
2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add patch.
* patches/shark-drop_compile_method_arg_following_7083786.patch:
Drop extra argument to compile_method from
sharkCompiler.cpp which was removed in 7083786.
* NEWS: Updated.
diffstat:
ChangeLog | 17 ++++
Makefile.am | 4 +-
NEWS | 1 +
patches/8003992_support_6.patch | 41 +++++++++++
patches/shark-drop_compile_method_arg_following_7083786.patch | 11 ++
5 files changed, 73 insertions(+), 1 deletions(-)
diffs (109 lines):
diff -r 8b6b7d640684 -r 4072a64e3f8e ChangeLog
--- a/ChangeLog Thu Dec 26 12:27:55 2013 +0000
+++ b/ChangeLog Thu Dec 26 14:30:15 2013 +0000
@@ -1,3 +1,20 @@
+2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patch.
+ * patches/shark-drop_compile_method_arg_following_7083786.patch:
+ Drop extra argument to compile_method, removed
+ in 7083786, from sharkCompiler.cpp.
+ * NEWS: Updated.
+
+2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patch.
+ * patches/8003992_support_6.patch:
+ Fix test in 8003992 to build on OpenJDK 6
+ by removing multi-catch and NIO2.
+
2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r 8b6b7d640684 -r 4072a64e3f8e Makefile.am
--- a/Makefile.am Thu Dec 26 12:27:55 2013 +0000
+++ b/Makefile.am Thu Dec 26 14:30:15 2013 +0000
@@ -633,7 +633,9 @@
patches/d729448-32_bit_alignment.patch \
patches/windows-awt.patch \
patches/windows-jdk-sizecalc.patch \
- patches/shark_fixes_from_8003868.patch
+ patches/shark_fixes_from_8003868.patch \
+ patches/8003992_support_6.patch \
+ patches/shark-drop_compile_method_arg_following_7083786.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 8b6b7d640684 -r 4072a64e3f8e NEWS
--- a/NEWS Thu Dec 26 12:27:55 2013 +0000
+++ b/NEWS Thu Dec 26 14:30:15 2013 +0000
@@ -887,6 +887,7 @@
- RH991170: java does not use correct kerberos credential cache
- PR1535: Allow use of system Kerberos to obtain cache location
- PR1627: JDK check should depend on bootstrapping check
+ - Fix Shark hs23 build failures (missing EliminateNestedLocks and extra argument to compile_method)
* JamVM
- JEP 171: Implement fence methods in sun.misc.Unsafe
- sun.misc.Unsafe: additional methods get/putAddress
diff -r 8b6b7d640684 -r 4072a64e3f8e patches/8003992_support_6.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/8003992_support_6.patch Thu Dec 26 14:30:15 2013 +0000
@@ -0,0 +1,41 @@
+diff -r 008e31b76d41 test/java/io/File/NulFile.java
+--- openjdk/jdk/test/java/io/File/NulFile.java Tue Oct 29 04:10:31 2013 +0000
++++ openjdk/jdk/test/java/io/File/NulFile.java Thu Dec 26 13:57:43 2013 +0000
+@@ -37,7 +37,6 @@
+ import java.io.FilenameFilter;
+ import java.io.IOException;
+ import java.net.MalformedURLException;
+-import java.nio.file.InvalidPathException;
+ import java.io.ByteArrayInputStream;
+ import java.io.ByteArrayOutputStream;
+ import java.io.ObjectOutputStream;
+@@ -528,17 +527,6 @@
+ throw new RuntimeException(
+ "File path should contain Nul character");
+ }
+- // toPath()
+- try {
+- exceptionThrown = false;
+- testFile.toPath();
+- } catch (InvalidPathException ex) {
+- exceptionThrown = true;
+- }
+- if (!exceptionThrown) {
+- throw new RuntimeException("toPath() should throw"
+- + " InvalidPathException");
+- }
+ }
+
+ private static void testSerialization(File testFile) {
+@@ -561,7 +549,10 @@
+ "Serialization should not change file path");
+ }
+ test(newFile, false);
+- } catch (IOException | ClassNotFoundException ex) {
++ } catch (IOException ex) {
++ System.err.println("Exception happens in testSerialization");
++ System.err.println(ex.getMessage());
++ } catch (ClassNotFoundException ex) {
+ System.err.println("Exception happens in testSerialization");
+ System.err.println(ex.getMessage());
+ }
diff -r 8b6b7d640684 -r 4072a64e3f8e patches/shark-drop_compile_method_arg_following_7083786.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/shark-drop_compile_method_arg_following_7083786.patch Thu Dec 26 14:30:15 2013 +0000
@@ -0,0 +1,11 @@
+diff -r d835d67bfb88 src/share/vm/shark/sharkCompiler.cpp
+--- openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp Thu Dec 05 20:12:11 2013 -0500
++++ openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp Thu Dec 26 14:22:34 2013 +0000
+@@ -212,7 +212,6 @@
+ &inc_table,
+ this,
+ env->comp_level(),
+- false,
+ false);
+ }
+
More information about the distro-pkg-dev
mailing list