ffi 1.17.0 → 1.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 482fe808cf14286b91be92938712e98f6332021d2773268f96ac583b5c264fc9
-  data.tar.gz: f89f881dd5e337ec5ec815e9977158b54ead3a2480bc03fd2591477c7872d29e
+  metadata.gz: d5e14157e145e6fcd1024a5dbe0a77e6ea78df08b38cf61d95426cc5f4287c13
+  data.tar.gz: 6634a6296c5c34028f0e0d952ea402b0d7a5a5234f0197b80e42ef89c944eb98
 SHA512:
-  metadata.gz: 877625d5994e1b456e8cf12a68647ce4e9d64efac2239c7a4e1806406b803fad5c1138ba0ad7e8b34ac6b8ebfeaed9f469381291f394527c523c4db8f36bd976
-  data.tar.gz: 8d78610fc0c110ad7d6da40158dab176d815c8008a1276865b9112a44b46e1d43816db7430f9ab991671e4e8fad4dec0880fa259e2e2c83afaf916f59b7bb5c9
+  metadata.gz: d088e31edfa168f488881583d6a97e77e080d54374bc7b91dc91e6bdef93648cc5375451f12379e20c6cf5e26756330fd9fbfd8805c986b85ebb94687cfb6d99
+  data.tar.gz: 6057264da88292e8fffe1d88faa6043ffc92e36ea84ac2d07f698c5d13b5358e04a69921d9aceff56ce6d63438751177cfa5070d31a9a2ffb1fa8b36f3e0a9fc

data/CHANGELOG.md

@@ -1,3 +1,54 @@
+1.17.4 / 2026-03-26
+-------------------
+
+Fixed:
+* Fix union by-value ABI mismatch with float and double types on ARM64 and X86_64.
+  See #1177 and #1178 for details.
+* Exclude libffi files, which are unnecessary. #1176
+
+
+1.17.3 / 2025-12-29
+-------------------
+
+Fixed:
+* Opt-in for MFA requirement explicitly. #1159
+* Fix type signature for FFI::AutoPointer#initialize, FFI::StructByReference#native_type and FFI::Struct#auto_ptr . #1158
+* Fix function signature of function_call in FFI trampoline. #1154
+  It failed on `aarch64-mingw-ucrt`.
+* Add workaround for segmentation faults on `aarch64-mingw-ucrt`. #1154
+* Call super in `Library#freeze` . #1154
+* Deny duplication of AutoPointer per #dup and #clone . #1173
+  They led to double free before.
+
+Added:
+* Add binary gems for Ruby-4.0, now providing binary gems for Ruby-3.0 to 4.0.
+* Add msys2_mingw_dependencies for Windows Mingw for automatic installation of libffi. #1143
+* Mark callback dispatcher thread as fork safe for Puma. #1156
+* Add missing FFI::Platform module and LastError signatures. #1169
+
+Removed:
+* Drop fat binary gems for Ruby < 3.0
+* Remove `FFI::TypesGenerator` from distributed gems. #1164
+* Remove libffi build dir after install, safing some install space. #1157
+
+
+1.17.2 / 2025-04-15
+-------------------
+
+Fixed:
+* #1144, #1145 Update libffi to 3.4.8 to fix installation issues on latest Macos on ARM64
+* Various adjustments to run the specs cleanly on Ruby-3.5 master branch.
+
+
+1.17.1 / 2024-12-30
+-------------------
+
+Fixed:
+* #1117 Restart async callback dispatcher thread after fork.
+* #1133 Add ruby-3.4 native gem.
+* #1134 Fix FFI::DataConverter non-generic usage in RBS files.
+
+
 1.17.0 / 2024-06-02
 -------------------
 

data/Gemfile

@@ -1,11 +1,15 @@
 source 'https://rubygems.org'
 
+gemspec
+
 group :development do
+  gem 'benchmark' # necessary on ruby-3.5+
   gem 'bigdecimal' # necessary on ruby-3.3+
-  gem 'bundler', '>= 1.16', '< 3'
+  gem 'bundler', '>= 1.16', '< 5.dev'
+  gem 'fiddle' # necessary on ruby-4.0+
   gem 'rake', '~> 13.0'
   gem 'rake-compiler', '~> 1.1'
-  gem 'rake-compiler-dock', '~> 1.0.pre'
+  gem 'rake-compiler-dock', '~> 1.11.0'
   gem 'rspec', '~> 3.0'
 end
 
