Review cleanup

Author: zanieb

cpython-unix/build.py

@@ -88,18 +88,20 @@ def add_target_env(env, build_platform, target_triple, build_env):
     extra_host_cflags = []
     extra_host_ldflags = []
 
-    if build_platform == "linux_x86_64":
+    if build_platform.startswith("linux_"):
         machine = platform.machine()
 
         if machine == "aarch64":
             env["BUILD_TRIPLE"] = "aarch64-unknown-linux-gnu"
-        else:
+        elif machine == "x86_64":
             env["BUILD_TRIPLE"] = "x86_64-unknown-linux-gnu"
             env["TARGET_TRIPLE"] = (
                 target_triple.replace("x86_64_v2-", "x86_64-")
                 .replace("x86_64_v3-", "x86_64-")
                 .replace("x86_64_v4-", "x86_64-")
             )
+        else:
+            raise Exception("unhandled Linux machine value: %s" % machine)
 
         # This will make x86_64_v2, etc count as cross-compiling. This is
         # semantically correct, since the current machine may not support
@@ -109,10 +111,6 @@ def add_target_env(env, build_platform, target_triple, build_env):
         ):
             env["CROSS_COMPILING"] = "1"
 
-    elif build_platform == "linux_aarch64":
-        env["BUILD_TRIPLE"] = "aarch64-unknown-linux-gnu"
-        env["TARGET_TRIPLE"] = "aarch64-unknown-linux-gnu"
-
     elif build_platform.startswith("macos_"):
         machine = platform.machine()
 
@@ -196,6 +194,8 @@ def add_target_env(env, build_platform, target_triple, build_env):
 
         extra_host_cflags.extend(["-isysroot", host_sdk_path])
         extra_host_ldflags.extend(["-isysroot", host_sdk_path])
+    else:
+        raise Exception("unhandled build platform: %s" % build_platform)
 
     env["EXTRA_HOST_CFLAGS"] = " ".join(extra_host_cflags)
     env["EXTRA_HOST_LDFLAGS"] = " ".join(extra_host_ldflags)
@@ -505,7 +505,7 @@ def python_build_info(
     binary_suffix = ""
 
     if platform in ("linux_x86_64", "linux_aarch64"):
-        arch = "aarch64" if platform == "linux_aarch64" else "x86_64"
+        arch = platform.removeprefix("linux_")
 
         bi["core"]["static_lib"] = (
             "install/lib/python{version}/config-{version}{binary_suffix}-{arch}-linux-gnu/libpython{version}{binary_suffix}.a".format(

cpython-unix/targets.yml

@@ -202,6 +202,7 @@ aarch64-unknown-linux-gnu:
   # Blocked on:
   #   BOLT-ERROR: Cannot relax adr in non-simple function
   #   trampoline_code_table/1. Use --strict option to override
+  # See https://github.com/llvm/llvm-project/issues/146541
   # bolt_capable: true
 
 arm64-apple-tvos:

docs/running.rst

@@ -143,7 +143,7 @@ Common configurations include:
    Profile guided optimization.
 
    Starting with CPython 3.12, BOLT is also applied alongside traditional
-   PGO on platforms supporting BOLT. (Currently just Linux aarch64 and x86-64.)
+   PGO on platforms supporting BOLT. (Currently just Linux x86-64.)
 
 ``lto``
    Link-time optimization.