File tree Expand file tree Collapse file tree 3 files changed +36
-8
lines changed Expand file tree Collapse file tree 3 files changed +36
-8
lines changed Original file line number Diff line number Diff line change @@ -284,11 +284,17 @@ if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_11}" ]; then
284284fi
285285
286286if [ -n " ${PYTHON_MEETS_MINIMUM_VERSION_3_12} " ]; then
287- # Adjust BOLT flags to yield better behavior. See inline details in patch.
288- patch -p1 -i ${ROOT} /patch-configure-bolt-flags.patch
287+ # On 3.14+, we upstreamed these changes and they are no longer needed
288+ if [ -n " ${PYTHON_MEETS_MAXIMUM_VERSION_3_13} " ]; then
289+ # Adjust BOLT flags to yield better behavior. See inline details in patch.
290+ patch -p1 -i ${ROOT} /patch-configure-bolt-flags.patch
289291
290- # Adjust BOLT application flags to make use of modern LLVM features.
291- patch -p1 -i ${ROOT} /patch-configure-bolt-apply-flags.patch
292+ # Adjust BOLT application flags to make use of modern LLVM features.
293+ patch -p1 -i ${ROOT} /patch-configure-bolt-apply-flags.patch
294+ else
295+ # We are still upstreaming some additional optimization flags
296+ patch -p1 -i ${ROOT} /patch-configure-bolt-apply-flags-3.14.patch
297+ fi
292298fi
293299
294300# The optimization make targets are both phony and non-phony. This leads
Original file line number Diff line number Diff line change 1+ diff --git a/configure.ac b/configure.ac
2+ index ee034e5a962..f1a69b7d4a7 100644
3+ --- a/configure.ac
4+ +++ b/configure.ac
5+ @@ -2183,8 +2183,9 @@ then
6+ [m4_normalize("
7+ -update-debug-sections
8+ -reorder-blocks=ext-tsp
9+ -reorder-functions=cdsort
10+ -split-functions
11+ + -split-strategy=cdsplit
12+ -icf=1
13+ -inline-all
14+ -split-eh
15+ @@ -2196,6 +2197,7 @@ then
16+ -dyno-stats
17+ -use-gnu-stack
18+ -frame-opt=hot
19+ + -hugify
20+ ")]
21+ )
22+ fi
Original file line number Diff line number Diff line change 8080 "python_tag" : "cp313" ,
8181 },
8282 "cpython-3.14" : {
83- "url" : "https://www.python.org/ftp/python/3.14.0/Python-3.14.0a3 .tar.xz" ,
84- "size" : 22749680 ,
85- "sha256" : "94349df207456a575a8867c20b4ca434f870e1920dcdcc8fdf797e1af49abe90 " ,
86- "version" : "3.14.0a3 " ,
83+ "url" : "https://www.python.org/ftp/python/3.14.0/Python-3.14.0a4 .tar.xz" ,
84+ "size" : 22798932 ,
85+ "sha256" : "c24f07881873c1d460228795ca6ca8c99130e30c773c91463d30d7ea8ff0e70b " ,
86+ "version" : "3.14.0a4 " ,
8787 "licenses" : ["Python-2.0" , "CNRI-Python" ],
8888 "license_file" : "LICENSE.cpython.txt" ,
8989 "python_tag" : "cp314" ,
You can’t perform that action at this time.
0 commit comments