Removed old fix for 2.1 devices.

This commit is contained in:
Dmitry Yunitsky 2015-03-01 17:49:25 +03:00 committed by Alex Zolotarev
parent 368b3ac190
commit 758fd36b91

View file

@ -16,36 +16,9 @@ void InitNVEvent(JavaVM * jvm);
extern "C"
{
/// fix for stack unwinding problem during exception handling on Android 2.1
/// http://code.google.com/p/android/issues/detail?id=20176
#ifdef __arm__
typedef long unsigned int *_Unwind_Ptr;
/* Stubbed out in libdl and defined in the dynamic linker.
* Same semantics as __gnu_Unwind_Find_exidx().
*/
_Unwind_Ptr dl_unwind_find_exidx(_Unwind_Ptr pc, int *pcount);
_Unwind_Ptr __gnu_Unwind_Find_exidx(_Unwind_Ptr pc, int *pcount)
{
return dl_unwind_find_exidx(pc, pcount);
}
static void* g_func_ptr;
#endif // __arm__
JNIEXPORT jint JNICALL
JNI_OnLoad(JavaVM * jvm, void *)
{
/// fix for stack unwinding problem during exception handling on Android 2.1
/// http://code.google.com/p/android/issues/detail?id=20176
#ifdef __arm__
// when i throw exception, linker maybe can't find __gnu_Unwind_Find_exidx(lazy binding issue??)
// so I force to bind this symbol at shared object load time
g_func_ptr = (void*)__gnu_Unwind_Find_exidx;
#endif // __arm__
g_jvm = jvm;
jni::InitSystemLog();
jni::InitAssertLog();