From: Zanie Blue <contact@zanie.dev>
Date: Fri, 3 Jan 2025 20:49:50 +0000 (-0600)
Subject: gh-128456: Use '-reorder-functions=cdsort' for BOLT builds (#128457)
X-Git-Tag: v3.14.0a4~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4974bbdb290b61a2d8860de490fde1228c296753;p=thirdparty%2FPython%2Fcpython.git

gh-128456: Use '-reorder-functions=cdsort' for BOLT builds (#128457)

'hfsort+' is deprecated in favor of 'cdsort'.
---

diff --git a/configure b/configure
index 86b96d6208fe..08fec03bef42 100755
--- a/configure
+++ b/configure
@@ -9403,7 +9403,7 @@ printf "%s\n" "$BOLT_INSTRUMENT_FLAGS" >&6; }
 printf %s "checking BOLT_APPLY_FLAGS... " >&6; }
 if test -z "${BOLT_APPLY_FLAGS}"
 then
-  BOLT_APPLY_FLAGS=" -update-debug-sections -reorder-blocks=ext-tsp -reorder-functions=hfsort+ -split-functions -icf=1 -inline-all -split-eh -reorder-functions-use-hot-size -peepholes=none -jump-tables=aggressive -inline-ap -indirect-call-promotion=all -dyno-stats -use-gnu-stack -frame-opt=hot "
+  BOLT_APPLY_FLAGS=" -update-debug-sections -reorder-blocks=ext-tsp -reorder-functions=cdsort -split-functions -icf=1 -inline-all -split-eh -reorder-functions-use-hot-size -peepholes=none -jump-tables=aggressive -inline-ap -indirect-call-promotion=all -dyno-stats -use-gnu-stack -frame-opt=hot "
 
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BOLT_APPLY_FLAGS" >&5
diff --git a/configure.ac b/configure.ac
index 50b130f2c802..ecaf0fa9c43d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2183,7 +2183,7 @@ then
     [m4_normalize("
      -update-debug-sections
      -reorder-blocks=ext-tsp
-     -reorder-functions=hfsort+
+     -reorder-functions=cdsort
      -split-functions
      -icf=1
      -inline-all