From: Jörg Krause Date: Wed, 31 Aug 2016 18:53:56 +0000 (+0200) Subject: package/luajit: disable for mips{32,64}r6 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c72a2529aae8bcf8560dd1204d6b11e9ec9df81b;p=buildroot.git package/luajit: disable for mips{32,64}r6 LuaJIT does not have support for MIPS Release 6 [1]. If LuaJIT is invoked with the option `-b -a mips` to save the bytecode for the MIPS architecture it generates object files with the MIPS32 Release 1 instruction set. GCC added support for MIPS32R6 in version 5. However, object files for MIPS32R1 cannot be linked with object for MIPS32R6. That's why building the package luvi fails for MIPS32R6, where object files created with GCC are linked with object files created with LuaJIT with the following linker error: ``` linking mips:isa32 module with previous mips:isa32r6 modules ``` Disable LuaJIT for MIPS32 and MIPS64 R6 to fix the build issue with the luvi package. Fixes: http://autobuild.buildroot.net/results/e01/e017671c33314e5bf2d7fc4920f6c0e64a132383/ http://autobuild.buildroot.net/results/35f/35f558453c45a27367e80e9b8cbe3bd2dccbfd54/ http://autobuild.buildroot.net/results/8e0/8e001112b1678f9fb1c198c84184cd6f5fc3d004/ [1] http://www.freelists.org/post/luajit/Support-for-MIPS32r6,1 Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- diff --git a/package/luajit/Config.in b/package/luajit/Config.in index 8ce528b2cf..f9285e8a47 100644 --- a/package/luajit/Config.in +++ b/package/luajit/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS default y if BR2_i386 || \ (BR2_x86_64 && BR2_HOSTARCH='x86_64') || \ BR2_powerpc || BR2_arm || BR2_armeb || \ - ((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT) + ((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT && \ + !BR2_mips_32r6 && !BR2_mips_64r6) config BR2_PACKAGE_LUAJIT bool "luajit"