From a4ad4063caf27f79192d1764b5c0391ba3c9dcbd Mon Sep 17 00:00:00 2001
From: Luyao Wang <wangluyao35@huawei.com>
Date: Sat, 18 May 2024 16:54:57 +0800
Subject: [PATCH] =?UTF-8?q?revert=20cfi=20=E5=90=91=E5=90=8E=E4=BD=BF?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Luyao Wang <wangluyao35@huawei.com>
---
 interfaces/kits/js/BUILD.gn      | 18 +++++++++---------
 interfaces/kits/native/BUILD.gn  |  4 ++--
 utils/filemgmt_libhilog/BUILD.gn |  2 +-
 utils/filemgmt_libn/BUILD.gn     |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn
index 322d45cfb..215145a39 100644
--- a/interfaces/kits/js/BUILD.gn
+++ b/interfaces/kits/js/BUILD.gn
@@ -32,7 +32,7 @@ config("kits_public_config") {
 }
 
 ohos_shared_library("fileio") {
-  branch_protector_ret = "pac_ret"
+  stack_protector_ret = true
   sanitize = {
     integer_overflow = true
     ubsan = true
@@ -179,7 +179,7 @@ ohos_shared_library("fs") {
   ]
 
   if (!use_mingw_win && !use_mac) {
-    branch_protector_ret = "pac_ret"
+    stack_protector_ret = true
     sanitize = {
       integer_overflow = true
       ubsan = true
@@ -239,7 +239,7 @@ ohos_shared_library("fs") {
 }
 
 ohos_shared_library("hash") {
-  branch_protector_ret = "pac_ret"
+  stack_protector_ret = true
   sanitize = {
     integer_overflow = true
     ubsan = true
@@ -278,7 +278,7 @@ ohos_shared_library("hash") {
 }
 
 ohos_shared_library("file") {
-  branch_protector_ret = "pac_ret"
+  stack_protector_ret = true
   sanitize = {
     integer_overflow = true
     ubsan = true
@@ -320,7 +320,7 @@ ohos_shared_library("file") {
 }
 
 ohos_shared_library("statfs") {
-  branch_protector_ret = "pac_ret"
+  stack_protector_ret = true
   sanitize = {
     integer_overflow = true
     ubsan = true
@@ -352,7 +352,7 @@ ohos_shared_library("statfs") {
 }
 
 ohos_shared_library("statvfs") {
-  branch_protector_ret = "pac_ret"
+  stack_protector_ret = true
   sanitize = {
     integer_overflow = true
     ubsan = true
@@ -384,7 +384,7 @@ ohos_shared_library("statvfs") {
 }
 
 ohos_shared_library("environment") {
-  branch_protector_ret = "pac_ret"
+  stack_protector_ret = true
   sanitize = {
     integer_overflow = true
     ubsan = true
@@ -420,7 +420,7 @@ ohos_shared_library("environment") {
   ]
 }
 ohos_shared_library("securitylabel") {
-  branch_protector_ret = "pac_ret"
+  stack_protector_ret = true
   sanitize = {
     integer_overflow = true
     ubsan = true
@@ -458,7 +458,7 @@ ohos_shared_library("securitylabel") {
 }
 
 ohos_shared_library("document") {
-  branch_protector_ret = "pac_ret"
+  stack_protector_ret = true
   sanitize = {
     integer_overflow = true
     ubsan = true
diff --git a/interfaces/kits/native/BUILD.gn b/interfaces/kits/native/BUILD.gn
index 9603c26ef..90231b533 100644
--- a/interfaces/kits/native/BUILD.gn
+++ b/interfaces/kits/native/BUILD.gn
@@ -32,7 +32,7 @@ config("task_signal_config") {
 
 ohos_shared_library("remote_uri_native") {
   if (!use_mingw_win && !use_mac) {
-    branch_protector_ret = "pac_ret"
+    stack_protector_ret = true
     sanitize = {
       integer_overflow = true
       ubsan = true
@@ -61,7 +61,7 @@ ohos_shared_library("remote_uri_native") {
 
 ohos_shared_library("task_signal_native") {
   if (!use_mingw_win && !use_mac) {
-    branch_protector_ret = "pac_ret"
+    stack_protector_ret = true
     sanitize = {
       integer_overflow = true
       ubsan = true
diff --git a/utils/filemgmt_libhilog/BUILD.gn b/utils/filemgmt_libhilog/BUILD.gn
index bf86194ec..7429922f7 100644
--- a/utils/filemgmt_libhilog/BUILD.gn
+++ b/utils/filemgmt_libhilog/BUILD.gn
@@ -22,7 +22,7 @@ config("log_public_config") {
 
 ohos_shared_library("filemgmt_libhilog") {
   if (!use_mingw_win && !use_mac) {
-    branch_protector_ret = "pac_ret"
+    stack_protector_ret = true
     sanitize = {
       integer_overflow = true
       ubsan = true
diff --git a/utils/filemgmt_libn/BUILD.gn b/utils/filemgmt_libn/BUILD.gn
index b2f464370..38a0c489a 100644
--- a/utils/filemgmt_libn/BUILD.gn
+++ b/utils/filemgmt_libn/BUILD.gn
@@ -26,7 +26,7 @@ config("libn_public_config") {
 
 ohos_shared_library("filemgmt_libn") {
   if (!use_mingw_win && !use_mac) {
-    branch_protector_ret = "pac_ret"
+    stack_protector_ret = true
     sanitize = {
       integer_overflow = true
       ubsan = true
-- 
Gitee