Added longjmp and pthread_cancel handling (and test14 works)

1 files changed, 50 insertions, 50 deletions

diff --git a/src/wrapped/wrappedlibpthread_private.h b/src/wrapped/wrappedlibpthread_private.h
index 92989389..aeccee66 100755
--- a/src/wrapped/wrappedlibpthread_private.h
+++ b/src/wrapped/wrappedlibpthread_private.h
@@ -23,11 +23,11 @@ GOM(pthread_attr_destroy, iFEp)
 //GO(pthread_attr_getinheritsched, iFpp)
 //GO(pthread_attr_getschedparam, iFpp)
 //GO(pthread_attr_getschedpolicy, iFpp)
-//GO(pthread_attr_getscope, iFpp)
+GO(pthread_attr_getscope, iFpp)
 //GOM(pthread_attr_getstack, iFEppp)
 //GO(pthread_attr_getstackaddr, iFpp)
 //GO(pthread_attr_getstacksize, iFpp)
-//GO(pthread_attr_init, iFp)
+GO(pthread_attr_init, iFp)
 //GOM(pthread_attr_setaffinity_np, iFEpup)
 //GO(pthread_attr_setdetachstate, iFpi)
 //GO(pthread_attr_setguardsize, iFpL)
@@ -45,24 +45,24 @@ GOM(pthread_attr_destroy, iFEp)
 //GO(pthread_barrier_destroy, iFp)
 //GO(pthread_barrier_init, iFppu)
 //GO(pthread_barrier_wait, iFp)
-//GO(pthread_cancel, iFi)
+GO(pthread_cancel, iFL)
 //GOM(_pthread_cleanup_pop, vFEpi)
 //GOM(_pthread_cleanup_pop_restore, vFEpi)
 //GOM(_pthread_cleanup_push, vFEppp)
 //GOM(_pthread_cleanup_push_defer, vFEppp)
 // __pthread_cleanup_routine
-//GO(pthread_condattr_destroy, iFp)
-//GO(pthread_condattr_getclock, iFpp)
-//GO(pthread_condattr_getpshared, iFpp)
-//GO(pthread_condattr_init, iFp)
-//GO(pthread_condattr_setclock, iFpp)
-//GO(pthread_condattr_setpshared, iFpi)
-//GOM(pthread_cond_broadcast, iFEp)
-//GOM(pthread_cond_destroy, iFEp)
-//GOM(pthread_cond_init, iFEpp)
-//GOM(pthread_cond_signal, iFEp)
-//GOM(pthread_cond_timedwait, iFEppp)
-//GOM(pthread_cond_wait, iFEpp)
+GO(pthread_condattr_destroy, iFp)
+GO(pthread_condattr_getclock, iFpp)
+GO(pthread_condattr_getpshared, iFpp)
+GO(pthread_condattr_init, iFp)
+GO(pthread_condattr_setclock, iFpp)
+GO(pthread_condattr_setpshared, iFpi)
+GOM(pthread_cond_broadcast, iFEp)
+GOM(pthread_cond_destroy, iFEp)
+GOM(pthread_cond_init, iFEpp)
+GOM(pthread_cond_signal, iFEp)
+GOM(pthread_cond_timedwait, iFEppp)
+GOM(pthread_cond_wait, iFEpp)
 GOM(pthread_create, iFEpppp)
 //GO(pthread_detach, iFu)
 GO(pthread_equal, iFLL)
@@ -80,54 +80,54 @@ GO(pthread_equal, iFLL)
 GO(pthread_join, iFLp)
 GOM(__pthread_key_create, iFEpp)
 GOM(pthread_key_create, iFEpp)
-GO(pthread_key_delete, iFu)
-//GO(pthread_kill, iFEpi)
+GO(pthread_key_delete, iFL)
+GO(pthread_kill, iFEpi)
 // pthread_kill_other_threads_np
-//GO(__pthread_mutexattr_destroy, iFp)
-//GO(pthread_mutexattr_destroy, iFp)
+GO(__pthread_mutexattr_destroy, iFp)
+GO(pthread_mutexattr_destroy, iFp)
 // pthread_mutexattr_getprioceiling
 // pthread_mutexattr_getprotocol
 // pthread_mutexattr_getpshared
 // pthread_mutexattr_getrobust_np
