From b923f4879e5ed7e546e2d549f308969dde301eee Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 4 Jan 2025 00:49:21 +0100
Subject: [PATCH] [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>
---
 configure    | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 8401e07ba86c..b093689aeb1e 100755
--- 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 4a341b2735c1..ea557fba25df 100644
--- 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
-- 
2.47.3