From 83e81ad9708e381a1f60896f6841397c05d54c44 Mon Sep 17 00:00:00 2001
From: Wen HU <git_huwen@yahoo.com>
Date: Wed, 23 Mar 2022 16:24:17 -0400
Subject: [PATCH 1/2] add new target maplebc which defines macro TARGMAPLEBC

source build/envsetup.sh maplebc release
---
 build/envsetup.sh              |  5 ++++-
 src/mapleall/BUILD.gn          |  7 +++++++
 src/mapleall/maple_be/BUILD.gn | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/build/envsetup.sh b/build/envsetup.sh
index 70e5e2f321..0ccdf9a81a 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -16,7 +16,7 @@
 
 function print_usage {
   echo " "
-  echo "usage: source envsetup.sh arm/ark/engine/riscv release/debug"
+  echo "usage: source envsetup.sh arm/maplebc/ark/engine/riscv release/debug"
   echo " "
 }
 
@@ -74,6 +74,9 @@ if [ $1 = "arm" ]; then
 elif [ $1 = "riscv" ]; then
   PLATFORM=riscv64
   USEOJ=0
+elif [ $1 = "maplebc" ]; then
+  PLATFORM=maplebc
+  USEOJ=0
 elif [ $1 = "engine" ]; then
   PLATFORM=ark
   USEOJ=1
diff --git a/src/mapleall/BUILD.gn b/src/mapleall/BUILD.gn
index 4d087663c0..e137759df7 100644
--- a/src/mapleall/BUILD.gn
+++ b/src/mapleall/BUILD.gn
@@ -55,6 +55,13 @@ config("mapleallcompilecfg") {
     ]
   }
 
+  if (TARGET == "maplebc") {
+    cflags_cc += [
+      "-DTARGMAPLEBC",
+      "-DMAPLE_ROOT=\"${MAPLE_ROOT}\"",
+    ]
+  }
+
   if (GN_BUILD_TYPE == "DEBUG") {
     cflags_c += [ "-DDEBUG" ]
     cflags_cc += [ "-DDEBUG" ]
diff --git a/src/mapleall/maple_be/BUILD.gn b/src/mapleall/maple_be/BUILD.gn
index 484c399a42..d3f4a9bb2b 100644
--- a/src/mapleall/maple_be/BUILD.gn
+++ b/src/mapleall/maple_be/BUILD.gn
@@ -70,6 +70,14 @@ if (TARGET == "ark") {
   deps_libcg += [ ":libcgark" ]
 }
 
+if (TARGET == "maplebc") {
+  include_directories += [
+    "${MAPLEALL_ROOT}/maple_be/include/cg/maplebc",
+    "${MAPLEALL_ROOT}/maple_be/include/be/maplebc",
+  ]
+  deps_libcg += [ ":libcgmaplebc" ]
+}
+
 src_libmplad = [ "src/ad/mad.cpp" ]
 
 src_libcglowerer = [
@@ -174,6 +182,8 @@ src_libcgriscv64 = [
 
 src_libcgark = [ "src/cg/ark/foo.cpp" ]
 
+src_libcgmaplebc = [ "src/cg/maplebc/foo.cpp" ]
+
 src_libcgphases = [
   "src/cg/cfgo.cpp",
   "src/cg/ebo.cpp",
@@ -274,6 +284,11 @@ source_set("libcgark") {
   include_dirs = include_directories
 }
 
+source_set("libcgmaplebc") {
+  sources = src_libcgmaplebc
+  include_dirs = include_directories
+}
+
 source_set("libcgphases") {
   sources = src_libcgphases
   include_dirs = include_directories
-- 
Gitee


From 6862dec909b9e520ea6feb600e9273361086bcc0 Mon Sep 17 00:00:00 2001
From: Wen HU <git_huwen@yahoo.com>
Date: Wed, 23 Mar 2022 16:25:30 -0400
Subject: [PATCH 2/2] check third_party/aosp_modified for patching

---
 build/third_party/patch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/third_party/patch.sh b/build/third_party/patch.sh
index 647ba0f348..9a8a965cb7 100644
--- a/build/third_party/patch.sh
+++ b/build/third_party/patch.sh
@@ -23,7 +23,7 @@ MODIFIED_AOSP_PATH=$THIRD_PARTY_PATH/aosp_modified
 MODIFIED_LLVM_PATH=$THIRD_PARTY_PATH/llvm_modified
 
 function install_patch {
-    if [ -d $MODIFIED_AOSP_PATH ];then
+    if [ -d $MODIFIED_AOSP_PATH ] && [ -d $MODIFIED_LLVM_PATH ];then
         echo "Already Patched."
         exit 0
     fi
-- 
Gitee