Merged with tip.

diff --cc src/vm/jit/i386/darwin/md-asm.h
Simple merge

diff --cc src/vm/jit/stacktrace.c
index 493e1c5f7290d49352266e7f8102f3fd46a2bfc4,e8d59d422a513669569c4c0aa59304362eb4cdbd..461c09d18f68d38ff92196ac1ad0f2daf64febab
--- 1/src/vm/jit/stacktrace.c
--- 2/src/vm/jit/stacktrace.c
+++ b/src/vm/jit/stacktrace.c
@@@ -75,8 -76,12 +75,9 @@@
  
  
  /* global variables ***********************************************************/
 -#if !defined(ENABLE_THREADS)
 -stackframeinfo_t *_no_threads_stackframeinfo = NULL;
 -#endif
  
  CYCLES_STATS_DECLARE(stacktrace_overhead        , 100, 1)
+ CYCLES_STATS_DECLARE(stacktrace_fillInStackTrace, 40,  5000)
  CYCLES_STATS_DECLARE(stacktrace_get,              40,  5000)
  CYCLES_STATS_DECLARE(stacktrace_getClassContext , 40,  5000)
  CYCLES_STATS_DECLARE(stacktrace_getCurrentClass , 40,  5000)