DO NOT MERGE: android: translate soong build rules for libLLVM12

Changes to side build external/llvm-project project (llvm 12 version)
and avoid conflicts with external/llvm project targets and variables
Changes in mesa main Android.mk are required for libLLVM12
shared library dependency and cflag -DMESA_LLVM_VERSION_STRING=\"12.0\"

The changelog is described by means of modules and variables
which needed to be renamed in external/llvm-project/llvm/ path:

 #rename the target shared library and all static libraries
find . -type f -name "*.bp" -exec sed -i 's/libLLVM/libLLVM12/g' {} +

 #rename the boostrap and contextual build paths
find . -type f -name "*.bp" -exec sed -i 's/soong\-llvm/\soong-llvm12/g' {} +
find . -type f -name "*.go" -exec sed -i 's/android\/soong\/llvm/android\/soong\/llvm12/g' {} +

 #rename force_build_llvm_components type and module name
find . -type f -name '*.bp' -exec sed -i 's/force_build_llvm_components/force_build_llvm12_components/g' {} +
find . -type f -name '*.go' -exec sed -i 's/force_build_llvm_components/force_build_llvm12_components/g' {} +

 #rename all module that gave 'already defined' error
find . -type f -name '*.bp' -exec sed -i 's/llvm-aarch64-defaults/llvm12-aarch64-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-aarch64-headers/llvm12-aarch64-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-amdgpu-defaults/llvm12-amdgpu-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-amdgpu-headers/llvm12-amdgpu-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-arm-defaults/llvm12-arm-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-arm-headers/llvm12-arm-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-defaults/llvm12-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-defaults-no-generated-headers/llvm12-defaults-no-generated-headers/g' {} +
 #note the following line replaced all llvm-gen-* entries of the previous versions
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-/llvm12-gen-/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-headers/llvm12-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-headers-no-generated-headers/llvm12-headers-no-generated-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-lib-defaults/llvm12-lib-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-mips-defaults/llvm12-mips-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-mips-headers/llvm12-mips-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-tblgen/llvm12-tblgen/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-x86-defaults/llvm12-x86-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-x86-headers/llvm12-x86-headers/g' {} +

 #rename llvm-gen-instcombine module
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-instcombine/llvm12-gen-instcombine/g' {} +

 #rename the binaries
find . -type f -name '*.bp' -exec sed -i 's/LLVMHello/LLVM12Hello/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/LLVMgold/LLVM12gold/g' {} +

 #rename the TableGen binary module and variable in different files
find . -type f -name '*.go' -exec sed -i 's/LLVM TableGen/LLVM12 TableGen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm-tblgen/llvm12-tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvmTblgen/llvm12Tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/tblgenRule/tblgenRule12/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm_tblgen/llvm12_tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm_tblgen/llvm12_tblgen/g' {} +
find . -type f -name 'tdtags' -exec sed -i 's/llvm-tblgen/llvm12-tblgen/g' {} +

 #COMMENTED AS NOT NEEDED in external/llvm-project (was: rename the include paths)
 #find . -type f -name '*.bp' -exec sed -i 's/external\/llvm/external\/llvm12/g' {} +
 #find . -type f -name '*.go' -exec sed -i 's/external\/llvm/external\/llvm12/g' {} +

 #rename package, registered types and llvm-config
find . -type f -name '*.go' -exec sed -i 's/package llvm/package llvm12/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm_tblgen/llvm12_tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm_defaults/llvm12_defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/ llvm-config / llvm12-config /g' {} +
find . -type f -name '*.bp' -exec sed -i 's/"llvm-config"/"llvm12-config"/g' {} +
find . -type f -name '*.go' -exec sed -i 's/"llvm-config"/"llvm12-config"/g' {} +

