From: Mauro Rossi <issor.oruam@gmail.com>
Date: Sat, 1 Sep 2018 11:25:45 +0000 (+0200)
Subject: android: [ARM] Unify handling of M-Class system registers
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=074b03cfef79b72142c8f16a4818f050251ffaaa;p=android-x86%2Fexternal-llvm-project.git

android: [ARM] Unify handling of M-Class system registers

Reference:
683224ecbd ("[ARM] Unify handling of M-Class system registers")
---

diff --git a/llvm/Android.bp b/llvm/Android.bp
index fa4ef417516..2caeb5d710d 100644
--- a/llvm/Android.bp
+++ b/llvm/Android.bp
@@ -164,6 +164,7 @@ llvm_arm_static_libraries = [
     "libLLVMARMInfo",
     "libLLVMARMDesc",
     "libLLVMARMDisassembler",
+    "libLLVMARMUtils",
 ]
 
 llvm_x86_static_libraries = [
diff --git a/llvm/lib/Target/ARM/Android.bp b/llvm/lib/Target/ARM/Android.bp
index cd88eac19ec..544f00880c3 100644
--- a/llvm/lib/Target/ARM/Android.bp
+++ b/llvm/lib/Target/ARM/Android.bp
@@ -49,6 +49,7 @@ llvm_tblgen {
         "ARMGenDisassemblerTables.inc",
         "ARMGenRegisterBank.inc",
         "ARMGenGlobalISel.inc",
+        "ARMGenSystemRegister.inc",
     ],
 }
 
diff --git a/llvm/lib/Target/ARM/Utils/Android.bp b/llvm/lib/Target/ARM/Utils/Android.bp
new file mode 100644
index 00000000000..bd2ae34207c
--- /dev/null
+++ b/llvm/lib/Target/ARM/Utils/Android.bp
@@ -0,0 +1,8 @@
+cc_library_static {
+    name: "libLLVMARMUtils",
+    defaults: [
+        "llvm-lib-defaults",
+        "llvm-arm-defaults",
+    ],
+    srcs: ["*.cpp"],
+}
diff --git a/llvm/soong/tblgen.go b/llvm/soong/tblgen.go
index 76669fa65cc..e22f80ce65c 100644
--- a/llvm/soong/tblgen.go
+++ b/llvm/soong/tblgen.go
@@ -112,6 +112,8 @@ func outToGenerator(ctx android.ModuleContext, out string) string {
 		return "-gen-disassembler"
 	case strings.HasSuffix(out, "GenSystemOperands.inc"):
 		return "-gen-searchable-tables"
+	case strings.HasSuffix(out, "GenSystemRegister.inc"):
+		return "-gen-searchable-tables"
 	case strings.HasSuffix(out, "GenEDInfo.inc"):
 		return "-gen-enhanced-disassembly-info"
 	case strings.HasSuffix(out, "GenFastISel.inc"):