summaryrefslogtreecommitdiff
path: root/Build/source/libs/luajit
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-09-28 06:08:08 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-09-28 06:08:08 +0000
commite4993d69a56ea4e521622dbd5c3da5c16496b13f (patch)
tree262f5462bdae73ea027e6ae48872a7d10f3acef7 /Build/source/libs/luajit
parent9c6e5fb08eb713d5328f26683ad7296d543cd644 (diff)
Build system: Enable LuaJIT for x86_64-cygwin
git-svn-id: svn://tug.org/texlive/trunk@38485 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/luajit')
-rw-r--r--Build/source/libs/luajit/LuaJIT-2.1.0-beta1-PATCHES/ChangeLog4
-rw-r--r--Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_alloc.c2
-rw-r--r--Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_arch.h6
-rw-r--r--Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_err.c6
4 files changed, 14 insertions, 4 deletions
diff --git a/Build/source/libs/luajit/LuaJIT-2.1.0-beta1-PATCHES/ChangeLog b/Build/source/libs/luajit/LuaJIT-2.1.0-beta1-PATCHES/ChangeLog
index 5ef8ddb84fa..0306037354a 100644
--- a/Build/source/libs/luajit/LuaJIT-2.1.0-beta1-PATCHES/ChangeLog
+++ b/Build/source/libs/luajit/LuaJIT-2.1.0-beta1-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-07-x86_64-cygwin (new): Backport from upstream git.
+
2015-09-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Import LuaJIT-2.1.0-beta1.
diff --git a/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_alloc.c b/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_alloc.c
index 0aad826d361..ddd50cae4f1 100644
--- a/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_alloc.c
+++ b/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_alloc.c
@@ -196,7 +196,7 @@ static LJ_AINLINE void *CALL_MMAP(size_t size)
return ptr;
}
-#elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__)
+#elif LJ_TARGET_OSX || LJ_TARGET_PS4 || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun__) || defined(__CYGWIN__)
/* OSX and FreeBSD mmap() use a naive first-fit linear search.
** That's perfect for us. Except that -pagezero_size must be set for OSX,
diff --git a/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_arch.h b/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_arch.h
index 6342fbbf83d..6760111ef5e 100644
--- a/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_arch.h
+++ b/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_arch.h
@@ -155,7 +155,11 @@
#define LJ_ARCH_NAME "x64"
#define LJ_ARCH_BITS 64
#define LJ_ARCH_ENDIAN LUAJIT_LE
-#define LJ_ABI_WIN LJ_TARGET_WINDOWS
+#if LJ_TARGET_WINDOWS || __CYGWIN__
+#define LJ_ABI_WIN 1
+#else
+#define LJ_ABI_WIN 0
+#endif
#define LJ_TARGET_X64 1
#define LJ_TARGET_X86ORX64 1
#define LJ_TARGET_EHRETREG 0
diff --git a/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_err.c b/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_err.c
index 2e20c2c0f80..9ac0c988fc9 100644
--- a/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_err.c
+++ b/Build/source/libs/luajit/LuaJIT-2.1.0-beta1/src/lj_err.c
@@ -183,7 +183,7 @@ static void *err_unwind(lua_State *L, void *stopcf, int errcode)
/* -- External frame unwinding -------------------------------------------- */
-#if defined(__GNUC__) && !LJ_NO_UNWIND && !LJ_TARGET_WINDOWS
+#if defined(__GNUC__) && !LJ_NO_UNWIND && !LJ_ABI_WIN
/*
** We have to use our own definitions instead of the mandatory (!) unwind.h,
@@ -349,7 +349,7 @@ LJ_FUNCA int lj_err_unwind_arm(int state, void *ucb, _Unwind_Context *ctx)
#endif
-#elif LJ_TARGET_X64 && LJ_TARGET_WINDOWS
+#elif LJ_TARGET_X64 && LJ_ABI_WIN
/*
** Someone in Redmond owes me several days of my life. A lot of this is
@@ -414,7 +414,9 @@ LJ_FUNCA EXCEPTION_DISPOSITION lj_err_unwind_win64(EXCEPTION_RECORD *rec,
if (cf2) { /* We catch it, so start unwinding the upper frames. */
if (rec->ExceptionCode == LJ_MSVC_EXCODE ||
rec->ExceptionCode == LJ_GCC_EXCODE) {
+#if LJ_TARGET_WINDOWS
__DestructExceptionObject(rec, 1);
+#endif
setstrV(L, L->top++, lj_err_str(L, LJ_ERR_ERRCPP));
} else if (!LJ_EXCODE_CHECK(rec->ExceptionCode)) {
/* Don't catch access violations etc. */