diff --git a/llvm/Android.bp b/llvm/Android.bp
index d38a1d3..d573484 100644 (file)
--- a/llvm/Android.bp
+++ b/llvm/Android.bp
@@ -1,14 +1,14 @@
 cc_defaults {
-    name: "llvm-defaults",
-    defaults: ["llvm-defaults-no-generated-headers"],
-    header_libs: ["llvm-headers"],
+    name: "llvm12-defaults",
+    defaults: ["llvm12-defaults-no-generated-headers"],
+    header_libs: ["llvm12-headers"],
 }
 
 // This module defines all of the defaults used to compiled llvm, except for
 // the generated headers.  It is necessary to avoid a circular dependency
 // from the tblgen tool used to generate the headers to the generated headers.
 llvm_defaults {
-    name: "llvm-defaults-no-generated-headers",
+    name: "llvm12-defaults-no-generated-headers",
 
     host_supported: true,
     clang: true,
@@ -43,7 +43,7 @@ llvm_defaults {
         "-Wno-error=unreachable-code-loop-increment",
     ],
 
-    header_libs: ["llvm-headers-no-generated-headers"],
+    header_libs: ["llvm12-headers-no-generated-headers"],
 
     target: {
         android: {
@@ -98,7 +98,7 @@ llvm_defaults {
 }
 
 cc_library_headers {
-    name: "llvm-headers-no-generated-headers",
+    name: "llvm12-headers-no-generated-headers",
     vendor_available: true,
     host_supported: true,
     export_include_dirs: ["include"],
@@ -119,27 +119,27 @@ cc_library_headers {
 }
 
 cc_library_headers {
-    name: "llvm-headers",
+    name: "llvm12-headers",
     vendor_available: true,
     host_supported: true,
-    header_libs: ["llvm-headers-no-generated-headers"],
-    export_header_lib_headers: ["llvm-headers-no-generated-headers"],
+    header_libs: ["llvm12-headers-no-generated-headers"],
+    export_header_lib_headers: ["llvm12-headers-no-generated-headers"],
     generated_headers: [
-        "llvm-gen-attributes",
-        "llvm-gen-intrinsics",
-        "llvm-gen-revision",
-        "llvm-gen-extension",
-        "llvm-gen-omp_gen",
+        "llvm12-gen-attributes",
+        "llvm12-gen-intrinsics",
+        "llvm12-gen-revision",
+        "llvm12-gen-extension",
+        "llvm12-gen-omp_gen",
     ],
     export_generated_headers: [
-        "llvm-gen-attributes",
-        "llvm-gen-intrinsics",
-        "llvm-gen-revision",
-        "llvm-gen-extension",
-        "llvm-gen-omp_gen",
+        "llvm12-gen-attributes",
+        "llvm12-gen-intrinsics",
+        "llvm12-gen-revision",
+        "llvm12-gen-extension",
+        "llvm12-gen-omp_gen",
     ],
     generated_sources: [
-        "llvm-gen-omp_cpp",
+        "llvm12-gen-omp_cpp",
     ],
     target: {
         windows: {
@@ -148,14 +148,14 @@ cc_library_headers {
     },
 }
 
-llvm_tblgen {
-    name: "llvm-gen-attributes",
+llvm12_tblgen {
+    name: "llvm12-gen-attributes",
     in: "include/llvm/IR/Attributes.td",
     outs: ["llvm/IR/Attributes.inc"],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-intrinsics",
+llvm12_tblgen {
+    name: "llvm12-gen-intrinsics",
     in: "include/llvm/IR/Intrinsics.td",
     outs: [
         "llvm/IR/IntrinsicEnums.inc",
@@ -178,8 +178,8 @@ llvm_tblgen {
     ],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-omp_gen",
+llvm12_tblgen {
+    name: "llvm12-gen-omp_gen",
     in: "include/llvm/Frontend/OpenMP/OMP.td",
     outs: [
         "llvm/Frontend/OpenMP/OMP.h.inc",
@@ -187,14 +187,14 @@ llvm_tblgen {
     ],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-omp_cpp",
+llvm12_tblgen {
+    name: "llvm12-gen-omp_cpp",
     in: "include/llvm/Frontend/OpenMP/OMP.td",
     outs: ["lib/Frontend/OpenMP/OMP.cpp"],
 }
 
 genrule {
-    name: "llvm-gen-revision",
+    name: "llvm12-gen-revision",
     out: ["llvm/Support/VCSRevision.h"],
     srcs: [".git/logs/HEAD*"],
     tool_files: ["git_sha1_gen.py"],
@@ -202,15 +202,15 @@ genrule {
 }
 
 genrule {
-    name: "llvm-gen-extension",
+    name: "llvm12-gen-extension",
     out: ["llvm/Support/Extension.def"],
     srcs: [".git/logs/HEAD*"],
     tool_files: ["utils/gn/secondary/llvm/include/llvm/Support/write_extension_def.py"],
     cmd: "python $(location utils/gn/secondary/llvm/include/llvm/Support/write_extension_def.py) --output $(out)",
 }
 
-force_build_llvm_components_defaults {
-    name: "force_build_llvm_components",
+force_build_llvm12_components_defaults {
+    name: "force_build_llvm12_components",
     // Host build disabled by soong/llvm.go unless FORCE_BUILD_LLVM_COMPONENTS
     // environment variable is set
 }
@@ -218,121 +218,121 @@ force_build_llvm_components_defaults {
 // LLVM shared library build
 
 llvm_arm_static_libraries = [
-    "libLLVMARMCodeGen",
-    "libLLVMARMAsmParser",
-    "libLLVMARMAsmPrinter",
-    "libLLVMARMInfo",
-    "libLLVMARMDesc",
-    "libLLVMARMDisassembler",
-    "libLLVMARMUtils",
+    "libLLVM12ARMCodeGen",
+    "libLLVM12ARMAsmParser",
+    "libLLVM12ARMAsmPrinter",
+    "libLLVM12ARMInfo",
+    "libLLVM12ARMDesc",
+    "libLLVM12ARMDisassembler",
+    "libLLVM12ARMUtils",
 ]
 
 llvm_x86_static_libraries = [
-    "libLLVMX86CodeGen",
-    "libLLVMX86Info",
-    "libLLVMX86Desc",
-    "libLLVMX86AsmParser",
-    "libLLVMX86AsmPrinter",
-    "libLLVMX86Utils",
-    "libLLVMX86Disassembler",
+    "libLLVM12X86CodeGen",
+    "libLLVM12X86Info",
+    "libLLVM12X86Desc",
+    "libLLVM12X86AsmParser",
+    "libLLVM12X86AsmPrinter",
+    "libLLVM12X86Utils",
+    "libLLVM12X86Disassembler",
 ]
 
 llvm_mips_static_libraries = [
-    "libLLVMMipsCodeGen",
-    "libLLVMMipsInfo",
-    "libLLVMMipsDesc",
-    "libLLVMMipsAsmParser",
-    "libLLVMMipsAsmPrinter",
-    "libLLVMMipsDisassembler",
+    "libLLVM12MipsCodeGen",
+    "libLLVM12MipsInfo",
+    "libLLVM12MipsDesc",
+    "libLLVM12MipsAsmParser",
+    "libLLVM12MipsAsmPrinter",
+    "libLLVM12MipsDisassembler",
 ]
 
 llvm_aarch64_static_libraries = [
-    "libLLVMAArch64CodeGen",
-    "libLLVMAArch64Info",
-    "libLLVMAArch64Desc",
-    "libLLVMAArch64AsmParser",
-    "libLLVMAArch64AsmPrinter",
-    "libLLVMAArch64Utils",
-    "libLLVMAArch64Disassembler",
+    "libLLVM12AArch64CodeGen",
+    "libLLVM12AArch64Info",
+    "libLLVM12AArch64Desc",
+    "libLLVM12AArch64AsmParser",
+    "libLLVM12AArch64AsmPrinter",
+    "libLLVM12AArch64Utils",
+    "libLLVM12AArch64Disassembler",
 ]
 
 llvm_amdgpu_static_libraries = [
-    "libLLVMAMDGPUCodeGen",
-    "libLLVMAMDGPUInfo",
-    "libLLVMAMDGPUDesc",
-    "libLLVMAMDGPUAsmParser",
-    "libLLVMAMDGPUAsmPrinter",
-    "libLLVMAMDGPUUtils",
-    "libLLVMAMDGPUDisassembler",
+    "libLLVM12AMDGPUCodeGen",
+    "libLLVM12AMDGPUInfo",
+    "libLLVM12AMDGPUDesc",
+    "libLLVM12AMDGPUAsmParser",
+    "libLLVM12AMDGPUAsmPrinter",
+    "libLLVM12AMDGPUUtils",
+    "libLLVM12AMDGPUDisassembler",
 ]
 
 
 cc_library_shared {
     host_supported: true,
     vendor_available: true,
-    name: "libLLVM",
+    name: "libLLVM12",
     defaults: [
-        "llvm-defaults",
-        "force_build_llvm_components",
+        "llvm12-defaults",
+        "force_build_llvm12_components",
     ],
 
     whole_static_libs: [
         // pre static libraries
-        "libLLVMLinker",
-        "libLLVMipo",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoMSF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMSymbolize",
-        "libLLVMIRReader",
-        "libLLVMBitWriter",
-        "libLLVMBitReader",
-        "libLLVMPasses",
-        "libLLVMDemangle",
-        "libLLVMBitstreamReader",
+        "libLLVM12Linker",
+        "libLLVM12ipo",
+        "libLLVM12DebugInfoDWARF",
+        "libLLVM12DebugInfoMSF",
+        "libLLVM12DebugInfoPDB",
+        "libLLVM12Symbolize",
+        "libLLVM12IRReader",
+        "libLLVM12BitWriter",
+        "libLLVM12BitReader",
+        "libLLVM12Passes",
+        "libLLVM12Demangle",
+        "libLLVM12BitstreamReader",
 
         // post static libraries
-        "libLLVMLTO",
-        "libLLVMAsmPrinter",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMObject",
-        "libLLVMScalarOpts",
-        "libLLVMAggressiveInstCombine",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMTransformObjCARC",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMGlobalISel",
-        "libLLVMMCDisassembler",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
-        "libLLVMVectorize",
-        "libLLVMProfileData",
-        "libLLVMProfileDataCoverage",
-        "libLLVMLibDriver",
-        "libLLVMExecutionEngine",
-        "libLLVMRuntimeDyld",
-        "libLLVMMCJIT",
-        "libLLVMOrcJIT",
-        "libLLVMBinaryFormat",
-        "libLLVMMIRParser",
-        "libLLVMRemarks",
-        "libLLVMJITLink",
-        "libLLVMCoroutines",
-        "libLLVMTextAPI",
-        "libLLVMCFGuard",
-        "libLLVMFrontendOpenMP",
-        "libLLVMHelloNew",
-        "libLLVMOrcShared",
-        "libLLVMOrcTargetProcess",
+        "libLLVM12LTO",
+        "libLLVM12AsmPrinter",
+        "libLLVM12SelectionDAG",
+        "libLLVM12CodeGen",
+        "libLLVM12DebugInfoCodeView",
+        "libLLVM12Object",
+        "libLLVM12ScalarOpts",
+        "libLLVM12AggressiveInstCombine",
+        "libLLVM12InstCombine",
+        "libLLVM12Instrumentation",
+        "libLLVM12TransformObjCARC",
+        "libLLVM12TransformUtils",
+        "libLLVM12Analysis",
+        "libLLVM12Target",
+        "libLLVM12GlobalISel",
+        "libLLVM12MCDisassembler",
+        "libLLVM12MC",
+        "libLLVM12MCParser",
+        "libLLVM12Core",
+        "libLLVM12AsmParser",
+        "libLLVM12Option",
+        "libLLVM12Support",
+        "libLLVM12Vectorize",
+        "libLLVM12ProfileData",
+        "libLLVM12ProfileDataCoverage",
+        "libLLVM12LibDriver",
+        "libLLVM12ExecutionEngine",
+        "libLLVM12RuntimeDyld",
+        "libLLVM12MCJIT",
+        "libLLVM12OrcJIT",
+        "libLLVM12BinaryFormat",
+        "libLLVM12MIRParser",
+        "libLLVM12Remarks",
+        "libLLVM12JITLink",
+        "libLLVM12Coroutines",
+        "libLLVM12TextAPI",
+        "libLLVM12CFGuard",
+        "libLLVM12FrontendOpenMP",
+        "libLLVM12HelloNew",
+        "libLLVM12OrcShared",
+        "libLLVM12OrcTargetProcess",
     ],
 
     export_include_dirs: ["include"],

diff --git a/llvm/bindings/go/llvm/analysis.go b/llvm/bindings/go/llvm/analysis.go
index 3a1c9d3..3370aee 100644 (file)
--- a/llvm/bindings/go/llvm/analysis.go
+++ b/llvm/bindings/go/llvm/analysis.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/Analysis.h" // If you are getting an error here read bindings/go/README.txt

diff --git a/llvm/bindings/go/llvm/bitreader.go b/llvm/bindings/go/llvm/bitreader.go
index 1954916..05ee8c6 100644 (file)
--- a/llvm/bindings/go/llvm/bitreader.go
+++ b/llvm/bindings/go/llvm/bitreader.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/BitReader.h"

diff --git a/llvm/bindings/go/llvm/bitwriter.go b/llvm/bindings/go/llvm/bitwriter.go
index 83780fc..6a4638e 100644 (file)
--- a/llvm/bindings/go/llvm/bitwriter.go
+++ b/llvm/bindings/go/llvm/bitwriter.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/BitWriter.h"

diff --git a/llvm/bindings/go/llvm/dibuilder.go b/llvm/bindings/go/llvm/dibuilder.go
index aeaf49e..446d36b 100644 (file)
--- a/llvm/bindings/go/llvm/dibuilder.go
+++ b/llvm/bindings/go/llvm/dibuilder.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "IRBindings.h"

diff --git a/llvm/bindings/go/llvm/executionengine.go b/llvm/bindings/go/llvm/executionengine.go
index 5fa8204..4113647 100644 (file)
--- a/llvm/bindings/go/llvm/executionengine.go
+++ b/llvm/bindings/go/llvm/executionengine.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/Core.h"

diff --git a/llvm/bindings/go/llvm/executionengine_test.go b/llvm/bindings/go/llvm/executionengine_test.go
index 2369826..caa189e 100644 (file)
--- a/llvm/bindings/go/llvm/executionengine_test.go
+++ b/llvm/bindings/go/llvm/executionengine_test.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 import (
        "testing"

diff --git a/llvm/bindings/go/llvm/ir.go b/llvm/bindings/go/llvm/ir.go
index bb8896e..37c2807 100644 (file)
--- a/llvm/bindings/go/llvm/ir.go
+++ b/llvm/bindings/go/llvm/ir.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/Core.h"

diff --git a/llvm/bindings/go/llvm/ir_test.go b/llvm/bindings/go/llvm/ir_test.go
index 8533112..b9b5470 100644 (file)
--- a/llvm/bindings/go/llvm/ir_test.go
+++ b/llvm/bindings/go/llvm/ir_test.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 import (
        "strings"

diff --git a/llvm/bindings/go/llvm/linker.go b/llvm/bindings/go/llvm/linker.go
index 8e2e953..5725bcb 100644 (file)
--- a/llvm/bindings/go/llvm/linker.go
+++ b/llvm/bindings/go/llvm/linker.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/Core.h"

diff --git a/llvm/bindings/go/llvm/llvm_dep.go b/llvm/bindings/go/llvm/llvm_dep.go
index 9484e6d..7a89709 100644 (file)
--- a/llvm/bindings/go/llvm/llvm_dep.go
+++ b/llvm/bindings/go/llvm/llvm_dep.go
@@ -13,6 +13,6 @@
 
 // +build !byollvm
 
-package llvm
+package llvm12
 
 var _ run_build_sh

diff --git a/llvm/bindings/go/llvm/string.go b/llvm/bindings/go/llvm/string.go
index 7c8bf8d..b854a35 100644 (file)
--- a/llvm/bindings/go/llvm/string.go
+++ b/llvm/bindings/go/llvm/string.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 import "fmt"
 

diff --git a/llvm/bindings/go/llvm/string_test.go b/llvm/bindings/go/llvm/string_test.go
index 56cbc9f..e93bcf8 100644 (file)
--- a/llvm/bindings/go/llvm/string_test.go
+++ b/llvm/bindings/go/llvm/string_test.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 import (
        "testing"

diff --git a/llvm/bindings/go/llvm/support.go b/llvm/bindings/go/llvm/support.go
index 8a663fe..445e8f4 100644 (file)
--- a/llvm/bindings/go/llvm/support.go
+++ b/llvm/bindings/go/llvm/support.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/Support.h"

diff --git a/llvm/bindings/go/llvm/target.go b/llvm/bindings/go/llvm/target.go
index cdd0fa3..2153ecc 100644 (file)
--- a/llvm/bindings/go/llvm/target.go
+++ b/llvm/bindings/go/llvm/target.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/Core.h"

diff --git a/llvm/bindings/go/llvm/transforms_coroutines.go b/llvm/bindings/go/llvm/transforms_coroutines.go
index c18c3fe..10ab8c8 100644 (file)
--- a/llvm/bindings/go/llvm/transforms_coroutines.go
+++ b/llvm/bindings/go/llvm/transforms_coroutines.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/Transforms/Coroutines.h"

diff --git a/llvm/bindings/go/llvm/transforms_instrumentation.go b/llvm/bindings/go/llvm/transforms_instrumentation.go
index 68e0ed6..d813721 100644 (file)
--- a/llvm/bindings/go/llvm/transforms_instrumentation.go
+++ b/llvm/bindings/go/llvm/transforms_instrumentation.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "InstrumentationBindings.h"

diff --git a/llvm/bindings/go/llvm/transforms_ipo.go b/llvm/bindings/go/llvm/transforms_ipo.go
index 8a158f2..187b067 100644 (file)
--- a/llvm/bindings/go/llvm/transforms_ipo.go
+++ b/llvm/bindings/go/llvm/transforms_ipo.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/Transforms/IPO.h"

diff --git a/llvm/bindings/go/llvm/transforms_pmbuilder.go b/llvm/bindings/go/llvm/transforms_pmbuilder.go
index badd148..3c74eea 100644 (file)
--- a/llvm/bindings/go/llvm/transforms_pmbuilder.go
+++ b/llvm/bindings/go/llvm/transforms_pmbuilder.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/Transforms/PassManagerBuilder.h"

diff --git a/llvm/bindings/go/llvm/transforms_scalar.go b/llvm/bindings/go/llvm/transforms_scalar.go
index d1b54bd..447f0fd 100644 (file)
--- a/llvm/bindings/go/llvm/transforms_scalar.go
+++ b/llvm/bindings/go/llvm/transforms_scalar.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm-c/Transforms/Scalar.h"

diff --git a/llvm/bindings/go/llvm/version.go b/llvm/bindings/go/llvm/version.go
index 1183fe4..e685ca2 100644 (file)
--- a/llvm/bindings/go/llvm/version.go
+++ b/llvm/bindings/go/llvm/version.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm12
 
 /*
 #include "llvm/Config/llvm-config.h"

diff --git a/llvm/lib/Analysis/Android.bp b/llvm/lib/Analysis/Android.bp
index 636e5cb..d23a8bc 100644 (file)
--- a/llvm/lib/Analysis/Android.bp
+++ b/llvm/lib/Analysis/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAnalysis",
+    name: "libLLVM12Analysis",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: [
         "AliasAnalysis.cpp",

diff --git a/llvm/lib/Android.bp b/llvm/lib/Android.bp
index 127ba59..b5ab3a2 100644 (file)
--- a/llvm/lib/Android.bp
+++ b/llvm/lib/Android.bp
@@ -1,8 +1,8 @@
 cc_defaults {
-    name: "llvm-lib-defaults",
+    name: "llvm12-lib-defaults",
     vendor_available: true,
-    defaults: ["llvm-defaults"],
-    export_header_lib_headers: ["llvm-headers"],
+    defaults: ["llvm12-defaults"],
+    export_header_lib_headers: ["llvm12-headers"],
     target: {
         windows: {
             enabled: true,

diff --git a/llvm/lib/AsmParser/Android.bp b/llvm/lib/AsmParser/Android.bp
index 3fff6b2..a8035bb 100644 (file)
--- a/llvm/lib/AsmParser/Android.bp
+++ b/llvm/lib/AsmParser/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAsmParser",
+    name: "libLLVM12AsmParser",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/BinaryFormat/Android.bp b/llvm/lib/BinaryFormat/Android.bp
index b99bb0a..47ec0a4 100644 (file)
--- a/llvm/lib/BinaryFormat/Android.bp
+++ b/llvm/lib/BinaryFormat/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMBinaryFormat",
+    name: "libLLVM12BinaryFormat",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Bitcode/Reader/Android.bp b/llvm/lib/Bitcode/Reader/Android.bp
index da7c543..e83b38f 100644 (file)
--- a/llvm/lib/Bitcode/Reader/Android.bp
+++ b/llvm/lib/Bitcode/Reader/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMBitReader",
+    name: "libLLVM12BitReader",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Bitcode/Writer/Android.bp b/llvm/lib/Bitcode/Writer/Android.bp
index 754a252..605e615 100644 (file)
--- a/llvm/lib/Bitcode/Writer/Android.bp
+++ b/llvm/lib/Bitcode/Writer/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMBitWriter",
+    name: "libLLVM12BitWriter",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Bitstream/Reader/Android.bp b/llvm/lib/Bitstream/Reader/Android.bp
index 6300d08..a8080cb 100644 (file)
--- a/llvm/lib/Bitstream/Reader/Android.bp
+++ b/llvm/lib/Bitstream/Reader/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMBitstreamReader",
+    name: "libLLVM12BitstreamReader",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/CodeGen/Android.bp b/llvm/lib/CodeGen/Android.bp
index 35e83f3..dd88973 100644 (file)
--- a/llvm/lib/CodeGen/Android.bp
+++ b/llvm/lib/CodeGen/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMCodeGen",
+    name: "libLLVM12CodeGen",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: [
         "*.cpp",

diff --git a/llvm/lib/CodeGen/AsmPrinter/Android.bp b/llvm/lib/CodeGen/AsmPrinter/Android.bp
index d94c00c..c8a3518 100644 (file)
--- a/llvm/lib/CodeGen/AsmPrinter/Android.bp
+++ b/llvm/lib/CodeGen/AsmPrinter/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAsmPrinter",
+    name: "libLLVM12AsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/CodeGen/GlobalISel/Android.bp b/llvm/lib/CodeGen/GlobalISel/Android.bp
index 4dd07c6..b081c6a 100644 (file)
--- a/llvm/lib/CodeGen/GlobalISel/Android.bp
+++ b/llvm/lib/CodeGen/GlobalISel/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMGlobalISel",
+    name: "libLLVM12GlobalISel",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     // Aarch64 and AMDGPU targets require GlobalIsel
     // Experimental feature enabled by building all srcs

diff --git a/llvm/lib/CodeGen/MIRParser/Android.bp b/llvm/lib/CodeGen/MIRParser/Android.bp
index 4c68ec6..5a360ab 100644 (file)
--- a/llvm/lib/CodeGen/MIRParser/Android.bp
+++ b/llvm/lib/CodeGen/MIRParser/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMIRParser",
+    name: "libLLVM12MIRParser",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/CodeGen/SelectionDAG/Android.bp b/llvm/lib/CodeGen/SelectionDAG/Android.bp
index 79c705a..7700d77 100644 (file)
--- a/llvm/lib/CodeGen/SelectionDAG/Android.bp
+++ b/llvm/lib/CodeGen/SelectionDAG/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMSelectionDAG",
+    name: "libLLVM12SelectionDAG",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/DebugInfo/CodeView/Android.bp b/llvm/lib/DebugInfo/CodeView/Android.bp
index 6abfae1..1332f3f 100644 (file)
--- a/llvm/lib/DebugInfo/CodeView/Android.bp
+++ b/llvm/lib/DebugInfo/CodeView/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoCodeView",
+    name: "libLLVM12DebugInfoCodeView",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/DebugInfo/DWARF/Android.bp b/llvm/lib/DebugInfo/DWARF/Android.bp
index c198e1f..094cc6b 100644 (file)
--- a/llvm/lib/DebugInfo/DWARF/Android.bp
+++ b/llvm/lib/DebugInfo/DWARF/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoDWARF",
+    name: "libLLVM12DebugInfoDWARF",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/DebugInfo/MSF/Android.bp b/llvm/lib/DebugInfo/MSF/Android.bp
index 9b096bd..351d9a6 100644 (file)
--- a/llvm/lib/DebugInfo/MSF/Android.bp
+++ b/llvm/lib/DebugInfo/MSF/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoMSF",
+    name: "libLLVM12DebugInfoMSF",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/DebugInfo/PDB/Android.bp b/llvm/lib/DebugInfo/PDB/Android.bp
index 2ef641f..880be2e 100644 (file)
--- a/llvm/lib/DebugInfo/PDB/Android.bp
+++ b/llvm/lib/DebugInfo/PDB/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoPDB",
+    name: "libLLVM12DebugInfoPDB",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: [
         "*.cpp",

diff --git a/llvm/lib/DebugInfo/Symbolize/Android.bp b/llvm/lib/DebugInfo/Symbolize/Android.bp
index c859f58..8970bdf 100644 (file)
--- a/llvm/lib/DebugInfo/Symbolize/Android.bp
+++ b/llvm/lib/DebugInfo/Symbolize/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMSymbolize",
+    name: "libLLVM12Symbolize",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Demangle/Android.bp b/llvm/lib/Demangle/Android.bp
index 476e718..4371b80 100644 (file)
--- a/llvm/lib/Demangle/Android.bp
+++ b/llvm/lib/Demangle/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDemangle",
+    name: "libLLVM12Demangle",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/ExecutionEngine/Android.bp b/llvm/lib/ExecutionEngine/Android.bp
index 41a4492..c8564fb 100644 (file)
--- a/llvm/lib/ExecutionEngine/Android.bp
+++ b/llvm/lib/ExecutionEngine/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMExecutionEngine",
+    name: "libLLVM12ExecutionEngine",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/ExecutionEngine/Interpreter/Android.bp b/llvm/lib/ExecutionEngine/Interpreter/Android.bp
index 190a9a8..59a5b42 100644 (file)
--- a/llvm/lib/ExecutionEngine/Interpreter/Android.bp
+++ b/llvm/lib/ExecutionEngine/Interpreter/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMInterpreter",
+    name: "libLLVM12Interpreter",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/ExecutionEngine/JITLink/Android.bp b/llvm/lib/ExecutionEngine/JITLink/Android.bp
index f613f7a..0a4870b 100644 (file)
--- a/llvm/lib/ExecutionEngine/JITLink/Android.bp
+++ b/llvm/lib/ExecutionEngine/JITLink/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMJITLink",
+    name: "libLLVM12JITLink",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/ExecutionEngine/MCJIT/Android.bp b/llvm/lib/ExecutionEngine/MCJIT/Android.bp
index 6b43bb1..f0e79b0 100644 (file)
--- a/llvm/lib/ExecutionEngine/MCJIT/Android.bp
+++ b/llvm/lib/ExecutionEngine/MCJIT/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMCJIT",
+    name: "libLLVM12MCJIT",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/ExecutionEngine/Orc/Android.bp b/llvm/lib/ExecutionEngine/Orc/Android.bp
index 1bb2fae..37ca6ac 100644 (file)
--- a/llvm/lib/ExecutionEngine/Orc/Android.bp
+++ b/llvm/lib/ExecutionEngine/Orc/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMOrcJIT",
+    name: "libLLVM12OrcJIT",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp b/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp
index 5e54972..26d2392 100644 (file)
--- a/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp
+++ b/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMOrcShared",
+    name: "libLLVM12OrcShared",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/Android.bp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/Android.bp
index 840e3ff..7c014ad 100644 (file)
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/Android.bp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMOrcTargetProcess",
+    name: "libLLVM12OrcTargetProcess",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp b/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp
index 408077f..04b814f 100644 (file)
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMRuntimeDyld",
+    name: "libLLVM12RuntimeDyld",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: [
         "*.cpp",

diff --git a/llvm/lib/Frontend/OpenMP/Android.bp b/llvm/lib/Frontend/OpenMP/Android.bp
index bd50af3..abd61fb 100644 (file)
--- a/llvm/lib/Frontend/OpenMP/Android.bp
+++ b/llvm/lib/Frontend/OpenMP/Android.bp
@@ -1,13 +1,13 @@
 cc_library_static {
-    name: "libLLVMFrontendOpenMP",
+    name: "libLLVM12FrontendOpenMP",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
 
 cc_defaults {
     name: "llvm-omp-defaults",
-    generated_headers: ["llvm-gen-omp_gen"],
-    generated_sources: ["llvm-gen-omp_cpp"],
+    generated_headers: ["llvm12-gen-omp_gen"],
+    generated_sources: ["llvm12-gen-omp_cpp"],
 }

diff --git a/llvm/lib/IR/Android.bp b/llvm/lib/IR/Android.bp
index 3856918..31429fa 100644 (file)
--- a/llvm/lib/IR/Android.bp
+++ b/llvm/lib/IR/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMCore",
+    name: "libLLVM12Core",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/IRReader/Android.bp b/llvm/lib/IRReader/Android.bp
index a01a80f..afd4874 100644 (file)
--- a/llvm/lib/IRReader/Android.bp
+++ b/llvm/lib/IRReader/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMIRReader",
+    name: "libLLVM12IRReader",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/LTO/Android.bp b/llvm/lib/LTO/Android.bp
index 928bd5c..44a34e1 100644 (file)
--- a/llvm/lib/LTO/Android.bp
+++ b/llvm/lib/LTO/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMLTO",
+    name: "libLLVM12LTO",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Linker/Android.bp b/llvm/lib/Linker/Android.bp
index a5e1a95..b672449 100644 (file)
--- a/llvm/lib/Linker/Android.bp
+++ b/llvm/lib/Linker/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMLinker",
+    name: "libLLVM12Linker",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/MC/Android.bp b/llvm/lib/MC/Android.bp
index 05e8445..70c67ad 100644 (file)
--- a/llvm/lib/MC/Android.bp
+++ b/llvm/lib/MC/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMC",
+    name: "libLLVM12MC",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/MC/MCDisassembler/Android.bp b/llvm/lib/MC/MCDisassembler/Android.bp
index c2f25fa..795948c 100644 (file)
--- a/llvm/lib/MC/MCDisassembler/Android.bp
+++ b/llvm/lib/MC/MCDisassembler/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMCDisassembler",
+    name: "libLLVM12MCDisassembler",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/MC/MCParser/Android.bp b/llvm/lib/MC/MCParser/Android.bp
index cc7cd1f..69d1d78 100644 (file)
--- a/llvm/lib/MC/MCParser/Android.bp
+++ b/llvm/lib/MC/MCParser/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMCParser",
+    name: "libLLVM12MCParser",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Object/Android.bp b/llvm/lib/Object/Android.bp
index c389476..07bbe6d 100644 (file)
--- a/llvm/lib/Object/Android.bp
+++ b/llvm/lib/Object/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMObject",
+    name: "libLLVM12Object",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/ObjectYAML/Android.bp b/llvm/lib/ObjectYAML/Android.bp
index 17f4a67..af628aa 100644 (file)
--- a/llvm/lib/ObjectYAML/Android.bp
+++ b/llvm/lib/ObjectYAML/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMObjectYAML",
+    name: "libLLVM12ObjectYAML",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Option/Android.bp b/llvm/lib/Option/Android.bp
index 035db4d..7b9de7c 100644 (file)
--- a/llvm/lib/Option/Android.bp
+++ b/llvm/lib/Option/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMOption",
+    name: "libLLVM12Option",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Passes/Android.bp b/llvm/lib/Passes/Android.bp
index f98e1b6..67a8a61 100644 (file)
--- a/llvm/lib/Passes/Android.bp
+++ b/llvm/lib/Passes/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMPasses",
+    name: "libLLVM12Passes",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/ProfileData/Android.bp b/llvm/lib/ProfileData/Android.bp
index 710d5d4..5275efb 100644 (file)
--- a/llvm/lib/ProfileData/Android.bp
+++ b/llvm/lib/ProfileData/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMProfileData",
+    name: "libLLVM12ProfileData",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/ProfileData/Coverage/Android.bp b/llvm/lib/ProfileData/Coverage/Android.bp
index 347c500..95cf3e5 100644 (file)
--- a/llvm/lib/ProfileData/Coverage/Android.bp
+++ b/llvm/lib/ProfileData/Coverage/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMProfileDataCoverage",
+    name: "libLLVM12ProfileDataCoverage",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Remarks/Android.bp b/llvm/lib/Remarks/Android.bp
index 6ea22e8..270776a 100644 (file)
--- a/llvm/lib/Remarks/Android.bp
+++ b/llvm/lib/Remarks/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMRemarks",
+    name: "libLLVM12Remarks",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Support/Android.bp b/llvm/lib/Support/Android.bp
index d00de3f..03f0dc9 100644 (file)
--- a/llvm/lib/Support/Android.bp
+++ b/llvm/lib/Support/Android.bp
@@ -1,10 +1,10 @@
 cc_library_static {
-    name: "libLLVMSupport",
+    name: "libLLVM12Support",
     vendor_available: true,
-    defaults: ["llvm-defaults-no-generated-headers"],
+    defaults: ["llvm12-defaults-no-generated-headers"],
     target: {
-        // llvm-defaults turns off host builds by default, turn it back on for
-        // modules that are used to build llvm-tblgen
+        // llvm12-defaults turns off host builds by default, turn it back on for
+        // modules that are used to build llvm12-tblgen
         host: {
             enabled: true,
         },

diff --git a/llvm/lib/TableGen/Android.bp b/llvm/lib/TableGen/Android.bp
index c331017..9152844 100644 (file)
--- a/llvm/lib/TableGen/Android.bp
+++ b/llvm/lib/TableGen/Android.bp
@@ -1,10 +1,10 @@
 cc_library_static {
-    name: "libLLVMTableGen",
-    defaults: ["llvm-defaults-no-generated-headers"],
+    name: "libLLVM12TableGen",
+    defaults: ["llvm12-defaults-no-generated-headers"],
     srcs: ["*.cpp"],
     target: {
-        // llvm-defaults turns off host builds by default, turn it back on for
-        // modules that are used to build llvm-tblgen
+        // llvm12-defaults turns off host builds by default, turn it back on for
+        // modules that are used to build llvm12-tblgen
         host: {
             enabled: true,
         },

diff --git a/llvm/lib/Target/AArch64/Android.bp b/llvm/lib/Target/AArch64/Android.bp
index d8f68f5..76e3efe 100644 (file)
--- a/llvm/lib/Target/AArch64/Android.bp
+++ b/llvm/lib/Target/AArch64/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64CodeGen",
+    name: "libLLVM12AArch64CodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-aarch64-defaults",
     ],
     srcs: [
         "*.cpp",
@@ -11,13 +11,13 @@ cc_library_static {
 }
 
 cc_defaults {
-    name: "llvm-aarch64-defaults",
-    generated_headers: ["llvm-gen-aarch64"],
-    static_libs: ["llvm-aarch64-headers"],
+    name: "llvm12-aarch64-defaults",
+    generated_headers: ["llvm12-gen-aarch64"],
+    static_libs: ["llvm12-aarch64-headers"],
 }
 
 cc_library_static {
-    name: "llvm-aarch64-headers",
+    name: "llvm12-aarch64-headers",
     vendor_available: true,
     host_supported: true,
     target: {
@@ -28,8 +28,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-aarch64",
+llvm12_tblgen {
+    name: "llvm12-gen-aarch64",
     in: "AArch64.td",
     outs: [
         "AArch64GenRegisterInfo.inc",

diff --git a/llvm/lib/Target/AArch64/AsmParser/Android.bp b/llvm/lib/Target/AArch64/AsmParser/Android.bp
index 9b409ae..b05659e 100644 (file)
--- a/llvm/lib/Target/AArch64/AsmParser/Android.bp
+++ b/llvm/lib/Target/AArch64/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64AsmParser",
+    name: "libLLVM12AArch64AsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/AArch64/Disassembler/Android.bp b/llvm/lib/Target/AArch64/Disassembler/Android.bp
index e7a04d3..d8c24cf 100644 (file)
--- a/llvm/lib/Target/AArch64/Disassembler/Android.bp
+++ b/llvm/lib/Target/AArch64/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Disassembler",
+    name: "libLLVM12AArch64Disassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/AArch64/InstPrinter/Android.bp b/llvm/lib/Target/AArch64/InstPrinter/Android.bp
index f1dac2a..f9f7ea4 100644 (file)
--- a/llvm/lib/Target/AArch64/InstPrinter/Android.bp
+++ b/llvm/lib/Target/AArch64/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64AsmPrinter",
+    name: "libLLVM12AArch64AsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/Android.bp b/llvm/lib/Target/AArch64/MCTargetDesc/Android.bp
index 9edc154..61c5e3b 100644 (file)
--- a/llvm/lib/Target/AArch64/MCTargetDesc/Android.bp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Desc",
+    name: "libLLVM12AArch64Desc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/AArch64/TargetInfo/Android.bp b/llvm/lib/Target/AArch64/TargetInfo/Android.bp
index baa98ca..a75536a 100644 (file)
--- a/llvm/lib/Target/AArch64/TargetInfo/Android.bp
+++ b/llvm/lib/Target/AArch64/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Info",
+    name: "libLLVM12AArch64Info",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/AArch64/Utils/Android.bp b/llvm/lib/Target/AArch64/Utils/Android.bp
index aa2db82..c0cb9c5 100644 (file)
--- a/llvm/lib/Target/AArch64/Utils/Android.bp
+++ b/llvm/lib/Target/AArch64/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Utils",
+    name: "libLLVM12AArch64Utils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/AMDGPU/Android.bp b/llvm/lib/Target/AMDGPU/Android.bp
index 1c605f5..b43c055 100644 (file)
--- a/llvm/lib/Target/AMDGPU/Android.bp
+++ b/llvm/lib/Target/AMDGPU/Android.bp
@@ -1,25 +1,25 @@
 cc_library_static {
-    name: "libLLVMAMDGPUCodeGen",
+    name: "libLLVM12AMDGPUCodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }
 
 cc_defaults {
-    name: "llvm-amdgpu-defaults",
+    name: "llvm12-amdgpu-defaults",
     generated_headers: [
-        "llvm-gen-amdgpu",
-        "llvm-gen-amdgpuisel",
-        "llvm-gen-instcombine",
-        "llvm-gen-r600",
+        "llvm12-gen-amdgpu",
+        "llvm12-gen-amdgpuisel",
+        "llvm12-gen-instcombine",
+        "llvm12-gen-r600",
     ],
-    static_libs: ["llvm-amdgpu-headers"],
+    static_libs: ["llvm12-amdgpu-headers"],
 }
 
 cc_library_static {
-    name: "llvm-amdgpu-headers",
+    name: "llvm12-amdgpu-headers",
     host_supported: true,
     vendor_available: true,
     target: {
@@ -30,8 +30,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-amdgpu",
+llvm12_tblgen {
+    name: "llvm12-gen-amdgpu",
     in: "AMDGPU.td",
     outs: [
         "AMDGPUGenRegisterInfo.inc",
@@ -51,8 +51,8 @@ llvm_tblgen {
     ],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-amdgpuisel",
+llvm12_tblgen {
+    name: "llvm12-gen-amdgpuisel",
     in: "AMDGPUGISel.td",
     outs: [
         "AMDGPUGenGlobalISel.inc",
@@ -62,14 +62,14 @@ llvm_tblgen {
     ],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-instcombine",
+llvm12_tblgen {
+    name: "llvm12-gen-instcombine",
     in: "InstCombineTables.td",
     outs: ["InstCombineTables.inc"],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-r600",
+llvm12_tblgen {
+    name: "llvm12-gen-r600",
     in: "R600.td",
     outs: [
         "R600GenAsmWriter.inc",

diff --git a/llvm/lib/Target/AMDGPU/AsmParser/Android.bp b/llvm/lib/Target/AMDGPU/AsmParser/Android.bp
index 9e6fd08..1513d8d 100644 (file)
--- a/llvm/lib/Target/AMDGPU/AsmParser/Android.bp
+++ b/llvm/lib/Target/AMDGPU/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUAsmParser",
+    name: "libLLVM12AMDGPUAsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/AMDGPU/Disassembler/Android.bp b/llvm/lib/Target/AMDGPU/Disassembler/Android.bp
index b184ef0..e076979 100644 (file)
--- a/llvm/lib/Target/AMDGPU/Disassembler/Android.bp
+++ b/llvm/lib/Target/AMDGPU/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUDisassembler",
+    name: "libLLVM12AMDGPUDisassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/AMDGPU/InstPrinter/Android.bp b/llvm/lib/Target/AMDGPU/InstPrinter/Android.bp
index 0ee4ec3..77b1b0a 100644 (file)
--- a/llvm/lib/Target/AMDGPU/InstPrinter/Android.bp
+++ b/llvm/lib/Target/AMDGPU/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUAsmPrinter",
+    name: "libLLVM12AMDGPUAsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/Android.bp b/llvm/lib/Target/AMDGPU/MCTargetDesc/Android.bp
index 93a6ea5..2961c45 100644 (file)
--- a/llvm/lib/Target/AMDGPU/MCTargetDesc/Android.bp
+++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUDesc",
+    name: "libLLVM12AMDGPUDesc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/AMDGPU/TargetInfo/Android.bp b/llvm/lib/Target/AMDGPU/TargetInfo/Android.bp
index db94c04..624f5c7 100644 (file)
--- a/llvm/lib/Target/AMDGPU/TargetInfo/Android.bp
+++ b/llvm/lib/Target/AMDGPU/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUInfo",
+    name: "libLLVM12AMDGPUInfo",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/AMDGPU/Utils/Android.bp b/llvm/lib/Target/AMDGPU/Utils/Android.bp
index f6fb594..93c3aab 100644 (file)
--- a/llvm/lib/Target/AMDGPU/Utils/Android.bp
+++ b/llvm/lib/Target/AMDGPU/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUUtils",
+    name: "libLLVM12AMDGPUUtils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/ARM/Android.bp b/llvm/lib/Target/ARM/Android.bp
index 544f008..70f21dc 100644 (file)
--- a/llvm/lib/Target/ARM/Android.bp
+++ b/llvm/lib/Target/ARM/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMCodeGen",
+    name: "libLLVM12ARMCodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-arm-defaults",
     ],
     srcs: ["*.cpp"],
 
@@ -14,13 +14,13 @@ cc_library_static {
 }
 
 cc_defaults {
-    name: "llvm-arm-defaults",
-    generated_headers: ["llvm-gen-arm"],
-    static_libs: ["llvm-arm-headers"],
+    name: "llvm12-arm-defaults",
+    generated_headers: ["llvm12-gen-arm"],
+    static_libs: ["llvm12-arm-headers"],
 }
 
 cc_library_static {
-    name: "llvm-arm-headers",
+    name: "llvm12-arm-headers",
     vendor_available: true,
     host_supported: true,
     target: {
@@ -31,8 +31,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-arm",
+llvm12_tblgen {
+    name: "llvm12-gen-arm",
     in: "ARM.td",
     outs: [
         "ARMGenRegisterInfo.inc",

diff --git a/llvm/lib/Target/ARM/AsmParser/Android.bp b/llvm/lib/Target/ARM/AsmParser/Android.bp
index 3340db5..4b57b12 100644 (file)
--- a/llvm/lib/Target/ARM/AsmParser/Android.bp
+++ b/llvm/lib/Target/ARM/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMAsmParser",
+    name: "libLLVM12ARMAsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/ARM/Disassembler/Android.bp b/llvm/lib/Target/ARM/Disassembler/Android.bp
index 8deda86..650896b 100644 (file)
--- a/llvm/lib/Target/ARM/Disassembler/Android.bp
+++ b/llvm/lib/Target/ARM/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMDisassembler",
+    name: "libLLVM12ARMDisassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/ARM/InstPrinter/Android.bp b/llvm/lib/Target/ARM/InstPrinter/Android.bp
index f54529f..0618362 100644 (file)
--- a/llvm/lib/Target/ARM/InstPrinter/Android.bp
+++ b/llvm/lib/Target/ARM/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMAsmPrinter",
+    name: "libLLVM12ARMAsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/ARM/MCTargetDesc/Android.bp b/llvm/lib/Target/ARM/MCTargetDesc/Android.bp
index de05686..42058c7 100644 (file)
--- a/llvm/lib/Target/ARM/MCTargetDesc/Android.bp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMDesc",
+    name: "libLLVM12ARMDesc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/ARM/TargetInfo/Android.bp b/llvm/lib/Target/ARM/TargetInfo/Android.bp
index cfead24..c3d6f82 100644 (file)
--- a/llvm/lib/Target/ARM/TargetInfo/Android.bp
+++ b/llvm/lib/Target/ARM/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMInfo",
+    name: "libLLVM12ARMInfo",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/ARM/Utils/Android.bp b/llvm/lib/Target/ARM/Utils/Android.bp
index bd2ae34..df63045 100644 (file)
--- a/llvm/lib/Target/ARM/Utils/Android.bp
+++ b/llvm/lib/Target/ARM/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMUtils",
+    name: "libLLVM12ARMUtils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/Android.bp b/llvm/lib/Target/Android.bp
index 5101e66..567c913 100644 (file)
--- a/llvm/lib/Target/Android.bp
+++ b/llvm/lib/Target/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMTarget",
+    name: "libLLVM12Target",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/Mips/Android.bp b/llvm/lib/Target/Mips/Android.bp
index 8e1a99d..b01fab6 100644 (file)
--- a/llvm/lib/Target/Mips/Android.bp
+++ b/llvm/lib/Target/Mips/Android.bp
@@ -1,20 +1,20 @@
 cc_library_static {
-    name: "libLLVMMipsCodeGen",
+    name: "libLLVM12MipsCodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }
 
 cc_defaults {
-    name: "llvm-mips-defaults",
-    generated_headers: ["llvm-gen-mips"],
-    static_libs: ["llvm-mips-headers"],
+    name: "llvm12-mips-defaults",
+    generated_headers: ["llvm12-gen-mips"],
+    static_libs: ["llvm12-mips-headers"],
 }
 
 cc_library_static {
-    name: "llvm-mips-headers",
+    name: "llvm12-mips-headers",
     vendor_available: true,
     host_supported: true,
     target: {
@@ -25,8 +25,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-mips",
+llvm12_tblgen {
+    name: "llvm12-gen-mips",
     in: "Mips.td",
     outs: [
         "MipsGenRegisterInfo.inc",

diff --git a/llvm/lib/Target/Mips/AsmParser/Android.bp b/llvm/lib/Target/Mips/AsmParser/Android.bp
index b61dd02..74112e0 100644 (file)
--- a/llvm/lib/Target/Mips/AsmParser/Android.bp
+++ b/llvm/lib/Target/Mips/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsAsmParser",
+    name: "libLLVM12MipsAsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/Mips/Disassembler/Android.bp b/llvm/lib/Target/Mips/Disassembler/Android.bp
index 66118be..7b45899 100644 (file)
--- a/llvm/lib/Target/Mips/Disassembler/Android.bp
+++ b/llvm/lib/Target/Mips/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsDisassembler",
+    name: "libLLVM12MipsDisassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/Mips/InstPrinter/Android.bp b/llvm/lib/Target/Mips/InstPrinter/Android.bp
index 28483b6..1cd7de1 100644 (file)
--- a/llvm/lib/Target/Mips/InstPrinter/Android.bp
+++ b/llvm/lib/Target/Mips/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsAsmPrinter",
+    name: "libLLVM12MipsAsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/Mips/MCTargetDesc/Android.bp b/llvm/lib/Target/Mips/MCTargetDesc/Android.bp
index cc06b28..c78b22b 100644 (file)
--- a/llvm/lib/Target/Mips/MCTargetDesc/Android.bp
+++ b/llvm/lib/Target/Mips/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsDesc",
+    name: "libLLVM12MipsDesc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/Mips/TargetInfo/Android.bp b/llvm/lib/Target/Mips/TargetInfo/Android.bp
index 938c076..cbbe3f3 100644 (file)
--- a/llvm/lib/Target/Mips/TargetInfo/Android.bp
+++ b/llvm/lib/Target/Mips/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsInfo",
+    name: "libLLVM12MipsInfo",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/X86/Android.bp b/llvm/lib/Target/X86/Android.bp
index 80eed10..f92533f 100644 (file)
--- a/llvm/lib/Target/X86/Android.bp
+++ b/llvm/lib/Target/X86/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86CodeGen",
+    name: "libLLVM12X86CodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-x86-defaults",
     ],
     srcs: ["*.cpp"],
 
@@ -15,13 +15,13 @@ cc_library_static {
 }
 
 cc_defaults {
-    name: "llvm-x86-defaults",
-    generated_headers: ["llvm-gen-x86"],
-    static_libs: ["llvm-x86-headers"],
+    name: "llvm12-x86-defaults",
+    generated_headers: ["llvm12-gen-x86"],
+    static_libs: ["llvm12-x86-headers"],
 }
 
 cc_library_static {
-    name: "llvm-x86-headers",
+    name: "llvm12-x86-headers",
     vendor_available: true,
     host_supported: true,
     target: {
@@ -32,8 +32,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-x86",
+llvm12_tblgen {
+    name: "llvm12-gen-x86",
     in: "X86.td",
     outs: [
         "X86GenAsmMatcher.inc",

diff --git a/llvm/lib/Target/X86/AsmParser/Android.bp b/llvm/lib/Target/X86/AsmParser/Android.bp
index 830e02b..821614c 100644 (file)
--- a/llvm/lib/Target/X86/AsmParser/Android.bp
+++ b/llvm/lib/Target/X86/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86AsmParser",
+    name: "libLLVM12X86AsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/X86/Disassembler/Android.bp b/llvm/lib/Target/X86/Disassembler/Android.bp
index 0ee2e5e..93c0467 100644 (file)
--- a/llvm/lib/Target/X86/Disassembler/Android.bp
+++ b/llvm/lib/Target/X86/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Disassembler",
+    name: "libLLVM12X86Disassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/X86/InstPrinter/Android.bp b/llvm/lib/Target/X86/InstPrinter/Android.bp
index bd37b9e..e3b0c93 100644 (file)
--- a/llvm/lib/Target/X86/InstPrinter/Android.bp
+++ b/llvm/lib/Target/X86/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86AsmPrinter",
+    name: "libLLVM12X86AsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/X86/MCTargetDesc/Android.bp b/llvm/lib/Target/X86/MCTargetDesc/Android.bp
index 7eb5a6e..2981a67 100644 (file)
--- a/llvm/lib/Target/X86/MCTargetDesc/Android.bp
+++ b/llvm/lib/Target/X86/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Desc",
+    name: "libLLVM12X86Desc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/X86/TargetInfo/Android.bp b/llvm/lib/Target/X86/TargetInfo/Android.bp
index a1a2f5c..690df61 100644 (file)
--- a/llvm/lib/Target/X86/TargetInfo/Android.bp
+++ b/llvm/lib/Target/X86/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Info",
+    name: "libLLVM12X86Info",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Target/X86/Utils/Android.bp b/llvm/lib/Target/X86/Utils/Android.bp
index 30d8ec1..1400465 100644 (file)
--- a/llvm/lib/Target/X86/Utils/Android.bp
+++ b/llvm/lib/Target/X86/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Utils",
+    name: "libLLVM12X86Utils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm12-lib-defaults",
+        "llvm12-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/TextAPI/Android.bp b/llvm/lib/TextAPI/Android.bp
index 660568d..a32e636 100644 (file)
--- a/llvm/lib/TextAPI/Android.bp
+++ b/llvm/lib/TextAPI/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMTextAPI",
+    name: "libLLVM12TextAPI",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: [
         "ELF/*.cpp",

diff --git a/llvm/lib/ToolDrivers/llvm-lib/Android.bp b/llvm/lib/ToolDrivers/llvm-lib/Android.bp
index d33020b..1f94be8 100644 (file)
--- a/llvm/lib/ToolDrivers/llvm-lib/Android.bp
+++ b/llvm/lib/ToolDrivers/llvm-lib/Android.bp
@@ -1,14 +1,14 @@
 cc_library_static {
-    name: "libLLVMLibDriver",
+    name: "libLLVM12LibDriver",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
-    generated_headers: ["llvm-gen-libdriver"],
+    generated_headers: ["llvm12-gen-libdriver"],
     srcs: ["*.cpp"],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-libdriver",
+llvm12_tblgen {
+    name: "llvm12-gen-libdriver",
     in: "Options.td",
     outs: ["Options.inc"],
 }

diff --git a/llvm/lib/Transforms/AggressiveInstCombine/Android.bp b/llvm/lib/Transforms/AggressiveInstCombine/Android.bp
index b2c12fc..70f7b49 100644 (file)
--- a/llvm/lib/Transforms/AggressiveInstCombine/Android.bp
+++ b/llvm/lib/Transforms/AggressiveInstCombine/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAggressiveInstCombine",
+    name: "libLLVM12AggressiveInstCombine",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Transforms/CFGuard/Android.bp b/llvm/lib/Transforms/CFGuard/Android.bp
index 6686e5f..c792831 100644 (file)
--- a/llvm/lib/Transforms/CFGuard/Android.bp
+++ b/llvm/lib/Transforms/CFGuard/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMCFGuard",
+    name: "libLLVM12CFGuard",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Transforms/Coroutines/Android.bp b/llvm/lib/Transforms/Coroutines/Android.bp
index 8d1beca..3b25ed0 100644 (file)
--- a/llvm/lib/Transforms/Coroutines/Android.bp
+++ b/llvm/lib/Transforms/Coroutines/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMCoroutines",
+    name: "libLLVM12Coroutines",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Transforms/Hello/Android.bp b/llvm/lib/Transforms/Hello/Android.bp
index 64e2e6d..f860a55 100644 (file)
--- a/llvm/lib/Transforms/Hello/Android.bp
+++ b/llvm/lib/Transforms/Hello/Android.bp
@@ -1,7 +1,7 @@
 cc_library_host_shared {
-    name: "LLVMHello",
+    name: "LLVM12Hello",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
     allow_undefined_symbols: true,

diff --git a/llvm/lib/Transforms/HelloNew/Android.bp b/llvm/lib/Transforms/HelloNew/Android.bp
index 54ddf0f..e01df73 100644 (file)
--- a/llvm/lib/Transforms/HelloNew/Android.bp
+++ b/llvm/lib/Transforms/HelloNew/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMHelloNew",
+    name: "libLLVM12HelloNew",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Transforms/IPO/Android.bp b/llvm/lib/Transforms/IPO/Android.bp
index 644cee1..3dd92e7 100644 (file)
--- a/llvm/lib/Transforms/IPO/Android.bp
+++ b/llvm/lib/Transforms/IPO/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMipo",
+    name: "libLLVM12ipo",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Transforms/InstCombine/Android.bp b/llvm/lib/Transforms/InstCombine/Android.bp
index dfcc7ca..bcad064 100644 (file)
--- a/llvm/lib/Transforms/InstCombine/Android.bp
+++ b/llvm/lib/Transforms/InstCombine/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMInstCombine",
+    name: "libLLVM12InstCombine",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Transforms/Instrumentation/Android.bp b/llvm/lib/Transforms/Instrumentation/Android.bp
index b719f17..5405c06 100644 (file)
--- a/llvm/lib/Transforms/Instrumentation/Android.bp
+++ b/llvm/lib/Transforms/Instrumentation/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMInstrumentation",
+    name: "libLLVM12Instrumentation",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Transforms/ObjCARC/Android.bp b/llvm/lib/Transforms/ObjCARC/Android.bp
index 64bc529..ab40b6a 100644 (file)
--- a/llvm/lib/Transforms/ObjCARC/Android.bp
+++ b/llvm/lib/Transforms/ObjCARC/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMTransformObjCARC",
+    name: "libLLVM12TransformObjCARC",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Transforms/Scalar/Android.bp b/llvm/lib/Transforms/Scalar/Android.bp
index 42e1eb8..ac6e5cb 100644 (file)
--- a/llvm/lib/Transforms/Scalar/Android.bp
+++ b/llvm/lib/Transforms/Scalar/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMScalarOpts",
+    name: "libLLVM12ScalarOpts",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Transforms/Utils/Android.bp b/llvm/lib/Transforms/Utils/Android.bp
index 8fcf7ef..22b8a58 100644 (file)
--- a/llvm/lib/Transforms/Utils/Android.bp
+++ b/llvm/lib/Transforms/Utils/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMTransformUtils",
+    name: "libLLVM12TransformUtils",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/lib/Transforms/Vectorize/Android.bp b/llvm/lib/Transforms/Vectorize/Android.bp
index 78b1685..94381fd 100644 (file)
--- a/llvm/lib/Transforms/Vectorize/Android.bp
+++ b/llvm/lib/Transforms/Vectorize/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMVectorize",
+    name: "libLLVM12Vectorize",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm12-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/llvm/soong/Android.bp b/llvm/soong/Android.bp
index 5895945..ed07910 100644 (file)
--- a/llvm/soong/Android.bp
+++ b/llvm/soong/Android.bp
@@ -1,5 +1,5 @@
 bootstrap_go_package {
-    name: "soong-llvm",
+    name: "soong-llvm12",
     pkgPath: "android/soong/external/llvm-project/llvm",
     deps: [
         "blueprint",

diff --git a/llvm/soong/llvm.go b/llvm/soong/llvm.go
index 7ff99bd..3c8059e 100644 (file)
--- a/llvm/soong/llvm.go
+++ b/llvm/soong/llvm.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package llvm
+package llvm12
 
 import (
        "android/soong/android"
@@ -97,8 +97,8 @@ func forceBuildLlvmComponents(ctx android.LoadHookContext) {
 }
 
 func init() {
-       android.RegisterModuleType("llvm_defaults", llvmDefaultsFactory)
-       android.RegisterModuleType("force_build_llvm_components_defaults", forceBuildLlvmComponentsDefaultsFactory)
+       android.RegisterModuleType("llvm12_defaults", llvmDefaultsFactory)
+       android.RegisterModuleType("force_build_llvm12_components_defaults", forceBuildLlvmComponentsDefaultsFactory)
 }
 
 func llvmDefaultsFactory() android.Module {

diff --git a/llvm/soong/tblgen.go b/llvm/soong/tblgen.go
index b55ab19..3f5b148 100644 (file)
--- a/llvm/soong/tblgen.go
+++ b/llvm/soong/tblgen.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package llvm
+package llvm12
 
 import (
        "path/filepath"
@@ -25,20 +25,20 @@ import (
 )
 
 func init() {
-       android.RegisterModuleType("llvm_tblgen", llvmTblgenFactory)
+       android.RegisterModuleType("llvm12_tblgen", llvm12TblgenFactory)
 }
 
 var (
-       pctx = android.NewPackageContext("android/soong/llvm")
+       pctx = android.NewPackageContext("android/soong/llvm12")
 
-       llvmTblgen = pctx.HostBinToolVariable("llvmTblgen", "llvm-tblgen")
+       llvm12Tblgen = pctx.HostBinToolVariable("llvm12Tblgen", "llvm12-tblgen")
 
-       tblgenRule = pctx.StaticRule("tblgenRule", blueprint.RuleParams{
+       tblgenRule12 = pctx.StaticRule("tblgenRule12", blueprint.RuleParams{
                Depfile:     "${out}.d",
                Deps:        blueprint.DepsGCC,
-               Command:     "${llvmTblgen} ${includes} ${generator} -d ${depfile} -o ${out} ${in}",
-               CommandDeps: []string{"${llvmTblgen}"},
-               Description: "LLVM TableGen $in => $out",
+               Command:     "${llvm12Tblgen} ${includes} ${generator} -d ${depfile} -o ${out} ${in}",
+               CommandDeps: []string{"${llvm12Tblgen}"},
+               Description: "LLVM12 TableGen $in => $out",
                Restat:      true,
        }, "includes", "depfile", "generator")
 )
@@ -74,7 +74,7 @@ func (t *tblgen) GenerateAndroidBuildActions(ctx android.ModuleContext) {
                generator := outToGenerator(ctx, o)
 
                ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-                       Rule:   tblgenRule,
+                       Rule:   tblgenRule12,
                        Input:  in,
                        Output: out,
                        Args: map[string]string{
@@ -218,7 +218,7 @@ func (t *tblgen) GeneratedDeps() android.Paths {
        return t.generatedHeaders
 }
 
-func llvmTblgenFactory() android.Module {
+func llvm12TblgenFactory() android.Module {
        t := &tblgen{}
        t.AddProperties(&t.properties)
        android.InitAndroidModule(t)

diff --git a/llvm/tools/llvm-go/llvm-go.go b/llvm/tools/llvm-go/llvm-go.go
index a0561dd..5923ed2 100644 (file)
--- a/llvm/tools/llvm-go/llvm-go.go
+++ b/llvm/tools/llvm-go/llvm-go.go
@@ -71,7 +71,7 @@ func llvmConfig(args ...string) string {
        configpath := os.Getenv("LLVM_CONFIG")
        if configpath == "" {
                bin, _ := filepath.Split(os.Args[0])
-               configpath = filepath.Join(bin, "llvm-config")
+               configpath = filepath.Join(bin, "llvm12-config")
        }
 
        cmd := exec.Command(configpath, args...)
@@ -137,7 +137,7 @@ func printConfig() {
 
 // This file is generated by llvm-go, do not edit.
 
-package llvm
+package llvm12
 
 /*
 #cgo CPPFLAGS: %s

diff --git a/llvm/utils/TableGen/Android.bp b/llvm/utils/TableGen/Android.bp
index 69d0487..bd91e2e 100644 (file)
--- a/llvm/utils/TableGen/Android.bp
+++ b/llvm/utils/TableGen/Android.bp
@@ -1,12 +1,12 @@
 cc_binary_host {
-    name: "llvm-tblgen",
-    defaults: ["llvm-defaults-no-generated-headers"],
+    name: "llvm12-tblgen",
+    defaults: ["llvm12-defaults-no-generated-headers"],
     srcs: ["*.cpp"],
 
     static_libs: [
-        "libLLVMTableGenGlobalISel",
-        "libLLVMTableGen",
-        "libLLVMSupport",
+        "libLLVM12TableGenGlobalISel",
+        "libLLVM12TableGen",
+        "libLLVM12Support",
     ],
 
     host_ldlibs: ["-lm"],
@@ -14,8 +14,8 @@ cc_binary_host {
         windows: {
             enabled: false,
         },
-        // llvm-defaults turns off host builds by default, turn it back on for
-        // modules that are used to build llvm-tblgen
+        // llvm12-defaults turns off host builds by default, turn it back on for
+        // modules that are used to build llvm12-tblgen
         host: {
             enabled: true,
         },

diff --git a/llvm/utils/TableGen/GlobalISel/Android.bp b/llvm/utils/TableGen/GlobalISel/Android.bp
index 6faf3ed..c3d176c 100644 (file)
--- a/llvm/utils/TableGen/GlobalISel/Android.bp
+++ b/llvm/utils/TableGen/GlobalISel/Android.bp
@@ -1,10 +1,10 @@
 cc_library_static {
-    name: "libLLVMTableGenGlobalISel",
-    defaults: ["llvm-defaults-no-generated-headers"],
+    name: "libLLVM12TableGenGlobalISel",
+    defaults: ["llvm12-defaults-no-generated-headers"],
     srcs: ["*.cpp"],
 
     static_libs: [
-        "libLLVMSupport",
+        "libLLVM12Support",
     ],
 
     host_ldlibs: ["-lm"],
@@ -12,8 +12,8 @@ cc_library_static {
         windows: {
             enabled: false,
         },
-        // llvm-defaults turns off host builds by default, turn it back on for
-        // modules that are used to build llvm-tblgen
+        // llvm12-defaults turns off host builds by default, turn it back on for
+        // modules that are used to build llvm12-tblgen
         host: {
             enabled: true,
         },

diff --git a/llvm/utils/TableGen/tdtags b/llvm/utils/TableGen/tdtags
index a3fb080..9bd4f4f 100644 (file)
--- a/llvm/utils/TableGen/tdtags
+++ b/llvm/utils/TableGen/tdtags
@@ -351,7 +351,7 @@ LC_ALL=C
 export LC_ALL
 
 # Globals.
-TBLGEN=llvm-tblgen
+TBLGEN=llvm12-tblgen
 LLVM_SRC_ROOT=
 
 # Command options.