Fix up to make generic

Author: savannahostrowski

Tools/jit/_targets.py

@@ -518,24 +518,31 @@ def get_target(host: str) -> _COFF | _ELF | _MachO:
     # ghccc currently crashes Clang when combined with musttail on aarch64. :(
     target: _COFF | _ELF | _MachO
     if re.fullmatch(r"aarch64-apple-darwin.*", host):
-        target = _MachO(host, alignment=8, prefix="_")
+        condition = "defined(__aarch64__)" and "defined(__APPLE__)"
+        target = _MachO(host, condition, alignment=8, prefix="_")
     elif re.fullmatch(r"aarch64-pc-windows-msvc", host):
         args = ["-fms-runtime-lib=dll"]
-        target = _COFF(host, alignment=8, args=args)
+        condition = "defined(_M_ARM64)"
+        target = _COFF(host, condition, alignment=8, args=args)
     elif re.fullmatch(r"aarch64-.*-linux-gnu", host):
         args = ["-fpic"]
-        target = _ELF(host, alignment=8, args=args)
+        condition = "defined(__aarch64__)" and "defined(__linux__)"
+        target = _ELF(host, condition, alignment=8, args=args)
     elif re.fullmatch(r"i686-pc-windows-msvc", host):
         args = ["-DPy_NO_ENABLE_SHARED"]
-        target = _COFF(host, args=args, ghccc=True, prefix="_")
+        condition = "defined(_M_IX86)"
+        target = _COFF(host, condition, args=args, ghccc=True, prefix="_")
     elif re.fullmatch(r"x86_64-apple-darwin.*", host):
-        target = _MachO(host, ghccc=True, prefix="_")
+        condition = "defined(__x86_64__)" and "defined(__APPLE__)"
+        target = _MachO(host, condition, ghccc=True, prefix="_")
     elif re.fullmatch(r"x86_64-pc-windows-msvc", host):
         args = ["-fms-runtime-lib=dll"]
-        target = _COFF(host, args=args, ghccc=True)
+        condition = "defined(_M_X64)"
+        target = _COFF(host, condition, args=args, ghccc=True)
     elif re.fullmatch(r"x86_64-.*-linux-gnu", host):
         args = ["-fpic"]
-        target = _ELF(host, args=args, ghccc=True)
+        condition = "defined(__x86_64__)" and "defined(__linux__)"
+        target = _ELF(host, condition, args=args, ghccc=True)
     else:
         raise ValueError(host)
     return target

Tools/jit/build.py

@@ -31,9 +31,9 @@
         args.target.build(pathlib.Path.cwd(), comment=comment)
 
     else:
-        # Multiple triples specified, assume this is a macOS multiarchitecture build
+        # Multiple triples specified, assume this is a macOS multi-architecture build
         # - Generate multiple stencil headers
-        # - Generate a helper header that include sthe stencils for the current
+        # - Generate a helper header that includes the stencils for the current
         #   architecture.
         for target in args.target:
             target.debug = args.debug
@@ -43,8 +43,7 @@
 
         with open("jit_stencils.h", "w") as fp:
             for idx, target in enumerate(args.target):
-                cpu, _, _ = target.triple.partition("-")
-                fp.write(f"#{'if' if idx == 0 else 'elif'} defined(__{cpu}__)\n")
+                fp.write(f"#{'if' if idx == 0 else 'elif'} defined(__{target.condition}__)\n")
                 fp.write(f'#   include "jit_stencils-{target.triple}.h"\n')
 
             fp.write("#else\n")