2
1
Эх сурвалжийг харах

package/luajit: disable 64 bit GC objects

Luvi uses the cross bytecode generation of host-luajit
the bytecode format has 2 flavors, depending of GC64 option.

Since the commit https://github.com/LuaJIT/LuaJIT/commit/bd00094c3b50e193fb32aad79b7ea8ea6b78ed25
GC64 mode is enable by default on all 64bits platform.

With this patch, luajit and host-luajit are built with the same option,
so the bytecode generated by host-luajit is valid on luajit.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
[Romain:
  - update commit title
  - add a comment about missing LUAJIT_ENABLE_GC64]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Francois Perrad 3 жил өмнө
parent
commit
d4e6e1b53b

+ 2 - 0
package/luajit/luajit.mk

@@ -26,8 +26,10 @@ endif
 # libraries are installed.
 # libraries are installed.
 ifeq ($(BR2_ARCH_IS_64),y)
 ifeq ($(BR2_ARCH_IS_64),y)
 LUAJIT_HOST_CC = $(HOSTCC)
 LUAJIT_HOST_CC = $(HOSTCC)
+# There is no LUAJIT_ENABLE_GC64 option.
 else
 else
 LUAJIT_HOST_CC = $(HOSTCC) -m32
 LUAJIT_HOST_CC = $(HOSTCC) -m32
+LUAJIT_XCFLAGS += -DLUAJIT_DISABLE_GC64
 endif
 endif
 
 
 # We unfortunately can't use TARGET_CONFIGURE_OPTS, because the luajit
 # We unfortunately can't use TARGET_CONFIGURE_OPTS, because the luajit