All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/luajit: fix luvi
@ 2021-11-08 20:10 Francois Perrad
  2021-11-09 22:51 ` Romain Naour
  0 siblings, 1 reply; 3+ messages in thread
From: Francois Perrad @ 2021-11-08 20:10 UTC (permalink / raw)
  To: buildroot

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>
---
 package/luajit/luajit.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index fbbd8ebc7..ba5d85434 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -15,6 +15,7 @@ LUAJIT_PROVIDES = luainterpreter
 
 ifeq ($(BR2_PACKAGE_LUAJIT_COMPAT52),y)
 LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_LUA52COMPAT
+HOST_LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_LUA52COMPAT
 endif
 
 # The luajit build procedure requires the host compiler to have the
@@ -26,8 +27,10 @@ endif
 # libraries are installed.
 ifeq ($(BR2_ARCH_IS_64),y)
 LUAJIT_HOST_CC = $(HOSTCC)
+HOST_LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_GC64
 else
 LUAJIT_HOST_CC = $(HOSTCC) -m32
+HOST_LUAJIT_XCFLAGS += -DLUAJIT_DISABLE_GC64
 endif
 
 # We unfortunately can't use TARGET_CONFIGURE_OPTS, because the luajit
@@ -66,7 +69,7 @@ LUAJIT_POST_INSTALL_TARGET_HOOKS += LUAJIT_INSTALL_SYMLINK
 define HOST_LUAJIT_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)" BUILDMODE=dynamic \
 		TARGET_LDFLAGS="$(HOST_LDFLAGS)" \
-		XCFLAGS=$(LUAJIT_XCFLAGS) \
+		XCFLAGS=$(HOST_LUAJIT_XCFLAGS) \
 		-C $(@D) amalg
 endef
 
-- 
2.32.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/luajit: fix luvi
  2021-11-08 20:10 [Buildroot] [PATCH] package/luajit: fix luvi Francois Perrad
@ 2021-11-09 22:51 ` Romain Naour
  2021-11-10  8:06   ` Yann E. MORIN
  0 siblings, 1 reply; 3+ messages in thread
From: Romain Naour @ 2021-11-09 22:51 UTC (permalink / raw)
  To: Francois Perrad, buildroot

Hello François,

Le 08/11/2021 à 21:10, Francois Perrad a écrit :
> 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.

I believe it would be great to add a new test to test bytecode generated by
host-luajit. It's only by "chance" that we noticed this issue.

> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/luajit/luajit.mk | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
> index fbbd8ebc7..ba5d85434 100644
> --- a/package/luajit/luajit.mk
> +++ b/package/luajit/luajit.mk
> @@ -15,6 +15,7 @@ LUAJIT_PROVIDES = luainterpreter
>  
>  ifeq ($(BR2_PACKAGE_LUAJIT_COMPAT52),y)
>  LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_LUA52COMPAT
> +HOST_LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_LUA52COMPAT
>  endif
>  
>  # The luajit build procedure requires the host compiler to have the
> @@ -26,8 +27,10 @@ endif
>  # libraries are installed.
>  ifeq ($(BR2_ARCH_IS_64),y)
>  LUAJIT_HOST_CC = $(HOSTCC)
> +HOST_LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_GC64

What if the host is an 32bits machine ?

The luvi test needs another change since luvi -v doesn't always return a list in
the same order:

See LuaJIT FAQ:
https://luajit.org/faq.html

Q: Table iteration with pairs() does not result in the same order?

http://lists.busybox.net/pipermail/buildroot/2021-November/627938.html


Best regards,
Romain


>  else
>  LUAJIT_HOST_CC = $(HOSTCC) -m32
> +HOST_LUAJIT_XCFLAGS += -DLUAJIT_DISABLE_GC64
>  endif
>  
>  # We unfortunately can't use TARGET_CONFIGURE_OPTS, because the luajit
> @@ -66,7 +69,7 @@ LUAJIT_POST_INSTALL_TARGET_HOOKS += LUAJIT_INSTALL_SYMLINK
>  define HOST_LUAJIT_BUILD_CMDS
>  	$(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)" BUILDMODE=dynamic \
>  		TARGET_LDFLAGS="$(HOST_LDFLAGS)" \
> -		XCFLAGS=$(LUAJIT_XCFLAGS) \
> +		XCFLAGS=$(HOST_LUAJIT_XCFLAGS) \
>  		-C $(@D) amalg
>  endef
>  
> 

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/luajit: fix luvi
  2021-11-09 22:51 ` Romain Naour
@ 2021-11-10  8:06   ` Yann E. MORIN
  0 siblings, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2021-11-10  8:06 UTC (permalink / raw)
  To: Romain Naour; +Cc: buildroot, Francois Perrad

François, Romain, All,

Thanks for the cross-investigations! 👍

On 2021-11-09 23:51 +0100, Romain Naour spake thusly:
> Le 08/11/2021 à 21:10, Francois Perrad a écrit :
> > 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.
> I believe it would be great to add a new test to test bytecode generated by
> host-luajit. It's only by "chance" that we noticed this issue.

We already have a luajit test in:
    support/testing/tests/package/test_lua.py

> > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> > ---
> >  package/luajit/luajit.mk | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
> > index fbbd8ebc7..ba5d85434 100644
> > --- a/package/luajit/luajit.mk
> > +++ b/package/luajit/luajit.mk
> > @@ -15,6 +15,7 @@ LUAJIT_PROVIDES = luainterpreter
> >  
> >  ifeq ($(BR2_PACKAGE_LUAJIT_COMPAT52),y)
> >  LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_LUA52COMPAT
> > +HOST_LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_LUA52COMPAT
> >  endif
> >  
> >  # The luajit build procedure requires the host compiler to have the
> > @@ -26,8 +27,10 @@ endif
> >  # libraries are installed.
> >  ifeq ($(BR2_ARCH_IS_64),y)
> >  LUAJIT_HOST_CC = $(HOSTCC)
> > +HOST_LUAJIT_XCFLAGS += -DLUAJIT_ENABLE_GC64
> 
> What if the host is an 32bits machine ?

From https://luajit.org/extensions.html#string_dump (and the same file
in git still has the same wording):

    The generated bytecode is portable and can be loaded on any
    architecture that LuaJIT supports, independent of word size
    or endianess.

However, from https://luajit.org/install.html#cross

    The GNU Makefile-based build system allows cross-compiling on any
    host for any supported target, as long as both architectures have
    the same pointer size.

In git, the file reads differently, but the requirement remains:

    The GNU Makefile-based build system allows cross-compiling on any
    host for any supported target:

    * Yes, you need a toolchain for both your host and your target!

    * Both host and target architectures must have the same pointer
      size.

    * E.g. if you want to cross-compile to a 32 bit target on a 64
      bit host, you need to install the multilib development package
      (e.g. libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host
      part (HOST_CC="gcc -m32").

    * 64 bit targets always require compilation on a 64 bit host.

Gah... So, on a 32-bit host, we can't build for a 64-bit target, while
the opposite will require BR2_HOSTARCH_NEEDS_IA32_LIBS.

Meh, meh, meh...

> The luvi test needs another change since luvi -v doesn't always return a list in
> the same order:
> See LuaJIT FAQ:
> https://luajit.org/faq.html
> Q: Table iteration with pairs() does not result in the same order?
> http://lists.busybox.net/pipermail/buildroot/2021-November/627938.html

Yes, but this is a separate topic, which can be addressed in parallel.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-10  8:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-08 20:10 [Buildroot] [PATCH] package/luajit: fix luvi Francois Perrad
2021-11-09 22:51 ` Romain Naour
2021-11-10  8:06   ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.