@@ -15,7 +19,8 @@ group :doc do
 end
 
 group :type_check do
-  if RUBY_VERSION >= "2.6" && %w[ ruby truffleruby ].include?(RUBY_ENGINE)
+  if RUBY_VERSION >= "3.0" && %w[ ruby truffleruby ].include?(RUBY_ENGINE)
     gem 'rbs', '~> 3.0'
+    gem 'steep', '~> 1.6'
   end
 end

data/README.md

@@ -33,6 +33,7 @@ MyLib.puts 'Hello, World using libc!'
 
 For less minimalistic and more examples you may look at:
 
+* The [documentation](https://www.rubydoc.info/gems/ffi)
 * the `samples/` folder
 * the examples on the [wiki](https://github.com/ffi/ffi/wiki)
 * the projects using FFI listed on the wiki: https://github.com/ffi/ffi/wiki/projects-using-ffi

data/Rakefile

@@ -97,6 +97,7 @@ Bundler::GemHelper.instance.cross_platforms = %w[
   arm-linux-musl
   aarch64-linux-gnu
   aarch64-linux-musl
+  aarch64-mingw-ucrt
   x86_64-darwin
   arm64-darwin
 ]
@@ -111,6 +112,8 @@ if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
     ext.cross_platform = Bundler::GemHelper.instance.cross_platforms
     ext.cross_compiling do |spec|
       spec.files.reject! { |path| File.fnmatch?('ext/*', path) }
+      # Binary gems don't need libffi header+lib files
+      spec.metadata.delete("msys2_mingw_dependencies")
     end
     # Enable debug info for 'rake compile' but not for 'gem install'
     ext.config_options << "--enable-debug"
@@ -126,7 +129,7 @@ end
 namespace "gem" do
   task 'prepare' do
     require 'rake_compiler_dock'
-    sh "bundle package --all"
+    sh "bundle package"
   end
 
   Bundler::GemHelper.instance.cross_platforms.each do |plat|
@@ -136,9 +139,9 @@ namespace "gem" do
     desc "Build the native gem for #{plat}"
     task plat => ['prepare', 'build'] do
       RakeCompilerDock.sh <<-EOT, platform: plat
-        #{ "sudo apt-get update && sudo apt-get install -y libltdl-dev &&" if plat !~ /linux/ }
-        bundle --local &&
-        rake native:#{plat} pkg/#{gem_spec.full_name}-#{plat}.gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=${RUBY_CC_VERSION/:2.4.0/}
+        sudo apt-get update && sudo apt-get install -y libltdl-dev &&
+        bundle install --local &&
+        rake native:#{plat} pkg/#{gem_spec.full_name}-#{plat}.gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=#{RakeCompilerDock.ruby_cc_version("~>4.0", "~>3.0")}
       EOT
     end
   end
@@ -180,7 +183,7 @@ logfile = File.join(File.dirname(__FILE__), 'types_log')
 
 task types_conf do |task|
   require 'fileutils'
-  require_relative "lib/ffi/tools/types_generator"
+  require_relative "rakelib/types_generator"
   options = {}
   FileUtils.mkdir_p(File.dirname(task.name), mode: 0755 )
   File.open(task.name, File::CREAT|File::TRUNC|File::RDWR, 0644) do |f|

data/Steepfile

@@ -0,0 +1,8 @@
+target :lib do
+  signature "sig"
+
+  check "lib"
+
+  # ignore whole of lib, to just validate RBS in sig
+  ignore "lib"
+end

data/ext/ffi_c/DynamicLibrary.c

@@ -236,7 +236,7 @@ dl_error(char* buf, int size)
                    NULL, error, 0, (LPSTR)&message, 0, NULL);
 
     // Update the passed in buffer
-    snprintf(buf, size, "Failed with error %d: %s", error, message);
+    snprintf(buf, size, "Failed with error %lu: %s", error, message);
 
     // Free the allocated message
     LocalFree(message);

data/ext/ffi_c/Function.c

@@ -215,6 +215,54 @@ async_cb_dispatcher_set(struct async_cb_dispatcher *ctx)
     async_cb_dispatcher = ctx;
 }
 #endif
