[Vm-dev] missing file sqFFIPlugin.c in config.cmake
stes@PANDORA.BE
stes at telenet.be
Tue Jan 26 15:53:41 UTC 2021
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi,
Please have a look at the following fixes for SVN squeak classical VM.
Patches for platforms/unix/plugins/SqueakFFIPrims (see below).
Those are against revision 3796 latest (I think) from svn.
The issues are
1) missing #include in any-libffi.c
2) missing sqFFIPlugin.c file in config.cmake
3) ffi-config refers to non-existing ../../config/config.guess
Thanks if this can be applied to subversion.
David Stes
Index: plugins/SqueakFFIPrims/any-libffi.c
===================================================================
- --- plugins/SqueakFFIPrims/any-libffi.c (revision 3796)
+++ plugins/SqueakFFIPrims/any-libffi.c (working copy)
@@ -13,6 +13,7 @@
*
*****************************************************************************/
#include "sq.h"
+#include "sqVirtualMachine.h" /* primitiveFail in struct VirtualMachine */
#include "sqFFI.h"
#ifndef NO_FFI_SUPPORT
Index: plugins/SqueakFFIPrims/config.cmake
===================================================================
- --- plugins/SqueakFFIPrims/config.cmake (revision 3796)
+++ plugins/SqueakFFIPrims/config.cmake (working copy)
@@ -46,7 +46,7 @@
PLUGIN_DISABLE ()
ENDIF ()
ENABLE_LANGUAGE (ASM)
- - PLUGIN_SOURCES ("${cross}/plugins/${plugin}/sqManualSurface.c ${SQFFIC} ${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S")
+ PLUGIN_SOURCES ("${cross}/plugins/${plugin}/sqFFIPlugin.c ${cross}/plugins/${plugin}/sqManualSurface.c ${SQFFIC} ${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S")
IF (CMAKE_COMPILER_IS_GNUCC)
SET (CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}")
SET (CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -c")
Index: plugins/SqueakFFIPrims/ffi-config
===================================================================
- --- plugins/SqueakFFIPrims/ffi-config (revision 3796)
+++ plugins/SqueakFFIPrims/ffi-config (working copy)
@@ -7,7 +7,7 @@
# -lib print nothing if supported, otherwise `-lffi'
# -query exit with status 0 if supported, 1 if libffi required
- -cfgdir=../../config
+cfgdir=../../cmake
if [ $# -gt 0 ]; then
case $1 in
@@ -39,6 +39,7 @@
case ${abi} in
linux) abi=sysv;;
+ solaris*) abi=sysv;;
darwin*) abi=darwin;;
*) abi=libffi; lib="-lffi";;
esac
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAEBCAAGBQJgEDpfAAoJEAwpOKXMq1MaD+gH/jpY8bPYrJ+ScYisjjZbpLbF
fiD+yOMQBG4UmBWGdgF+41xRrLjKQV/nXLotTsUQS1qHtox+Jl7yGXiYCMuxndvd
x7EwirGO6q81dpmBAwYX/yPWlwRCiBYsjiGPFIB/tu0C/0TpT4WbLOi95xs+PqN6
m8+0585aPPV3bDNxo/eRqWaZdPUG4tN19v0OXqvh77SUMDVpQwMaVWCUKjA1Qn1D
s0esq2bOgkH8VBUP7zUjY/ka9Q+E1W8qAHz3MFZi1ACFbBDZgx6mBd6lD8AR7LQg
kHu/TwWcTuGHGe2faKskgJk54xAOjvTHVz+dcYnFgfrS5vby0L7iNavlGpcm3Fw=
=6Rov
-----END PGP SIGNATURE-----
More information about the Vm-dev
mailing list