Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm…

… into Cog

.appveyor.yml

@@ -13,6 +13,11 @@ environment:
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
+    - FLAVOR: squeak.cog.spur.lowcode
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: squeak.cog.v3
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
@@ -33,6 +38,11 @@ environment:
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
+    - FLAVOR: pharo.cog.spur.lowcode
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: newspeak.cog.spur
       ARCH: win32x86
       CYG_ROOT: C:\cygwin

platforms/unix/vm/sqUnixExternalPrims.c

@@ -61,7 +61,11 @@
 
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <sys/errno.h>
+#ifdef __OpenBSD__
+#   include <errno.h>
+#else
+#   include <sys/errno.h>
+#endif
 
 /* get a value for RTLD_NOW, with increasing levels of desperation... */
 

platforms/unix/vm/sqUnixMain.c

@@ -894,7 +894,10 @@ reportStackState(char *msg, char *date, int printAll, ucontext_t *uap)
 # elif __FreeBSD__ && __amd64__
 			void *fp = (void *)(uap ? uap->uc_mcontext.mc_rbp: 0);
 			void *sp = (void *)(uap ? uap->uc_mcontext.mc_rsp: 0);
-# elif __OpenBSD__
+# elif __OpenBSD__ && __i386__
+                        void *fp = (void *)(uap ? uap->sc_ebp: 0);
+                        void *sp = (void *)(uap ? uap->sc_esp: 0);
+# elif __OpenBSD__ && __amd64__
 			void *fp = (void *)(uap ? uap->sc_rbp: 0);
 			void *sp = (void *)(uap ? uap->sc_rsp: 0);
 # elif __sun__ && __i386__

platforms/unix/vm/sqUnixVMProfile.c

@@ -175,7 +175,9 @@ pcbufferSIGPROFhandler(int sig, siginfo_t *info, ucontext_t *uap)
 # define _PC_IN_UCONTEXT uc_mcontext.mc_eip
 #elif __FreeBSD__ && __amd64__
 # define _PC_IN_UCONTEXT uc_mcontext.mc_rip
-#elif __OpenBSD__
+#elif __OpenBSD__ && __i386__
+# define _PC_IN_UCONTEXT sc_eip
+#elif __OpenBSD__ && __amd64__
 # define _PC_IN_UCONTEXT sc_rip
 #else
 # error need to implement extracting pc from a ucontext_t on this system

platforms/win32/plugins/FileAttributesPlugin/Makefile.plugin

@@ -0,0 +1,8 @@
+#
+# FileAttributesPlugin uses sqWin32File.h, provided by FilePlugin
+#
+# Add $(WIN32PLUGINSDIR)/FilePlugin to the include path so sqWin32File.h
+# will be found
+#
+include ../common/Makefile.plugin
+INCLUDES += -I$(PLATDIR)/win32/plugins/FilePlugin