[vmkit-commits] [vmkit] r180544 - Reverting some changes because they work for OpenJDK but not for GNUClasspath

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:21:49 2013
New Revision: 180544

URL: http://llvm.org/viewvc/llvm-project?rev=180544&view=rev
Log:
Reverting some changes because they work for OpenJDK but not for GNUClasspath
(cherry picked from commit 01bf1f812f0adc1449d5f75c28388b0522f58438)

Modified:
    vmkit/trunk/lib/j3/VMCore/JavaThread.h
    vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h

Modified: vmkit/trunk/lib/j3/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaThread.h?rev=180544&r1=180543&r2=180544&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaThread.h (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaThread.h Thu Apr 25 12:21:49 2013
@@ -39,7 +39,7 @@ class Jnjvm;
   th->leaveUncooperativeCode(); \
   vmkit::KnownFrame Frame; \
   th->startKnownFrame(Frame); \
-  Frame.currentFP = vmkit::System::GetCallerAddress(); \
+  /*Frame.currentFP = vmkit::System::GetCallerAddress(); */\
   TRY {
 
 #define END_JNI_EXCEPTION \

Modified: vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h?rev=180544&r1=180543&r2=180544&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.h Thu Apr 25 12:21:49 2013
@@ -122,7 +122,7 @@ protected:
 
   /// Lock to add Strings
   ///
-  vmkit::SpinLock lockForStrings;
+  vmkit::LockNormal lockForStrings;
 
   /// lock2 - Lock when loading classes.
   ///