From 6a5c2b28b10b4b600ad241ec866b5dce86933396 Mon Sep 17 00:00:00 2001
From: "yingguofeng@huawei.com" <yingguofeng@huawei.com>
Date: Mon, 12 May 2025 16:12:03 +0800
Subject: [PATCH] <Feat>(Memory): Fix some issue

1.Fix Compiler error while open cmc
2.Add --gn-args="toolchain_enable_cmc_gc" to resolve conflict

Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/IC6DA6
Signed-off-by: yingguofeng@huawei.com <yingguofeng@huawei.com>
Change-Id: I0c3d610f22a05156f3fbb11858835837e72753a0
---
 BUILD.gn             |  5 ++++-
 toolchain_config.gni | 12 ++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index f3aa5632..999796cf 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -190,9 +190,12 @@ config("ark_toolchain_common_config") {
     defines += [ "NDEBUG" ]
   }
 
-  if (defined(enable_cmc_gc) && enable_cmc_gc) {
+  if (toolchain_enable_cmc_gc) {
+    print("########## toolchain enable cmc-gc ##############")
     defines += [ "USE_CMC_GC" ]
     defines += [ "USE_READ_BARRIER" ]
+  } else {
+    print("########## toolchain disable cmc-gc ##############")
   }
 }
 
diff --git a/toolchain_config.gni b/toolchain_config.gni
index 5ed5f7e1..60d1354e 100644
--- a/toolchain_config.gni
+++ b/toolchain_config.gni
@@ -11,10 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if (!defined(enable_cmc_gc)) {
-  enable_cmc_gc = false
-}
-
 if (!defined(ark_standalone_build)) {
   ark_standalone_build = false
 }
@@ -23,6 +19,14 @@ if (target_cpu == "arm64") {
   TARGET = "aarch64"
 }
 
+declare_args() {
+  toolchain_enable_cmc_gc = false
+}
+
+if (defined(enable_cmc_gc) && !toolchain_enable_cmc_gc) {
+  toolchain_enable_cmc_gc = enable_cmc_gc
+}
+
 if (!ark_standalone_build) {
   build_root = "//build"
   ark_third_party_root = "//third_party"
-- 
Gitee