+
+static void
+async_cb_dispatcher_initialize(struct async_cb_dispatcher *ctx)
+{
+        ctx->async_cb_list = NULL;
+
+#if !defined(_WIN32)
+        /* n.b. we _used_ to try and destroy the mutex/cond before initializing here,
+         * but it's undefined what happens if you try and destory an unitialized cond.
+         * glibc in particular seems to wait for any concurrent waiters to finish before
+         * destroying a condvar, trying to destroy a condvar after fork that someone was
+         * waiting on pre-fork won't work. Just re-init he memory directly. */
+        pthread_mutex_init(&ctx->async_cb_mutex, NULL);
+        pthread_cond_init(&ctx->async_cb_cond, NULL);
+#else
+        InitializeCriticalSection(&ctx->async_cb_lock);
+        ctx->async_cb_cond = CreateEvent(NULL, FALSE, FALSE, NULL);
+#endif
+    ctx->thread = rb_thread_create(async_cb_event, ctx);
+
+    /* Name thread, for better debugging */
+    rb_funcall(ctx->thread, rb_intern("name="), 1, rb_str_new2("FFI Callback Dispatcher"));
+    /* Advise multi-threaded app servers to ignore this thread for the purposes of fork safety warnings */
+    rb_funcall(ctx->thread, rb_intern("thread_variable_set"), 2, ID2SYM(rb_intern("fork_safe")), Qtrue);
+}
+
+static struct async_cb_dispatcher *
+async_cb_dispatcher_ensure_created(void)
+{
+    struct async_cb_dispatcher *ctx = async_cb_dispatcher_get();
+    if (ctx == NULL) {
+        ctx = (struct async_cb_dispatcher*)ALLOC(struct async_cb_dispatcher);
+        async_cb_dispatcher_initialize(ctx);
+        async_cb_dispatcher_set(ctx);
+    }
+    return ctx;
+}
+
+
+static VALUE
+async_cb_dispatcher_atfork_child(VALUE self)
+{
+    struct async_cb_dispatcher *ctx = async_cb_dispatcher_get();
+    if (ctx) {
+        async_cb_dispatcher_initialize(ctx);
+    }
+    return Qnil;
+}
 #endif
 
 static VALUE
@@ -391,15 +439,6 @@ rbffi_Function_ForProc(VALUE rbFunctionInfo, VALUE proc)
     return callback;
 }
 
-#if !defined(_WIN32) && defined(DEFER_ASYNC_CALLBACK)
-static void
-after_fork_callback(void)
-{
-    /* Ensure that a new dispatcher thread is started in a forked process */
-    async_cb_dispatcher_set(NULL);
-}
-#endif
-
 static VALUE
 function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
 {
@@ -426,31 +465,7 @@ function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
         }
 
 #if defined(DEFER_ASYNC_CALLBACK)
-        {
-            struct async_cb_dispatcher *ctx = async_cb_dispatcher_get();
-            if (ctx == NULL) {
-                ctx = (struct async_cb_dispatcher*)ALLOC(struct async_cb_dispatcher);
-                ctx->async_cb_list = NULL;
-
-#if !defined(_WIN32)
-                pthread_mutex_init(&ctx->async_cb_mutex, NULL);
-                pthread_cond_init(&ctx->async_cb_cond, NULL);
-                if( pthread_atfork(NULL, NULL, after_fork_callback) ){
-                    rb_warn("FFI: unable to register fork callback");
-                }
-#else
-                InitializeCriticalSection(&ctx->async_cb_lock);
-                ctx->async_cb_cond = CreateEvent(NULL, FALSE, FALSE, NULL);
-#endif
-                ctx->thread = rb_thread_create(async_cb_event, ctx);
-
-                /* Name thread, for better debugging */
-                rb_funcall(ctx->thread, rb_intern("name="), 1, rb_str_new2("FFI Callback Dispatcher"));
-
-                async_cb_dispatcher_set(ctx);
-            }
-            fn->dispatcher = ctx;
-        }
+        fn->dispatcher = async_cb_dispatcher_ensure_created();
 #endif
 
         fn->closure = rbffi_Closure_Alloc(fn->info->closurePool);
@@ -1060,4 +1075,9 @@ rbffi_Function_Init(VALUE moduleFFI)
 #if defined(DEFER_ASYNC_CALLBACK) && defined(HAVE_RB_EXT_RACTOR_SAFE)
     async_cb_dispatcher_key = rb_ractor_local_storage_ptr_newkey(&async_cb_dispatcher_key_type);
 #endif
