Fix BOLT flags for 3.14

Author: zanieb

cpython-unix/build-cpython.sh

@@ -284,11 +284,17 @@ if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_11}" ]; then
 fi
 
 if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_12}" ]; then
-    # Adjust BOLT flags to yield better behavior. See inline details in patch.
-    patch -p1 -i ${ROOT}/patch-configure-bolt-flags.patch
+    # On 3.14+, we upstreamed these changes and they are no longer needed
+    if [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_13}" ]; then
+        # Adjust BOLT flags to yield better behavior. See inline details in patch.
+        patch -p1 -i ${ROOT}/patch-configure-bolt-flags.patch
 
-    # Adjust BOLT application flags to make use of modern LLVM features.
-    patch -p1 -i ${ROOT}/patch-configure-bolt-apply-flags.patch
+        # Adjust BOLT application flags to make use of modern LLVM features.
+        patch -p1 -i ${ROOT}/patch-configure-bolt-apply-flags.patch
+    else
+        # We are still upstreaming some additional optimization flags
+        patch -p1 -i ${ROOT}/patch-configure-bolt-apply-flags-3.14.patch
+    fi
 fi
 
 # The optimization make targets are both phony and non-phony. This leads

cpython-unix/patch-configure-bolt-apply-flags-3.14.patch

@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index ee034e5a962..f1a69b7d4a7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2183,8 +2183,9 @@ then
+     [m4_normalize("
+      -update-debug-sections
+      -reorder-blocks=ext-tsp
+      -reorder-functions=cdsort
+      -split-functions
++     -split-strategy=cdsplit
+      -icf=1
+      -inline-all
+      -split-eh
+@@ -2196,6 +2197,7 @@ then
+      -dyno-stats
+      -use-gnu-stack
+      -frame-opt=hot
++     -hugify
+    ")]
+   )
+ fi