--- a/Behavior.st	Wed Dec 18 21:53:00 2019 +0000
+++ b/Behavior.st	Wed Dec 18 21:54:05 2019 +0000
@@ -2559,8 +2559,8 @@
 # if ! defined(FAST_ARRAY_MEMSET)
     REGISTER char *cp;
     short *sp;
-#  if defined(__i386__) || defined(__x86__) || defined(__x86_64__) || defined(__sparc__)
-    int *lp;
+#  if defined(__i386__) || defined(__x86__) || defined(__x86_64__) || defined(__sparc__) || defined(__riscv64__)
+    int *lp;    
 #  else
 #   error "please (conditionally) declare lp as pointer to 4byte integer type"
 #  endif

--- a/ExternalLibraryFunction.st	Wed Dec 18 21:53:00 2019 +0000
+++ b/ExternalLibraryFunction.st	Wed Dec 18 21:54:05 2019 +0000
@@ -115,14 +115,16 @@
  */
 
 /* ---- Intel x86 Win32 ---------- */
-#define CALLTYPE_FFI_SYSV FFI_SYSV
-#ifdef X86_WIN32
-# define CALLTYPE_FFI_STDCALL FFI_STDCALL
-#elif defined(X86_WIN64)
-# define CALLTYPE_FFI_STDCALL FFI_WIN64  
-#else
-# define CALLTYPE_FFI_UNIX64 FFI_UNIX64
-#endif
+#if defined(__i386__) || defined(__x86_64__)
+# define CALLTYPE_FFI_SYSV FFI_SYSV
+# ifdef X86_WIN32
+#  define CALLTYPE_FFI_STDCALL FFI_STDCALL
+# elif defined(X86_WIN64)
+#  define CALLTYPE_FFI_STDCALL FFI_WIN64  
+# else
+#  define CALLTYPE_FFI_UNIX64 FFI_UNIX64
+# endif
+#endif // defined(__i386__) || defined(__x86_64__)
 
 #else /* NO FFI */