frida 16.4.5 → 16.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida",
-  "version": "16.4.5",
+  "version": "16.4.6",
   "authors": [
     "Frida Developers"
   ],

package/releng/deps.py

@@ -113,8 +113,10 @@ def parse_set_option_value(v: str) -> set[str]:
 
 def query_toolchain_prefix(machine: MachineSpec,
                            cache_dir: Path) -> Path:
-    identifier = "windows-x86" if machine.os == "windows" and machine.arch in {"x86", "x86_64"} \
-            else machine.identifier
+    if machine.os == "windows":
+        identifier = "windows-x86" if machine.arch in {"x86", "x86_64"} else machine.os_dash_arch
+    else:
+        identifier = machine.identifier
     return cache_dir / f"toolchain-{identifier}"
 
 
@@ -965,7 +967,7 @@ def compute_bundle_parameters(bundle: Bundle,
                               machine: MachineSpec,
                               version: str) -> tuple[str, str]:
     if bundle == Bundle.TOOLCHAIN and machine.os == "windows":
-        os_arch_config = "windows-x86"
+        os_arch_config = "windows-x86" if machine.arch in {"x86", "x86_64"} else machine.os_dash_arch
     else:
         os_arch_config = machine.identifier
     filename = f"{bundle.name.lower()}-{os_arch_config}.tar.xz"

package/releng/deps.toml

@@ -338,7 +338,7 @@ options = [
 
 [quickjs]
 name = "QuickJS"
-version = "078b2a00fe7347775eed6273f972cd3a8aff7bdd"
+version = "b3582307ed491e5efb5e54fe14d6bd5675857b51"
 url = "https://github.com/frida/quickjs.git"
 options = [
     "-Dlibc=false",
@@ -356,7 +356,7 @@ when = """ \
        } \
        """
 name = "TinyCC"
-version = "a438164dd4c453ae62c1224b4b7997507a388b3d"
+version = "722c253d8dece3bc9a46b6f510c6682329d838b7"
 url = "https://github.com/frida/tinycc.git"
 
 [openssl]
@@ -375,7 +375,7 @@ when = """ \
        and machine.os != 'qnx' \
        """
 name = "V8"
-version = "77a2b0fac0a9e1c2b1ccb06957dbb03781622baf"
+version = "9492bfc5ca8615be651b85336caafa8f3c730cd7"
 url = "https://github.com/frida/v8.git"
 options = [
     "-Ddebug=false",

package/releng/env.py

@@ -267,7 +267,7 @@ def can_run_host_binaries(build_machine: MachineSpec,
 
     if host_os == build_os:
         if build_os == "windows":
-            return True
+            return build_arch == "arm64" or host_arch != "arm64"
 
         if build_os == "macos":
             if build_arch == "arm64" and host_arch == "x86_64":

package/releng/machine_spec.py

@@ -88,7 +88,7 @@ class MachineSpec:
         if self.identifier == host_machine.identifier and host_machine.triplet is not None:
             return host_machine
         if self.os == "windows":
-            if self.arch == "x86_64" and host_machine.arch == "x86":
+            if host_machine.arch in {"x86_64", "x86"}:
                 return host_machine
             if self.arch == host_machine.arch:
                 return host_machine
@@ -137,7 +137,7 @@ class MachineSpec:
 
     @property
     def msvc_platform(self) -> str:
-        return "x64" if self.arch == "x86_64" else "x86"
+        return "x64" if self.arch == "x86_64" else self.arch
 
     @property
     def is_apple(self) -> str:

package/releng/meson/mesonbuild/compilers/asm.py

@@ -208,6 +208,9 @@ class MasmARMCompiler(Compiler):
     language = 'masm'
     id = 'armasm'
 
+    def get_argument_syntax(self) -> str:
+        return 'msvc'
+
     def needs_static_linker(self) -> bool:
         return True
 
@@ -250,6 +253,9 @@ class MasmARMCompiler(Compiler):
     def get_crt_compile_args(self, crt_val: str, buildtype: str) -> T.List[str]:
         return []
 
+    def get_dependency_compile_args(self, dep: 'Dependency') -> T.List[str]:
+        return [arg for arg in super().get_dependency_compile_args(dep) if not arg.startswith("-D")]
+
     def depfile_for_object(self, objfile: str) -> T.Optional[str]:
         return None
 

package/releng/meson/mesonbuild/environment.py

@@ -300,6 +300,8 @@ def detect_windows_arch(compilers: CompilersDict) -> str:
     for compiler in compilers.values():
         if compiler.id == 'msvc' and (compiler.target in {'x86', '80x86'}):
             return 'x86'
+        if compiler.id == 'msvc' and os_arch == 'arm64' and compiler.target == 'x64':
+            return 'x86_64'
         if compiler.id == 'clang-cl' and compiler.target == 'x86':
             return 'x86'
         if compiler.id == 'gcc' and compiler.has_builtin_define('__i386__'):

package/subprojects/frida-core.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/frida/frida-core.git
-revision = 16.4.5
+revision = 16.4.6
 depth = 1
 
 [provide]