[3.13] gh-128456: Use '-reorder-functions=cdsort' for BOLT builds (GH-128457) (#128461)

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

(cherry picked from commit 4974bbdb290b61a2d8860de490fde1228c296753)

Co-authored-by: Zanie Blue <contact@zanie.dev>

diff --git a/configure b/configure
index 8401e07ba86c107892f757c3d3f84bca7dc875fc..b093689aeb1e4bd58832d15d55a68957f37eae3d 100755 (executable)
--- a/configure
+++ b/configure
@@ -9340,7 +9340,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 4a341b2735c1ed43bc04821ff5c963d2f168ba75..ea557fba25df9695e52df08f924e878509bd7c49 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2237,7 +2237,7 @@ then
     [m4_normalize("
      -update-debug-sections
      -reorder-blocks=ext-tsp
-     -reorder-functions=hfsort+
+     -reorder-functions=cdsort
      -split-functions
      -icf=1
      -inline-all