+#ifdef DEFER_ASYNC_CALLBACK
+  /* Ruby code will call this method in a Process._fork patch */
+  rb_define_singleton_method(moduleFFI, "_async_cb_dispatcher_atfork_child",
+                             async_cb_dispatcher_atfork_child, 0);
+#endif
 }

data/ext/ffi_c/MethodHandle.c

@@ -336,11 +336,13 @@ rbffi_MethodHandle_Init(VALUE module)
         rb_raise(rb_eFatal, "Could not locate offsets in trampoline code");
     }
 #else
+
+    /* static VALUE function_call(int argc, VALUE* argv, VALUE self) */
     methodHandleParamTypes[0] = &ffi_type_sint;
     methodHandleParamTypes[1] = &ffi_type_pointer;
-    methodHandleParamTypes[2] = &ffi_type_ulong;
+    methodHandleParamTypes[2] = &ffi_type_pointer;
 
-    ffiStatus = ffi_prep_cif(&mh_cif, FFI_DEFAULT_ABI, 3, &ffi_type_ulong,
+    ffiStatus = ffi_prep_cif(&mh_cif, FFI_DEFAULT_ABI, 3, &ffi_type_pointer,
             methodHandleParamTypes);
     if (ffiStatus != FFI_OK) {
         rb_raise(rb_eFatal, "ffi_prep_cif failed.  status=%#x", ffiStatus);

data/ext/ffi_c/StructLayout.c

@@ -548,29 +548,141 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
     return self;
 }
 
+static const ffi_type * const *
+get_int_types(void)
+{
+    static const ffi_type *types[5];
+    types[0] = &ffi_type_sint8;
+    types[1] = &ffi_type_sint16;
+    types[2] = &ffi_type_sint32;
+    types[3] = &ffi_type_sint64;
+    types[4] = NULL;
+    return types;
+}
+
+static const ffi_type * const *
+get_float_types(void)
+{
+    static const ffi_type *types[4];
+    types[0] = &ffi_type_float;
+    types[1] = &ffi_type_double;
+    types[2] = &ffi_type_longdouble;
+    types[3] = NULL;
+    return types;
+}
+
+static const ffi_type *
+find_type_by_alignment(const ffi_type * const *types, unsigned short alignment)
+{
+    int i;
+    for (i = 0; types[i] != NULL; i++) {
+        if (types[i]->alignment == alignment) return types[i];
+    }
+    return NULL;
+}
+
+static bool
+is_float_type(const ffi_type *type)
+{
+    int i;
+    const ffi_type * const *ftypes = get_float_types();
+    for (i = 0; ftypes[i] != NULL; i++) {
+        if (type->type == ftypes[i]->type) return true;
+    }
+    return false;
+}
+
 /*
- * call-seq: [](field)
- * @param [Symbol] field
- * @return [StructLayout::Field]
- * Get a field from the layout.
+ * Recursively inspect the leaf elements of an ffi_type.
+ *
+ * Returns the leaf type if all leaves are the same primitive type, or NULL
+ * if mixed. Sets float_only to false when any non-float leaf is encountered.
+ *
+ * Examples (float_only initially true):
+ *   {double, double}  -> &ffi_type_double, float_only = true
+ *   {float, double}   -> NULL,             float_only = true
+ *   {float, int}      -> NULL,             float_only = false
  */
+static const ffi_type *
+find_homogeneous_leaf_type(const ffi_type *type, bool *float_only)
+{
+    const ffi_type *result = NULL;
+    int i;
+
+    if (type->type != FFI_TYPE_STRUCT || type->elements == NULL) {
+        if (!is_float_type(type)) {
+            *float_only = false;
+        }
+        return type;
+    }
+
+    for (i = 0; type->elements[i] != NULL; i++) {
+        const ffi_type *elem = find_homogeneous_leaf_type(type->elements[i], float_only);
+
+        if (result == NULL) {
+            result = elem;
+        } else if (elem == NULL || result != elem) {
+            result = NULL;
+        }
+    }
+
+    return result;
+}
+
 static VALUE
 struct_layout_union_bang(VALUE self)
 {
-    const ffi_type *alignment_types[] = { &ffi_type_sint8, &ffi_type_sint16, &ffi_type_sint32, &ffi_type_sint64,
-                                          &ffi_type_float, &ffi_type_double, &ffi_type_longdouble, NULL };
     StructLayout* layout;
     ffi_type *t = NULL;
     int count, i;
+    bool float_only = true;
+    const ffi_type *homogeneous = NULL;
 
     TypedData_Get_Struct(self, StructLayout, &rbffi_struct_layout_data_type, layout);
 
-    for (i = 0; alignment_types[i] != NULL; ++i) {
-        if (alignment_types[i]->alignment == layout->align) {
-            t = (ffi_type *) alignment_types[i];
-            break;
-        }
+    /*
+     * __union! replaces the real field types with a repeated filler type.
+     * The filler must be chosen so that libffi uses the same calling convention
+     * as the C compiler would for the real union.
+     *
+     * The rules vary by architecture:
+     *
+     * ARM64: A "Homogeneous Floating-point Aggregate" (HFA) is
+     * passed in floating-point registers (d0-d3). An HFA requires all members
+     * to be the *same* float type. {double, double} is an HFA; {float, double}
+     * is NOT. Non-HFAs use integer registers.
+     *
+     * x86_64 targets using the System V ABI (Linux/macOS/BSD, not Windows):
+     * an eightbyte containing only float/double fields is classified as SSE
+     * and passed in XMM registers, regardless of whether the float types are
+     * mixed. {float, double} is SSE; {int, double} is INTEGER.
+     *
+     * Strategy:
+     * 1. If all fields are the same float type, use that type directly.
+     *    Correct on all platforms.
+     * 2. If fields are mixed float types (e.g. {float, double}):
+     *    - On ARM64: not an HFA, use integer filler.
+     *    - On x86_64 System V targets: still SSE class, use float filler.
+     * 3. Otherwise: use integer filler.
+     */
+    homogeneous = find_homogeneous_leaf_type(layout->base.ffiType, &float_only);
+
+    if (homogeneous != NULL && float_only) {
+        /* Case 1: all fields are the same float type. */
+        t = (ffi_type *) homogeneous;
+    }
+#if defined(__x86_64__) && !defined(_WIN32)
+    else if (float_only) {
+        /* Case 2: mixed float types use float filler on SysV x86_64. */
+        t = (ffi_type *) find_type_by_alignment(get_float_types(), layout->align);
     }
+#endif
+
+    if (t == NULL) {
+        /* Case 3: integer or mixed int/float — use integer filler */
+        t = (ffi_type *) find_type_by_alignment(get_int_types(), layout->align);
+    }
+
     if (t == NULL) {
         rb_raise(rb_eRuntimeError, "cannot create libffi union representation for alignment %d", layout->align);
         return Qnil;
@@ -588,6 +700,12 @@ struct_layout_union_bang(VALUE self)
     return self;
 }
 
+/*
+ * call-seq: [](field)
+ * @param [Symbol] field
+ * @return [StructLayout::Field]
+ * Get a field from the layout.
+ */
 static VALUE
 struct_layout_aref(VALUE self, VALUE field)
 {
@@ -766,4 +884,3 @@ rbffi_StructLayout_Init(VALUE moduleFFI)
     rb_define_method(rbffi_StructLayoutClass, "__union!", struct_layout_union_bang, 0);
 
 }
-

data/ext/ffi_c/libffi/LICENSE

@@ -1,4 +1,4 @@
-libffi - Copyright (c) 1996-2024  Anthony Green, Red Hat, Inc and others.
+libffi - Copyright (c) 1996-2025  Anthony Green, Red Hat, Inc and others.
 See source files for details.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/ext/ffi_c/libffi/Makefile.am

@@ -4,6 +4,10 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 
 ACLOCAL_AMFLAGS = -I m4
 
+# Alias required by AX_ENABLE_BUILDDIR / config-ml
+.PHONY: all-configured
+all-configured: all
+
 SUBDIRS = include testsuite man
 if BUILD_DOCS
 ## This hack is needed because it doesn't seem possible to make a
@@ -14,15 +18,15 @@ if BUILD_DOCS
 SUBDIRS += doc
 endif
 
-EXTRA_DIST = LICENSE ChangeLog.old					\
-	m4/libtool.m4 m4/lt~obsolete.m4					\
-	 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4			\
-	 m4/ltversion.m4 src/debug.c msvcc.sh				\
-	generate-darwin-source-and-headers.py				\
-	libffi.xcodeproj/project.pbxproj				\
-        src/powerpc/t-aix                                               \
-	libtool-ldflags libtool-version configure.host README.md        \
-	libffi.map.in LICENSE-BUILDTOOLS msvc_build make_sunver.pl
+EXTRA_DIST = LICENSE ChangeLog.old                          \
+  m4/libtool.m4 m4/lt~obsolete.m4                           \
+  m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4             \
+  m4/ltversion.m4 src/debug.c msvcc.sh                      \
+  generate-darwin-source-and-headers.py                     \
+  libffi.xcodeproj/project.pbxproj                          \
+  src/powerpc/t-aix                                         \
+  libtool-ldflags libtool-version configure.host README.md  \
+  libffi.map.in LICENSE-BUILDTOOLS msvc_build make_sunver.pl
 
 # local.exp is generated by configure
 DISTCLEANFILES = local.exp
@@ -55,14 +59,15 @@ noinst_HEADERS = src/aarch64/ffitarget.h src/aarch64/internal.h		\
 	src/m32r/ffitarget.h src/m68k/ffitarget.h			\
 	src/m88k/ffitarget.h src/metag/ffitarget.h			\
 	src/microblaze/ffitarget.h src/mips/ffitarget.h			\
-	src/moxie/ffitarget.h src/nios2/ffitarget.h			\
+	src/moxie/ffitarget.h \
 	src/or1k/ffitarget.h src/pa/ffitarget.h				\
 	src/powerpc/ffitarget.h src/powerpc/asm.h			\
-	src/powerpc/ffi_powerpc.h src/riscv/ffitarget.h			\
+	src/powerpc/ffi_powerpc.h src/powerpc/internal.h		\
+	src/riscv/ffitarget.h src/riscv/internal.h			\
 	src/s390/ffitarget.h src/s390/internal.h src/sh/ffitarget.h	\
 	src/sh64/ffitarget.h src/sparc/ffitarget.h			\
 	src/sparc/internal.h src/tile/ffitarget.h src/vax/ffitarget.h	\
-	src/wasm32/ffitarget.h \
+	src/wasm/ffitarget.h \
 	src/x86/ffitarget.h src/x86/internal.h src/x86/internal64.h	\
 	src/x86/asmnames.h src/xtensa/ffitarget.h src/dlmalloc.c	\
 	src/kvx/ffitarget.h src/kvx/asm.h				\
@@ -80,7 +85,7 @@ EXTRA_libffi_la_SOURCES = src/aarch64/ffi.c src/aarch64/sysv.S		\
 	src/metag/ffi.c src/metag/sysv.S src/microblaze/ffi.c		\
 	src/microblaze/sysv.S src/mips/ffi.c src/mips/o32.S		\
 	src/mips/n32.S src/moxie/ffi.c src/moxie/eabi.S			\
-	src/nios2/ffi.c src/nios2/sysv.S src/or1k/ffi.c			\
+	src/or1k/ffi.c			\
 	src/or1k/sysv.S src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S	\
 	src/pa/hpux64.S src/powerpc/ffi.c src/powerpc/ffi_sysv.c	\
 	src/powerpc/ffi_linux64.c src/powerpc/sysv.S			\
@@ -93,7 +98,7 @@ EXTRA_libffi_la_SOURCES = src/aarch64/ffi.c src/aarch64/sysv.S		\
 	src/sh64/sysv.S src/sparc/ffi.c src/sparc/ffi64.c		\
 	src/sparc/v8.S src/sparc/v9.S src/tile/ffi.c src/tile/tile.S	\
 	src/vax/ffi.c src/vax/elfbsd.S src/x86/ffi.c src/x86/sysv.S	\
-	src/wasm32/ffi.c \
+	src/wasm/ffi.c \
 	src/x86/ffiw64.c src/x86/win64.S src/x86/ffi64.c		\
 	src/x86/unix64.S src/x86/sysv_intel.S src/x86/win64_intel.S	\
 	src/xtensa/ffi.c src/xtensa/sysv.S src/kvx/ffi.c		\
@@ -146,7 +151,7 @@ libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) $(libffi_version_script
 libffi_la_DEPENDENCIES = $(libffi_la_LIBADD) $(libffi_version_dep)
 
 AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
-AM_CCASFLAGS = $(AM_CPPFLAGS)
+AM_CCASFLAGS = '$(AM_CPPFLAGS)'
 
 dist-hook:
 	d=`(cd $(distdir); pwd)`; (cd doc; make pdf; cp *.pdf $$d/doc)