Merge main and fix conflicts

savannahostrowski · Apr 30, 2025 · Feb 20, 2024 · Sep 25, 2024 · Sep 25, 2024 · Sep 25, 2024
commit 3bc28205c31e79e313d3a56116350ba0514e5d55
@@ -25,13 +25,14 @@
 CPYTHON = TOOLS.parent
 PYTHON_EXECUTOR_CASES_C_H = CPYTHON / "Python" / "executor_cases.c.h"
 TOOLS_JIT_TEMPLATE_C = TOOLS_JIT / "template.c"
-ASYNCIO_RUNNER=asyncio.Runner()
+ASYNCIO_RUNNER = asyncio.Runner()
 
 _S = typing.TypeVar("_S", _schema.COFFSection, _schema.ELFSection, _schema.MachOSection)
 _R = typing.TypeVar(
     "_R", _schema.COFFRelocation, _schema.ELFRelocation, _schema.MachORelocation
 )
 
+
 @dataclasses.dataclass
 class _Target(typing.Generic[_S, _R]):
     triple: str
@@ -44,6 +45,7 @@ class _Target(typing.Generic[_S, _R]):
     debug: bool = False
     verbose: bool = False
     known_symbols: dict[str, int] = dataclasses.field(default_factory=dict)
+    basename: str = ""
 
     def _compute_digest(self, out: pathlib.Path) -> str:
         hasher = hashlib.sha256()
@@ -178,7 +180,12 @@ async def _build_stencils(self) -> dict[str, _stencils.StencilGroup]:
         return stencil_groups
 
     def build(
-        self, out: pathlib.Path, *, comment: str = "", force: bool = False, stencils_h: str = "jit_stencils.h"
+        self,
+        out: pathlib.Path,
+        *,
+        comment: str = "",
+        force: bool = False,
+        stencils_h: str = "jit_stencils.h",
     ) -> None:
         """Build jit_stencils.h in the given directory."""
         if not self.stable:
@@ -499,30 +506,41 @@ def get_target(host: str) -> _COFF | _ELF | _MachO:
     target: _COFF | _ELF | _MachO
     if re.fullmatch(r"aarch64-apple-darwin.*", host):
         condition = "defined(__aarch64__) && defined(__APPLE__)"
- condition, alignment=8, prefix="_")
+>
+            host, condition, alignment=8, prefix="_", basename="aarch64-apple-darwin"
+        )
     elif re.fullmatch(r"aarch64-pc-windows-msvc", host):
-        args = ["-fms-runtime-lib=dll"]
+        args = ["-fms-runtime-lib=dll", "-fplt"]
         condition = "defined(_M_ARM64)"
  condition, alignment=8, args=args)
     elif re.fullmatch(r"aarch64-.*-linux-gnu", host):
-        args = ["-fpic"]
+        args = [
+            "-fpic",
+            # On aarch64 Linux, intrinsics were being emitted and this flag
+            # was required to disable them.
+            "-mno-outline-atomics",
+        ]
         condition = "aarch64__) && defined(__linux__)"
  condition, alignment=8, args=args)
     elif re.fullmatch(r"i686-pc-windows-msvc", host):
-        args = ["-DPy_NO_ENABLE_SHARED"]
+        args = [
+            "-DPy_NO_ENABLE_SHARED",
+            # __attribute__((preserve_none)) is not supported
+            "-Wno-ignored-attributes",
+        ]
         condition = "defined(_M_IX86)"
- condition, args=args, ghccc=True, prefix="_")
+ condition, args=args, prefix="_")
     elif re.fullmatch(r"x86_64-apple-darwin.*", host):
         condition = "defined(__x86_64__) && defined(__APPLE__)"
- condition, ghccc=True, prefix="_")
+ condition, prefix="_", basename="x86_64-apple-darwin")
     elif re.fullmatch(r"x86_64-pc-windows-msvc", host):
         args = ["-fms-runtime-lib=dll"]
         condition = "defined(_M_X64)"
- condition, args=args, ghccc=True)
+ condition, args=args)
     elif re.fullmatch(r"x86_64-.*-linux-gnu", host):
-        args = ["-fpic"]
+        args = ["-fno-pic", "-mcmodel=medium", "-mlarge-data-threshold=0"]
         condition = "defined(__x86_64__) && defined(__linux__)"
- condition, args=args, ghccc=True)
+ condition, args=args)
     else:
         raise ValueError(host)
     return target