diff --git a/Source/JavaScriptCore/API/tests/testapi.cpp b/Source/JavaScriptCore/API/tests/testapi.cpp
index 2d451652c357..22bde49cd4bd 100644
--- a/Source/JavaScriptCore/API/tests/testapi.cpp
+++ b/Source/JavaScriptCore/API/tests/testapi.cpp
@@ -35,6 +35,7 @@
 #include <wtf/Expected.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/NumberOfCores.h>
+#include <wtf/MainThread.h>
 #include <wtf/Vector.h>
 #include <wtf/text/MakeString.h>
 #include <wtf/text/StringCommon.h>
@@ -1184,6 +1185,7 @@ void TestAPI::testBigInt()
 
 void configureJSCForTesting()
 {
+    WTF::initializeMainThread();
     JSC::Config::configureForTesting();
     JSC::Options::machExceptionHandlerSandboxPolicy = JSC::Options::SandboxPolicy::Allow;
 }
diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt
index 9ff6d5cf56ff..a2d73540af41 100644
--- a/Source/ThirdParty/libwebrtc/CMakeLists.txt
+++ b/Source/ThirdParty/libwebrtc/CMakeLists.txt
@@ -246,6 +246,8 @@ set(webrtc_SOURCES
     Source/third_party/boringssl/src/crypto/evp/evp.c
     Source/third_party/boringssl/src/crypto/evp/evp_ctx.c
     Source/third_party/boringssl/src/crypto/evp/pbkdf.c
+    Source/third_party/boringssl/src/crypto/evp/p_dh_asn1.c
+    Source/third_party/boringssl/src/crypto/evp/p_dh.c
     Source/third_party/boringssl/src/crypto/evp/p_dsa_asn1.c
     Source/third_party/boringssl/src/crypto/evp/p_ec_asn1.c
     Source/third_party/boringssl/src/crypto/evp/p_ec.c
diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
index 15256505d759..b0936f0bd313 100644
--- a/Source/cmake/OptionsCommon.cmake
+++ b/Source/cmake/OptionsCommon.cmake
@@ -194,6 +194,10 @@ if (DEBUG_FISSION)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index")
         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index")
     endif ()
+    if (WTF_CPU_ARM)
+        string(REPLACE "-fdebug-types-section" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
+        string(REPLACE "-fdebug-types-section" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+    endif ()
 endif ()
 
 set(GCC_OFFLINEASM_SOURCE_MAP_DEFAULT OFF)