diff --git a/lib/Driver/UnixToolChains.cpp b/lib/Driver/UnixToolChains.cpp
index 07a19d9e548ac..7607c31b86ff2 100644
--- a/lib/Driver/UnixToolChains.cpp
+++ b/lib/Driver/UnixToolChains.cpp
@@ -346,7 +346,12 @@ toolchains::GenericUnix::constructInvocation(const StaticLinkJobAction &job,
   ArgStringList Arguments;
 
   // Configure the toolchain.
-  const char *AR = "ar";
+  const char *AR;
+  if (getTriple().isOSBinFormatWasm()) {
+    AR = "llvm-ar";
+  } else {
+    AR = "ar";
+  }
   Arguments.push_back("crs");
 
   Arguments.push_back(
diff --git a/test/ClangImporter/availability_returns_twice.swift b/test/ClangImporter/availability_returns_twice.swift
index ef9ff6ffad251..c91e922fb0e89 100644
--- a/test/ClangImporter/availability_returns_twice.swift
+++ b/test/ClangImporter/availability_returns_twice.swift
@@ -1,5 +1,6 @@
 // RUN: %target-typecheck-verify-swift
 // UNSUPPORTED: OS=windows-msvc
+// UNSUPPORTED: OS=wasi
 // In Android jmp_buf is int[16], which doesn't convert to &Int (SR-9136)
 // XFAIL: OS=linux-androideabi
 // XFAIL: OS=linux-android
diff --git a/test/lit.cfg b/test/lit.cfg
index 4511a765d1972..77b91e355b30f 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -1253,10 +1253,30 @@ elif run_os == 'wasi':
 
     config.target_object_format = "wasm"
     config.target_shared_library_prefix = 'lib'
-    config.target_shared_library_suffix = ".so"
+    config.target_shared_library_suffix = ".a"
     config.target_sdk_name = "wasi"
     config.target_runtime = "native"
 
+    # Exclude test cases that use objc-interop because clang doesn't support it
+    # with WebAssembly binary file yet.
+    testfiles = glob.glob(os.path.join(config.test_source_root, "**", "*.swift"))
+
+    def use_objc_interop(path):
+      with open(path) as f:
+        return '-enable-objc-interop' in f.read()
+
+    import fnmatch
+    def objc_interop_enabled_filenames(path, filename_pat):
+      matches = []
+      for root, dirnames, filenames in os.walk(path):
+        for filename in fnmatch.filter(filenames, filename_pat):
+          filepath = os.path.join(root, filename)
+          if not use_objc_interop(filepath): continue
+          matches.append(filename)
+      return matches
+
+    config.excludes += objc_interop_enabled_filenames(config.test_source_root, "*.swift")
+
     config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract")
 
     config.target_build_swift = ' '.join([
@@ -1273,7 +1293,7 @@ elif run_os == 'wasi':
     config.target_build_swift_dylib = (
         "%s -parse-as-library -emit-library -o '\\1'"
         % (config.target_build_swift))
-    config.target_add_rpath = r'-Xlinker -rpath -Xlinker \1'
+    config.target_add_rpath = ''
     config.target_swift_frontend = (
         '%s -frontend -target %s %s %s %s %s '
         % (config.swift, config.variant_triple, resource_dir_opt, mcp_opt,
diff --git a/tools/sil-func-extractor/SILFunctionExtractor.cpp b/tools/sil-func-extractor/SILFunctionExtractor.cpp
index 7c04d529c33fa..3e95fb3215418 100644
--- a/tools/sil-func-extractor/SILFunctionExtractor.cpp
+++ b/tools/sil-func-extractor/SILFunctionExtractor.cpp
@@ -249,6 +249,8 @@ int main(int argc, char **argv) {
   Invocation.getLangOptions().DisableAvailabilityChecking = true;
   Invocation.getLangOptions().EnableAccessControl = false;
   Invocation.getLangOptions().EnableObjCAttrRequiresFoundation = false;
+  if (Invocation.getLangOptions().Target.isOSBinFormatWasm())
+    Invocation.getLangOptions().EnableObjCInterop = false;
 
   serialization::ExtendedValidationInfo extendedInfo;
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> FileBufOrErr =