-//GO(pthread_mutexattr_gettype, iFpp)
-//GO(__pthread_mutexattr_init, iFp)
-//GO(pthread_mutexattr_init, iFp)
+GO(pthread_mutexattr_gettype, iFpp)
+GO(__pthread_mutexattr_init, iFp)
+GO(pthread_mutexattr_init, iFp)
 // pthread_mutexattr_setprioceiling
-//GO(pthread_mutexattr_setprotocol, iFpp)
-//GO(pthread_mutexattr_setpshared, iFpi)
+GO(pthread_mutexattr_setprotocol, iFpp)
+GO(pthread_mutexattr_setpshared, iFpi)
 // pthread_mutexattr_setrobust_np
-//GO(__pthread_mutexattr_settype, iFpi)
-//GO(pthread_mutexattr_settype, iFpi)
+GO(__pthread_mutexattr_settype, iFpi)
+GO(pthread_mutexattr_settype, iFpi)
 // pthread_mutex_consistent_np
-//GO(__pthread_mutex_destroy, iFp)
-//GO(pthread_mutex_destroy, iFp)
+GO(__pthread_mutex_destroy, iFp)
+GO(pthread_mutex_destroy, iFp)
 // pthread_mutex_getprioceiling
-//GO(__pthread_mutex_init, iFpp)
-//GO(pthread_mutex_init, iFpp)
-//GO(__pthread_mutex_lock, iFp)
-//GO(pthread_mutex_lock, iFp)
+GO(__pthread_mutex_init, iFpp)
+GO(pthread_mutex_init, iFpp)
+GO(__pthread_mutex_lock, iFp)
+GO(pthread_mutex_lock, iFp)
 // pthread_mutex_setprioceiling
-//GO(pthread_mutex_timedlock, iFpp)
-//GO(__pthread_mutex_trylock, iFp)
-//GO(pthread_mutex_trylock, iFp)
-//GO(__pthread_mutex_unlock, iFp)
-//GO(pthread_mutex_unlock, iFp)
+GO(pthread_mutex_timedlock, iFpp)
+GO(__pthread_mutex_trylock, iFp)
+GO(pthread_mutex_trylock, iFp)
+GO(__pthread_mutex_unlock, iFp)
+GO(pthread_mutex_unlock, iFp)
 GOM(pthread_once, iFEpp)
 GOM(__pthread_once, iFEpp)
-//GOM(__pthread_register_cancel, vFEp)
+GOM(__pthread_register_cancel, vFEp)
 // __pthread_register_cancel_defer
-//GO(pthread_rwlockattr_destroy, vFp)
-//GO(pthread_rwlockattr_getkind_np, iFpp)
+GO(pthread_rwlockattr_destroy, vFp)
+GO(pthread_rwlockattr_getkind_np, iFpp)
 // pthread_rwlockattr_getpshared
-//GO(pthread_rwlockattr_init, iFp)
-//GO(pthread_rwlockattr_setkind_np, iFpi)
+GO(pthread_rwlockattr_init, iFp)
+GO(pthread_rwlockattr_setkind_np, iFpi)
 // pthread_rwlockattr_setpshared
 // __pthread_rwlock_destroy
-//GO(pthread_rwlock_destroy, iFp)
-//GO(__pthread_rwlock_init, iFpp)
-//GO(pthread_rwlock_init, iFpp)
-//GO(__pthread_rwlock_rdlock, iFp)
-//GO2(pthread_rwlock_rdlock, iFp, __pthread_rwlock_rdlock)    // not always defined
+GO(pthread_rwlock_destroy, iFp)
+GO(__pthread_rwlock_init, iFpp)
+GO(pthread_rwlock_init, iFpp)
+GO(__pthread_rwlock_rdlock, iFp)
+GO(pthread_rwlock_rdlock, iFp)
 // pthread_rwlock_timedrdlock
 // pthread_rwlock_timedwrlock
 // __pthread_rwlock_tryrdlock
@@ -157,11 +157,11 @@ GO(pthread_self, LFv)
 //GO(pthread_testcancel, vFv)
 //GO(pthread_timedjoin_np, iFppp)
 //GO(pthread_tryjoin_np, iFpp)
-//GOM(__pthread_unregister_cancel, vFEp)
+GOM(__pthread_unregister_cancel, vFEp)
 // __pthread_unregister_cancel_restore
 // __pthread_unwind
-//GOM(__pthread_unwind_next, vFEp)
-//GO(pthread_yield, iFv)
+GOM(__pthread_unwind_next, vFEp)
+GO(pthread_yield, iFv)
 // raise
 // __res_state
 //GO(sem_close, iFp)