← Back to branch summary

~ubuntu-branches/ubuntu/precise/openjdk-7/precise-security

« back to all changes in this revision

Viewing changes to debian/patches/jamvm-oj7.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose, Damien Raude-Morvan, Matthias Klose
  • Date: 2011-07-10 14:28:17 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110710142817-tl5xz1zv1aejnbi1
Tags: 7~b143-2.0~pre1-1
[ Damien Raude-Morvan ]
* New b143 code drop.
* Drop d/patches/7031385.diff: Merged upstream.
* Drop d/patches/jamvm-oj7.patch: Merged upstream.
* Manpages are now ja_JP.UTF-8 instead of ja_JP.eucJP

[ Matthias Klose ]
* Apply fix for IcedTea issue #753, #757.
* Update s390 hotspot build fixes.
* Re-enable zero on i386.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/jamvm-oj7.patch
1
 
Description: OpenJDK7 complained that JVM_FindClassFromBootLoader not found inside
2
 
the jamvm libjvm.so, a new JVM API in OpenJDK 7, the attached patch fix
3
 
by implementing it using jamvm's internal findSystemClass0 method.
4
 
Author: Xerxes Rånby <xerxes@zafena.se>
5
 
 
6
 
--- jamvm/jamvm/src/classlib/openjdk/jvm.c.orig 2011-05-26 12:47:39.703360774 +0200
7
 
+++ jamvm/jamvm/src/classlib/openjdk/jvm.c      2011-05-26 13:50:36.038086620 +0200
8
 
@@ -492,6 +492,15 @@
9
 
 }
10
 
 
11
 
 
12
 
+/* JVM_FindClassFromBootLoader */
13
 
+
14
 
+jclass JVM_FindClassFromBootLoader(JNIEnv* env, const char *name) {
15
 
+    TRACE("JVM_FindClassFromBootLoader(env=%p, s=%s)", env, name);
16
 
+
17
 
+    return findSystemClass0((char*)name);
18
 
+}
19
 
+
20
 
+
21
 
 /* JVM_FindClassFromClassLoader */
22
 
 
23
 
 jclass JVM_FindClassFromClassLoader(JNIEnv *env, const char *name,