Merged PR #677 (v2016.01 release) onto master

snabbco · Jan 5, 2016 · d0fff55 · d0fff55
2 parents adbb255 + e788e7a
commit d0fff55
Show file tree

Hide file tree

Showing 28 changed files with 698 additions and 213 deletions.
diff --git a/gcc-preinclude.h b/gcc-preinclude.h
@@ -2,7 +2,12 @@
 // See: http://www.win.tue.nl/~aeb/linux/misc/gcc-semibug.html
 //      https://rjpower9000.wordpress.com/2012/04/09/fun-with-shared-libraries-version-glibc_2-14-not-found/
 
+#define _GNU_SOURCE 1
+
+#include <features.h>
+
 #ifndef __ASSEMBLER__
+#ifdef __GLIBC__
 __asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
 #endif
-
+#endif
diff --git a/lib/luajit/src/lib_jit.c b/lib/luajit/src/lib_jit.c
@@ -300,7 +300,7 @@ LJLIB_CF(jit_util_traceinfo)
     setintfield(L, t, "link", T->link);
     setintfield(L, t, "nexit", T->nsnap);
     setintfield(L, t, "szmcode", T->szmcode);
-    setintfield(L, t, "mcode", T->mcode);
+    setintfield(L, t, "mcode", (int32_t)(intptr_t)T->mcode);
     setintfield(L, t, "mcloop", T->mcloop);
     setstrV(L, L->top++, lj_str_newz(L, jit_trlinkname[T->linktype]));
     lua_setfield(L, -2, "linktype");

diff --git a/src/Makefile b/src/Makefile
@@ -4,7 +4,7 @@ E= @echo
 #Q=
 #E= @:
 
-TEST_SKIPPED="43"
+export TEST_SKIPPED=43
 
 SRCDIR = $(shell find . -type d -not -regex './obj.*' -printf '%P ')
 OBJDIR = $(patsubst %,obj/%,$(SRCDIR))