summaryrefslogtreecommitdiff
path: root/Build
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
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')
-rwxr-xr-xBuild/source/configure4
-rwxr-xr-xBuild/source/libs/configure4
-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
-rw-r--r--Build/source/m4/ChangeLog6
-rw-r--r--Build/source/m4/kpse-setup.m42
-rwxr-xr-xBuild/source/texk/configure4
-rw-r--r--Build/source/texk/web2c/Makefile.in14
-rw-r--r--Build/source/texk/web2c/mfluadir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/mfluadir/am/mflua.am4
-rw-r--r--Build/source/texk/web2c/mfluajitdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/mfluajitdir/am/mfluajit.am12
-rwxr-xr-xBuild/source/utils/configure4
15 files changed, 51 insertions, 29 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 2cc336b4276..6fe7d7900c3 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -4165,7 +4165,7 @@ case $enable_luajittex in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+ alpha* | sparc* | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -4178,7 +4178,7 @@ case $enable_mfluajit in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+ alpha* | sparc* | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit'" >&5
$as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
ac_configure_args="$ac_configure_args '--disable-mfluajit'" ;; #(
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 5798c96ddd3..213e6284fc8 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -3363,7 +3363,7 @@ case $enable_luajittex in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+ alpha* | sparc* | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -3376,7 +3376,7 @@ case $enable_mfluajit in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+ alpha* | sparc* | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit'" >&5
$as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
ac_configure_args="$ac_configure_args '--disable-mfluajit'" ;; #(
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. */
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 474e8d465b5..9d08d9fb6c9 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,4 +1,8 @@
-2015-09-044 Peter Breitenlohner <peb@mppmu.mpg.de>
+2015-09-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-setup.m4: Allow LuaJIT for x86_64-cygwin.
+
+2015-09-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-lib-version.m4 (KPSE_LIB_VERSION): Allow more general
version number suffix strings, e.g., "-beta1".
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index a47abb34bca..4cac0f2f7be 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -85,7 +85,7 @@ AC_FOREACH([Kpse_Pkg], [luajittex mfluajit], [dnl
AS_CASE([$enable_]Kpse_Pkg,
[yes | no], [:],
[AS_CASE([$host],
- [alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ],
+ [alpha* | sparc* | powerpc-*-darwin* ],
[AC_MSG_NOTICE([$host -> `--disable-]Kpse_Pkg['])
ac_configure_args="$ac_configure_args '--disable-]Kpse_Pkg['"])])
])
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index f0a12aa6f95..8da9d58dd85 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -3374,7 +3374,7 @@ case $enable_luajittex in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+ alpha* | sparc* | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -3387,7 +3387,7 @@ case $enable_mfluajit in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+ alpha* | sparc* | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit'" >&5
$as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
ac_configure_args="$ac_configure_args '--disable-mfluajit'" ;; #(
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 181d9bcb24e..1ab2e6485e5 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -2773,7 +2773,7 @@ mfluajit_nowin_CPPFLAGS = $(mfluajit_CPPFLAGS) -DMFNOWIN $(LUAJIT_INCLUDES) $(LU
mfluajit_nowin_LDADD = libmfluajit.a $(LDADD) $(windowlib) $(LUAJIT_LIBS)
mfluajit_nowin_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
-# MFLua C sources
+# MFLuaJIT C sources
mfluajit_c_h = mfluajitini.c mfluajit0.c mfluajitcoerce.h mfluajitd.h
dist_libmfluajit_a_SOURCES = luatexdir/lua/lkpselib.c mfluadir/mfluac.c mfluadir/mfluac.h
nodist_libmfluajit_a_SOURCES = $(mfluajit_c_h) mfluajit-pool.c
@@ -2789,7 +2789,7 @@ mfluajit_ch_src = \
mf-binpool.ch
-# MFLua tests
+# MFLuaJIT tests
#
mfluajit_tests = mfluajitdir/mfluajittraptest.test
mpost_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -I$(srcdir)/mplibdir
@@ -15371,9 +15371,9 @@ $(mflua_OBJECTS) $(mflua_nowin_OBJECTS): mfluad.h mfluadir/mflua_version.h
# We must create mfluad.h before building the libmflua_a_OBJECTS.
$(libmflua_a_OBJECTS): mfluad.h
-$(mflua_c_h): mflua-web2c $(LUA_DEPEND)
+$(mflua_c_h): mflua-web2c
@$(web2c) mflua
-mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines
+mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines $(LUA_DEPEND)
@$(web2c) mflua
mflua-pool.c: mflua.pool mfluad.h $(makecpool_stamp)
@@ -15419,15 +15419,15 @@ $(mfluajit_OBJECTS) $(mfluajit_nowin_OBJECTS): mfluajitd.h mfluadir/mflua_versio
# We must create mfluajitd.h before building the libmfluajit_a_OBJECTS.
$(libmfluajit_a_OBJECTS): mfluajitd.h
-$(mfluajit_c_h): mfluajit-web2c $(LUAJIT_DEPEND)
+$(mfluajit_c_h): mfluajit-web2c
@$(web2c) mfluajit
-mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines
+mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines $(LUAJIT_DEPEND)
@$(web2c) mfluajit
mfluajit-pool.c: mfluajit.pool mfluajitd.h $(makecpool_stamp)
$(makecpool) mfluajit >$@ || rm -f $@
-# Tangling MFLua
+# Tangling MFLuaJIT
mfluajit.p mfluajit.pool: mfluajit-tangle
@$(texmf_tangle) mfluajit mfluajit
mfluajit-tangle: tangle$(EXEEXT) mfluajit.web mfluajit.ch tangle-sh
diff --git a/Build/source/texk/web2c/mfluadir/ChangeLog b/Build/source/texk/web2c/mfluadir/ChangeLog
index 3f47e483141..e6b519c2d88 100644
--- a/Build/source/texk/web2c/mfluadir/ChangeLog
+++ b/Build/source/texk/web2c/mfluadir/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/mflua.am: Fix dependencies.
+
2015-07-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* mfluatraptest (removed): Renamed ...
diff --git a/Build/source/texk/web2c/mfluadir/am/mflua.am b/Build/source/texk/web2c/mfluadir/am/mflua.am
index 17f27d145c4..3b859fd8d28 100644
--- a/Build/source/texk/web2c/mfluadir/am/mflua.am
+++ b/Build/source/texk/web2c/mfluadir/am/mflua.am
@@ -68,9 +68,9 @@ libmflua_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) -DMF_LUA
# We must create mfluad.h before building the libmflua_a_OBJECTS.
$(libmflua_a_OBJECTS): mfluad.h
-$(mflua_c_h): mflua-web2c $(LUA_DEPEND)
+$(mflua_c_h): mflua-web2c
@$(web2c) mflua
-mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines
+mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines $(LUA_DEPEND)
@$(web2c) mflua
mflua-pool.c: mflua.pool mfluad.h $(makecpool_stamp)
diff --git a/Build/source/texk/web2c/mfluajitdir/ChangeLog b/Build/source/texk/web2c/mfluajitdir/ChangeLog
index af119ecc9e1..f1cdcbba19b 100644
--- a/Build/source/texk/web2c/mfluajitdir/ChangeLog
+++ b/Build/source/texk/web2c/mfluajitdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/mfluajit.am: Fix dependencies.
+
2015-07-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* mfluajittraptest (removed): Renamed ...
diff --git a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
index c990ca4b1b0..b2cf7a4fa90 100644
--- a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
+++ b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
@@ -3,7 +3,7 @@
## Copyright (C) 2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
-## MFLua
+## MFLuaJIT
##
if MFLUAJIT
bin_PROGRAMS += mfluajit
@@ -59,7 +59,7 @@ $(mfluajit_OBJECTS) $(mfluajit_nowin_OBJECTS): mfluajitd.h mfluadir/mflua_versio
## To avoid compiling everything twice, the common objects are in a library.
EXTRA_LIBRARIES += libmfluajit.a
-# MFLua C sources
+# MFLuaJIT C sources
mfluajit_c_h = mfluajitini.c mfluajit0.c mfluajitcoerce.h mfluajitd.h
dist_libmfluajit_a_SOURCES = luatexdir/lua/lkpselib.c mfluadir/mfluac.c mfluadir/mfluac.h
nodist_libmfluajit_a_SOURCES = $(mfluajit_c_h) mfluajit-pool.c
@@ -68,15 +68,15 @@ libmfluajit_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DMF_LUA -DJIT
# We must create mfluajitd.h before building the libmfluajit_a_OBJECTS.
$(libmfluajit_a_OBJECTS): mfluajitd.h
-$(mfluajit_c_h): mfluajit-web2c $(LUAJIT_DEPEND)
+$(mfluajit_c_h): mfluajit-web2c
@$(web2c) mfluajit
-mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines
+mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines $(LUAJIT_DEPEND)
@$(web2c) mfluajit
mfluajit-pool.c: mfluajit.pool mfluajitd.h $(makecpool_stamp)
$(makecpool) mfluajit >$@ || rm -f $@
-# Tangling MFLua
+# Tangling MFLuaJIT
mfluajit.p mfluajit.pool: mfluajit-tangle
@$(texmf_tangle) mfluajit mfluajit
mfluajit-tangle: tangle$(EXEEXT) mfluajit.web mfluajit.ch tangle-sh
@@ -106,7 +106,7 @@ DISTCLEANFILES += $(nodist_libmfluajit_a_SOURCES) mfluajit.web mfluajit.ch mflua
EXTRA_DIST += \
mfluajitdir/ChangeLog
-# MFLua tests
+# MFLuaJIT tests
#
mfluajit_tests = mfluajitdir/mfluajittraptest.test
mfluajitdir/mfluajittraptest.log: mfluajit$(EXEEXT) gftype$(EXEEXT) tftopl$(EXEEXT)
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 783f5754ff9..efe9155c560 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -3355,7 +3355,7 @@ case $enable_luajittex in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+ alpha* | sparc* | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -3368,7 +3368,7 @@ case $enable_mfluajit in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
+ alpha* | sparc* | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-mfluajit'" >&5
$as_echo "$as_me: $host -> \`--disable-mfluajit'" >&6;}
ac_configure_args="$ac_configure_args '--disable-mfluajit'" ;; #(