From 7e468a0f1f8acb6e8e77c0999869d46527407c6b Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Wed, 27 May 2015 15:58:44 +0200
Subject: [PATCH] luajit: upgrade feb 2015 (04dc64b) to may 2015 (5de95ed)

Changes:

    * 5de95ed x64/LJ_GC64: Fix setmetatable().
    * 60fb3fe Fix table allocation bump optimization.
    * 4a146ca LJ_GC64: Fix frame unwinding.
    * bca5da8 Fix for last commit.
    * b82fc3d Bump table allocations retroactively if they grow later on.
    *   d8cfc37 Merge branch 'master' into v2.1
    |\
    | * 69e5342 RELEASE LuaJIT-2.0.4
    | * cd4c59f Update changelog.
    * | a836b7e Cleanup.
    * |   4cec6a5 Merge branch 'master' into v2.1
    |\ \
    | |/
    | * 9622d6b x86/x64: Fix argument check for bit shifts.
    * | a92e730 x64: Add LJ_GC64 mode interpreter.
    * | 5caf53d Fix broken Windows build.
    * | c2924c3 Disable trace stitching (for now) due to a design mistake.
    * |   74caac9 Merge branch 'master' into v2.1
    |\ \
    | |/
    | * 11106aa Fix stack check in narrowing optimization.
    * | 1e67a4c ARM64: Fix math.floor/math.ceil for string args.
    * | 1c968d5 DynASM/PPC: Add sub/shift/rotate/clear instruction aliases.
    * | b2a5cc8 DynASM/PPC: Add support for parameterized shifts/masks.
    * | dec4acc PPC: Fix cross-endian builds.
    * | 8002871 PPC: Fix write barrier in BC_TSETR.
    * |   4e52d1f Merge branch 'master' into v2.1
    |\ \
    | |/
    | * a9fd686 Doc cleanup.
    * | 361827c PPC64: Add build infrastructure.
    * |   c821e0a Merge branch 'master' into v2.1
    |\ \
    | |/
    | * 8b6af89 Fix Lua/C API typecheck error for special indexes.
    * |   2c0748f Merge branch 'master' into v2.1
    |\ \
    | |/
    | * 1f578bd FFI: Fix FOLD rule for TOBIT + CONV num.u32.
    * |   e1a8f3b Merge branch 'master' into v2.1
    |\ \
    | |/
    | * 5c0e33c ARM: Handle more arch defines.
    | * 7ff4768 Properly fail unsupported cross-compile to MIPS64.
    * |   906008d Merge branch 'master' into v2.1
    |\ \
    | |/
    | * e6b0875 Fix string to number conversion.
    * |   576ddf1 Merge branch 'master' into v2.1
    |\ \
    | |/
    | * 4fa51af x86/x64: Fix code generation for fused test/arith ops.
    * | 063f3d5 Merge branch 'master' into v2.1
    |/
    * 704280f FFI: Prevent DSE across ffi.string().
---
 deps/luajit  | 2 +-
 src/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deps/luajit b/deps/luajit
index 04dc64b558..5de95edf4c 160000
--- a/deps/luajit
+++ b/deps/luajit
@@ -1 +1 @@
-Subproject commit 04dc64b558025e76a820f89a8e41840bf8269f32
+Subproject commit 5de95edf4c03296f65ff435c587719a7dff5e6f5
diff --git a/src/Makefile b/src/Makefile
index 8b2c4bafba..12647fe5aa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,7 +6,7 @@ E= @echo
 
 # Required submodule versions.
 # Defined here to detect version mismatches at build time.
-LUAJIT_VSN    := "v2.0.3-328-g04dc64b"
+LUAJIT_VSN    := "v2.0.4-296-g5de95ed"
 LJSYSCALL_VSN := "v0.10-65-g7081d97"
 PFLUA_VSN     := "13b194e7a214faae5c3d2916a998418fc841dbc2"