Merged with tip.

diff --cc configure.ac
Simple merge

diff --cc src/threads/posix/thread-posix.c
index 3c2c2b237b2f21289c3e3469027ae21de78e5a44,bfcdc58a7c37ac9a54196457e05b455b117897e6..defe4220e711761f2d8aad96266ddc0c50bd6428
--- 1/src/threads/posix/thread-posix.c
--- 2/src/threads/posix/thread-posix.c
+++ b/src/threads/posix/thread-posix.c
@@@ -665,31 -465,16 +465,20 @@@ void threads_startworld(void
  
  void threads_impl_thread_init(threadobject *t)
  {
-       int result;
- 
        /* initialize the mutex and the condition */
  
-       mutex_init(&t->flc_lock);
+       t->flc_lock = Mutex_new();
+       t->flc_cond = Condition_new();
  
-       result = pthread_cond_init(&t->flc_cond, NULL);
-       if (result != 0)
-               vm_abort_errnum(result, "threads_impl_thread_new: pthread_cond_init failed");
- 
-       mutex_init(&(t->waitmutex));
- 
-       result = pthread_cond_init(&(t->waitcond), NULL);
-       if (result != 0)
-               vm_abort_errnum(result, "threads_impl_thread_new: pthread_cond_init failed");
- 
-       mutex_init(&(t->suspendmutex));
+       t->waitmutex = Mutex_new();
+       t->waitcond = Condition_new();
  
-       result = pthread_cond_init(&(t->suspendcond), NULL);
-       if (result != 0)
-               vm_abort_errnum(result, "threads_impl_thread_new: pthread_cond_init failed");
+       t->suspendmutex = Mutex_new();
+       t->suspendcond = Condition_new();
 +
 +#if defined(ENABLE_TLH)
 +      tlh_init(&(t->tlh));
 +#endif
  }
  
  /* threads_impl_thread_clear ***************************************************

diff --cc src/threads/posix/thread-posix.h
index 349b5c33248f26e231778bd6d947db17615b7b63,5c107f86372897e8c42410d06ea12f11817b83b0..bb8b4206d9efdf30553678d0d6785b34d0e58e1e
--- 1/src/threads/posix/thread-posix.h
--- 2/src/threads/posix/thread-posix.h
+++ b/src/threads/posix/thread-posix.h
@@@ -40,13 -40,10 +40,14 @@@ typedef struct threadobject threadobjec
  
  #include "mm/memory.h"
  
 +#if defined(ENABLE_TLH)
 +#include "mm/tlh.h"
 +#endif
 +
  #include "native/localref.h"
  
- #include "threads/mutex.h"
+ #include "threads/condition.hpp"
+ #include "threads/mutex.hpp"
  
  #include "threads/posix/lock.h"
  

diff --cc src/vm/builtin.c
Simple merge

diff --cc src/vm/builtin.h
Simple merge

diff --cc src/vm/global.h
Simple merge

diff --cc src/vm/jit/i386/codegen.c
Simple merge

diff --cc src/vm/jit/i386/emit.c
Simple merge

diff --cc src/vm/jit/i386/linux/md-os.c
Simple merge

diff --cc src/vm/jit/trap.c
Simple merge

diff --cc src/vmcore/linker.c
Simple merge