summaryrefslogtreecommitdiff
path: root/java/openjdk6/files/icedtea/openjdk/8006882-jmockit.patch
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2013-12-24 23:11:15 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2013-12-24 23:11:15 +0000
commit799b4d21cc8cda551ceb55f81399ecccf67c02ca (patch)
tree8215e91878315694d08034f84bbf614e8005433d /java/openjdk6/files/icedtea/openjdk/8006882-jmockit.patch
parent- Add a patch from upstram. (diff)
- Update to b29.
- Tidy up signal handler. - Disable a Linux-specific hack. - Do not create stack guard for Java threads. - Implement thread CPU time.
Notes
Notes: svn path=/head/; revision=337396
Diffstat (limited to 'java/openjdk6/files/icedtea/openjdk/8006882-jmockit.patch')
-rw-r--r--java/openjdk6/files/icedtea/openjdk/8006882-jmockit.patch90
1 files changed, 0 insertions, 90 deletions
diff --git a/java/openjdk6/files/icedtea/openjdk/8006882-jmockit.patch b/java/openjdk6/files/icedtea/openjdk/8006882-jmockit.patch
deleted file mode 100644
index 9b96efe8072e..000000000000
--- a/java/openjdk6/files/icedtea/openjdk/8006882-jmockit.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-# HG changeset patch
-# User mchung
-# Date 1382735820 -3600
-# Fri Oct 25 22:17:00 2013 +0100
-# Node ID 695dd7ceb9e34fd4058374de63964c205f061002
-# Parent 5b485ecccea9064e5036e1bb040fc2af1f773c20
-8006882: Proxy generated classes in sun.proxy package breaks JMockit
-Reviewed-by: alanb, ahgross
-
-diff -r 5b485ecccea9 -r 695dd7ceb9e3 src/share/classes/java/lang/reflect/Proxy.java
---- jdk/src/share/classes/java/lang/reflect/Proxy.java Fri Oct 25 22:11:26 2013 +0100
-+++ jdk/src/share/classes/java/lang/reflect/Proxy.java Fri Oct 25 22:17:00 2013 +0100
-@@ -609,7 +609,7 @@
- }
-
- if (proxyPkg == null) {
-- // if no non-public proxy interfaces, use sun.proxy package
-+ // if no non-public proxy interfaces, use com.sun.proxy package
- proxyPkg = ReflectUtil.PROXY_PACKAGE + ".";
- }
-
-diff -r 5b485ecccea9 -r 695dd7ceb9e3 src/share/classes/sun/reflect/misc/ReflectUtil.java
---- jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java Fri Oct 25 22:11:26 2013 +0100
-+++ jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java Fri Oct 25 22:17:00 2013 +0100
-@@ -246,7 +246,7 @@
- }
- }
-
-- public static final String PROXY_PACKAGE = "sun.proxy";
-+ public static final String PROXY_PACKAGE = "com.sun.proxy";
-
- /**
- * Test if the given class is a proxy class that implements
-diff -r 5b485ecccea9 -r 695dd7ceb9e3 src/share/lib/security/java.security
---- jdk/src/share/lib/security/java.security Fri Oct 25 22:11:26 2013 +0100
-+++ jdk/src/share/lib/security/java.security Fri Oct 25 22:17:00 2013 +0100
-@@ -132,6 +132,7 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.proxy.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-@@ -167,6 +168,7 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.proxy.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-diff -r 5b485ecccea9 -r 695dd7ceb9e3 src/share/lib/security/java.security-solaris
---- jdk/src/share/lib/security/java.security-solaris Fri Oct 25 22:11:26 2013 +0100
-+++ jdk/src/share/lib/security/java.security-solaris Fri Oct 25 22:17:00 2013 +0100
-@@ -133,6 +133,7 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.proxy.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-@@ -169,6 +170,7 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.proxy.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-diff -r 5b485ecccea9 -r 695dd7ceb9e3 src/share/lib/security/java.security-windows
---- jdk/src/share/lib/security/java.security-windows Fri Oct 25 22:11:26 2013 +0100
-+++ jdk/src/share/lib/security/java.security-windows Fri Oct 25 22:17:00 2013 +0100
-@@ -133,6 +133,7 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.proxy.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\
-@@ -170,6 +171,7 @@
- com.sun.imageio.,\
- com.sun.istack.internal.,\
- com.sun.jmx.,\
-+ com.sun.proxy.,\
- com.sun.org.apache.bcel.internal.,\
- com.sun.org.apache.regexp.internal.,\
- com.sun.org.apache.xerces.internal.,\