From 3aeb8d9eb04b667d528a069514aa117a58dc5fdd Mon Sep 17 00:00:00 2001
From: XKK <huyingsong@huawei.com>
Date: Fri, 13 Oct 2023 11:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AC=E4=BB=B6pac=E5=90=91=E5=90=8Ecfi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: XKK <huyingsong@huawei.com>
---
 frameworks/ans/BUILD.gn                   | 2 +-
 frameworks/js/napi/BUILD.gn               | 2 +-
 frameworks/js/napi/src/manager/BUILD.gn   | 2 +-
 frameworks/js/napi/src/reminder/BUILD.gn  | 4 ++--
 frameworks/js/napi/src/subscribe/BUILD.gn | 2 +-
 services/ans/BUILD.gn                     | 2 +-
 services/distributed/BUILD.gn             | 2 +-
 tools/dump/BUILD.gn                       | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn
index 92524efdd..bd2d2f539 100644
--- a/frameworks/ans/BUILD.gn
+++ b/frameworks/ans/BUILD.gn
@@ -42,7 +42,7 @@ ohos_shared_library("ans_innerkits") {
     cfi_cross_dso = true
     debug = false
   }
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
 
   include_dirs = [ "${inner_api_path}" ]
 
diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn
index 3d8ba0be5..2bff8d26c 100644
--- a/frameworks/js/napi/BUILD.gn
+++ b/frameworks/js/napi/BUILD.gn
@@ -50,7 +50,7 @@ ohos_shared_library("notification") {
     cfi_cross_dso = true
     debug = false
   }
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
 
   include_dirs = [
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
diff --git a/frameworks/js/napi/src/manager/BUILD.gn b/frameworks/js/napi/src/manager/BUILD.gn
index c84977487..aabb6277b 100644
--- a/frameworks/js/napi/src/manager/BUILD.gn
+++ b/frameworks/js/napi/src/manager/BUILD.gn
@@ -35,7 +35,7 @@ ohos_shared_library("notificationmanager") {
     cfi_cross_dso = true
     debug = false
   }
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
 
   include_dirs = [
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
diff --git a/frameworks/js/napi/src/reminder/BUILD.gn b/frameworks/js/napi/src/reminder/BUILD.gn
index 180a6318e..a4204f5a9 100644
--- a/frameworks/js/napi/src/reminder/BUILD.gn
+++ b/frameworks/js/napi/src/reminder/BUILD.gn
@@ -35,7 +35,7 @@ ohos_shared_library("reminderagent") {
     cfi_cross_dso = true
     debug = false
   }
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
 
   include_dirs = [
     "../../include",
@@ -86,7 +86,7 @@ ohos_shared_library("reminderagentmanager") {
     cfi_cross_dso = true
     debug = false
   }
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
 
   include_dirs = [
     "../../include",
diff --git a/frameworks/js/napi/src/subscribe/BUILD.gn b/frameworks/js/napi/src/subscribe/BUILD.gn
index db4d42288..5bd7b9202 100644
--- a/frameworks/js/napi/src/subscribe/BUILD.gn
+++ b/frameworks/js/napi/src/subscribe/BUILD.gn
@@ -35,7 +35,7 @@ ohos_shared_library("notificationsubscribe") {
     cfi_cross_dso = true
     debug = false
   }
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
 
   include_dirs = [
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn
index edc6d381a..a836f95b8 100644
--- a/services/ans/BUILD.gn
+++ b/services/ans/BUILD.gn
@@ -34,7 +34,7 @@ ohos_shared_library("libans") {
     cfi_cross_dso = true
     debug = false
   }
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
 
   shlib_type = "sa"
   version_script = "libans.map"
diff --git a/services/distributed/BUILD.gn b/services/distributed/BUILD.gn
index 30b7b60de..35a5002c4 100644
--- a/services/distributed/BUILD.gn
+++ b/services/distributed/BUILD.gn
@@ -30,7 +30,7 @@ ohos_shared_library("libans_distributed") {
     cfi_cross_dso = true
     debug = false
   }
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
 
   sources = [
     "src/distributed_database.cpp",
diff --git a/tools/dump/BUILD.gn b/tools/dump/BUILD.gn
index 2d9fc8396..bb30ed04f 100644
--- a/tools/dump/BUILD.gn
+++ b/tools/dump/BUILD.gn
@@ -31,7 +31,7 @@ ohos_executable("anm") {
     cfi_cross_dso = true
     debug = false
   }
-  stack_protector_ret = true
+  branch_protector_ret = "pac_ret"
 
   public_configs = [ ":tools_dump_config" ]
 
-- 
Gitee