From e5c4dbe1b6b4b527675eb91b84fe3f99bd3e3c95 Mon Sep 17 00:00:00 2001
From: rfwang07 <wangrufeng5@huawei.com>
Date: Thu, 22 May 2025 15:26:18 +0800
Subject: [PATCH] add -strict to -Om

(cherry picked from commit e8f06fedb042c951e7f5e3e8051c1e14601df26b)
---
 0013-add-strict-to-Om.patch | 32 ++++++++++++++++++++++++++++++++
 llvm-bolt.spec              |  9 ++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 0013-add-strict-to-Om.patch

diff --git a/0013-add-strict-to-Om.patch b/0013-add-strict-to-Om.patch
new file mode 100644
index 0000000..df51fdc
--- /dev/null
+++ b/0013-add-strict-to-Om.patch
@@ -0,0 +1,32 @@
+From fc4770c48d115604cb742939e9b5fc28b6da3405 Mon Sep 17 00:00:00 2001
+From: rfwang07 <wangrufeng5@huawei.com>
+Date: Thu, 22 May 2025 15:22:45 +0800
+Subject: [PATCH] add -strict to -Om
+
+---
+ bolt/tools/driver/llvm-bolt.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/bolt/tools/driver/llvm-bolt.cpp b/bolt/tools/driver/llvm-bolt.cpp
+index 8cba4d2..60f1ad2 100644
+--- a/bolt/tools/driver/llvm-bolt.cpp
++++ b/bolt/tools/driver/llvm-bolt.cpp
+@@ -60,6 +60,7 @@ extern cl::opt<bool> CgUseSplitHotSize;
+ extern cl::opt<TailDuplication::DuplicationMode> TailDuplicationMode;
+ extern cl::opt<bool> IterativeGuess;
+ extern cl::opt<bool> AssumeABI;
++extern cl::opt<bool> StrictMode;
+ 
+ static cl::OptionCategory *BoltCategories[] = {&BoltCategory,
+                                                &BoltOptCategory,
+@@ -210,6 +211,7 @@ void handleOptionOm() {
+   opts::TailDuplicationMode = TailDuplication::TD_AGGRESSIVE;    // --tail-duplication=aggressive
+   opts::IterativeGuess = true;                                   // --iterative-guess
+   opts::AssumeABI = true;                                        // --assume-abi
++  opts::StrictMode = true;                                       // --strict
+ }
+ 
+ void boltMode(int argc, char **argv) {
+-- 
+2.39.5 (Apple Git-154)
+
diff --git a/llvm-bolt.spec b/llvm-bolt.spec
index cb69a26..974bd8e 100644
--- a/llvm-bolt.spec
+++ b/llvm-bolt.spec
@@ -22,7 +22,7 @@
 
 Name:           %{pkg_name}
 Version:        %{bolt_version}
-Release:        5
+Release:        6
 Summary:        BOLT is a post-link optimizer developed to speed up large applications
 License:        Apache 2.0
 URL:            https://github.com/llvm/llvm-project/tree/main/bolt
@@ -42,6 +42,7 @@ Patch9:         0009-support-aarch64-instrumentation.patch
 Patch10:        0010-AArch64-Add-hybrid-guess-approach-for-edge-weight-estimation.patch
 Patch11:        0011-support-D-FOT-addrs-data-parsing-for-optimized-binary.patch
 Patch12:        0012-Add-Om-for-Kunpeng-Opts.patch
+Patch13:        0013-add-strict-to-Om.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -159,6 +160,12 @@ rm -f %{buildroot}/%{_builddir}/%{bolt_srcdir}/%{_vpath_builddir}/%{_lib}/lib*.a
 %doc %{install_docdir}
 
 %changelog
+* Thu May 22 2025 rfwang07 <wangrufeng5@huawei.com> 17.0.6-6
+- Type:backport
+- ID:NA
+- SUG:NA
+- DESC: add -strict to -Om
+
 * Tue Apr 22 2025 rfwang07 <wangrufeng5@huawei.com> 17.0.6-5
 - Type:backport
 - ID:NA
-- 
Gitee