From 57e60c7ea3995076d3e648d624487d7224931fe0 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sat, 16 Mar 2024 00:37:00 +0100 Subject: [PATCH 1/2] DO NOT MERGE: android: translate soong build rules for libLLVM18 Changes to side build external/llvm-project project (llvm 18 version) and avoid conflicts with external/llvm project targets and variables Changes in mesa main Android.mk are required for libLLVM18 shared library dependency and cflag -DMESA_LLVM_VERSION_STRING=\"18.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/libLLVM18/g' {} + #rename the boostrap and contextual build paths find . -type f -name "*.bp" -exec sed -i 's/soong\-llvm/\soong-llvm18/g' {} + find . -type f -name "*.go" -exec sed -i 's/android\/soong\/llvm/android\/soong\/llvm18/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_llvm18_components/g' {} + find . -type f -name '*.go' -exec sed -i 's/force_build_llvm_components/force_build_llvm18_components/g' {} + #rename all module that gave 'already defined' error find . -type f -name '*.bp' -exec sed -i 's/llvm-aarch64-defaults/llvm18-aarch64-defaults/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-aarch64-headers/llvm18-aarch64-headers/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-amdgpu-defaults/llvm18-amdgpu-defaults/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-amdgpu-headers/llvm18-amdgpu-headers/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-arm-defaults/llvm18-arm-defaults/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-arm-headers/llvm18-arm-headers/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-defaults/llvm18-defaults/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-defaults-no-generated-headers/llvm18-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-/llvm18-gen-/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-headers/llvm18-headers/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-headers-no-generated-headers/llvm18-headers-no-generated-headers/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-lib-defaults/llvm18-lib-defaults/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-mips-defaults/llvm18-mips-defaults/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-mips-headers/llvm18-mips-headers/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-tblgen/llvm18-tblgen/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-x86-defaults/llvm18-x86-defaults/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm-x86-headers/llvm18-x86-headers/g' {} + #COMMENTED AS NOT NEEDED ANYMORE rename llvm-gen-instcombine module #find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-instcombine/llvm18-gen-instcombine/g' {} + #rename the binaries find . -type f -name '*.bp' -exec sed -i 's/LLVMHello/LLVM18Hello/g' {} + find . -type f -name '*.bp' -exec sed -i 's/LLVMgold/LLVM18gold/g' {} + #rename the TableGen binary module and variable in different files find . -type f -name '*.go' -exec sed -i 's/LLVM TableGen/LLVM18 TableGen/g' {} + find . -type f -name '*.go' -exec sed -i 's/llvm-tblgen/llvm18-tblgen/g' {} + find . -type f -name '*.go' -exec sed -i 's/llvmTblgen/llvm18Tblgen/g' {} + find . -type f -name '*.go' -exec sed -i 's/tblgenRule/tblgenRule18/g' {} + find . -type f -name '*.bp' -exec sed -i 's/llvm_tblgen/llvm18_tblgen/g' {} + find . -type f -name '*.go' -exec sed -i 's/llvm_tblgen/llvm18_tblgen/g' {} + find . -type f -name 'tdtags' -exec sed -i 's/llvm-tblgen/llvm18-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\/llvm18/g' {} + #find . -type f -name '*.go' -exec sed -i 's/external\/llvm/external\/llvm18/g' {} + #rename package, registered types and llvm-config find . -type f -name '*.go' -exec sed -i 's/package llvm/package llvm18/g' {} + find . -type f -name '*.go' -exec sed -i 's/llvm_tblgen/llvm18_tblgen/g' {} + find . -type f -name '*.go' -exec sed -i 's/llvm_defaults/llvm18_defaults/g' {} + find . -type f -name '*.bp' -exec sed -i 's/ llvm-config / llvm18-config /g' {} + find . -type f -name '*.bp' -exec sed -i 's/"llvm-config"/"llvm18-config"/g' {} + find . -type f -name '*.go' -exec sed -i 's/"llvm-config"/"llvm18-config"/g' {} + --- llvm/Android.bp | 266 +++++++++--------- llvm/lib/Analysis/Android.bp | 4 +- llvm/lib/Android.bp | 6 +- llvm/lib/AsmParser/Android.bp | 4 +- llvm/lib/BinaryFormat/Android.bp | 4 +- llvm/lib/Bitcode/Reader/Android.bp | 4 +- llvm/lib/Bitcode/Writer/Android.bp | 4 +- llvm/lib/Bitstream/Reader/Android.bp | 4 +- llvm/lib/CodeGen/Android.bp | 4 +- llvm/lib/CodeGen/AsmPrinter/Android.bp | 4 +- llvm/lib/CodeGen/GlobalISel/Android.bp | 4 +- llvm/lib/CodeGen/MIRParser/Android.bp | 4 +- llvm/lib/CodeGen/SelectionDAG/Android.bp | 4 +- llvm/lib/DebugInfo/BTF/Android.bp | 4 +- llvm/lib/DebugInfo/CodeView/Android.bp | 4 +- llvm/lib/DebugInfo/DWARF/Android.bp | 4 +- llvm/lib/DebugInfo/MSF/Android.bp | 4 +- llvm/lib/DebugInfo/PDB/Android.bp | 4 +- llvm/lib/DebugInfo/Symbolize/Android.bp | 4 +- llvm/lib/Debuginfod/Android.bp | 4 +- llvm/lib/Demangle/Android.bp | 4 +- llvm/lib/ExecutionEngine/Android.bp | 4 +- .../ExecutionEngine/Interpreter/Android.bp | 4 +- llvm/lib/ExecutionEngine/JITLink/Android.bp | 10 +- llvm/lib/ExecutionEngine/MCJIT/Android.bp | 4 +- llvm/lib/ExecutionEngine/Orc/Android.bp | 4 +- .../lib/ExecutionEngine/Orc/Shared/Android.bp | 4 +- .../Orc/TargetProcess/Android.bp | 4 +- .../ExecutionEngine/RuntimeDyld/Android.bp | 4 +- llvm/lib/Frontend/Offloading/Android.bp | 4 +- llvm/lib/Frontend/OpenACC/Android.bp | 6 +- llvm/lib/Frontend/OpenMP/Android.bp | 6 +- llvm/lib/IR/Android.bp | 4 +- llvm/lib/IRPrinter/Android.bp | 4 +- llvm/lib/IRReader/Android.bp | 4 +- llvm/lib/InterfaceStub/Android.bp | 4 +- llvm/lib/LTO/Android.bp | 4 +- llvm/lib/Linker/Android.bp | 4 +- llvm/lib/MC/Android.bp | 4 +- llvm/lib/MC/MCDisassembler/Android.bp | 4 +- llvm/lib/MC/MCParser/Android.bp | 4 +- llvm/lib/Object/Android.bp | 4 +- llvm/lib/ObjectYAML/Android.bp | 4 +- llvm/lib/Option/Android.bp | 4 +- llvm/lib/Passes/Android.bp | 4 +- llvm/lib/ProfileData/Android.bp | 4 +- llvm/lib/ProfileData/Coverage/Android.bp | 4 +- llvm/lib/Remarks/Android.bp | 4 +- llvm/lib/Support/Android.bp | 32 +-- llvm/lib/TableGen/Android.bp | 8 +- llvm/lib/Target/AArch64/Android.bp | 18 +- llvm/lib/Target/AArch64/AsmParser/Android.bp | 6 +- .../Target/AArch64/Disassembler/Android.bp | 6 +- .../lib/Target/AArch64/InstPrinter/Android.bp | 6 +- .../Target/AArch64/MCTargetDesc/Android.bp | 6 +- llvm/lib/Target/AArch64/TargetInfo/Android.bp | 6 +- llvm/lib/Target/AArch64/Utils/Android.bp | 6 +- llvm/lib/Target/AMDGPU/Android.bp | 36 +-- llvm/lib/Target/AMDGPU/AsmParser/Android.bp | 6 +- .../lib/Target/AMDGPU/Disassembler/Android.bp | 6 +- llvm/lib/Target/AMDGPU/InstPrinter/Android.bp | 6 +- .../lib/Target/AMDGPU/MCTargetDesc/Android.bp | 6 +- llvm/lib/Target/AMDGPU/TargetInfo/Android.bp | 6 +- llvm/lib/Target/AMDGPU/Utils/Android.bp | 6 +- llvm/lib/Target/ARM/Android.bp | 18 +- llvm/lib/Target/ARM/AsmParser/Android.bp | 6 +- llvm/lib/Target/ARM/Disassembler/Android.bp | 6 +- llvm/lib/Target/ARM/InstPrinter/Android.bp | 6 +- llvm/lib/Target/ARM/MCTargetDesc/Android.bp | 6 +- llvm/lib/Target/ARM/TargetInfo/Android.bp | 6 +- llvm/lib/Target/ARM/Utils/Android.bp | 6 +- llvm/lib/Target/Android.bp | 4 +- llvm/lib/Target/Mips/Android.bp | 18 +- llvm/lib/Target/Mips/AsmParser/Android.bp | 6 +- llvm/lib/Target/Mips/Disassembler/Android.bp | 6 +- llvm/lib/Target/Mips/InstPrinter/Android.bp | 6 +- llvm/lib/Target/Mips/MCTargetDesc/Android.bp | 6 +- llvm/lib/Target/Mips/TargetInfo/Android.bp | 6 +- llvm/lib/Target/X86/Android.bp | 18 +- llvm/lib/Target/X86/AsmParser/Android.bp | 6 +- llvm/lib/Target/X86/Disassembler/Android.bp | 6 +- llvm/lib/Target/X86/InstPrinter/Android.bp | 6 +- llvm/lib/Target/X86/MCTargetDesc/Android.bp | 6 +- llvm/lib/Target/X86/TargetInfo/Android.bp | 6 +- llvm/lib/Target/X86/Utils/Android.bp | 6 +- llvm/lib/TargetParser/Android.bp | 10 +- llvm/lib/TextAPI/Android.bp | 4 +- llvm/lib/ToolDrivers/llvm-lib/Android.bp | 10 +- .../AggressiveInstCombine/Android.bp | 4 +- llvm/lib/Transforms/CFGuard/Android.bp | 4 +- llvm/lib/Transforms/Coroutines/Android.bp | 4 +- llvm/lib/Transforms/Hello/Android.bp | 4 +- llvm/lib/Transforms/HelloNew/Android.bp | 4 +- llvm/lib/Transforms/HipStdPar/Android.bp | 4 +- llvm/lib/Transforms/IPO/Android.bp | 4 +- llvm/lib/Transforms/InstCombine/Android.bp | 4 +- .../lib/Transforms/Instrumentation/Android.bp | 4 +- llvm/lib/Transforms/ObjCARC/Android.bp | 4 +- llvm/lib/Transforms/Scalar/Android.bp | 4 +- llvm/lib/Transforms/Utils/Android.bp | 4 +- llvm/lib/Transforms/Vectorize/Android.bp | 4 +- llvm/lib/WindowsDriver/Android.bp | 4 +- llvm/soong/Android.bp | 2 +- llvm/soong/llvm.go | 6 +- llvm/soong/tblgen.go | 20 +- llvm/utils/TableGen/Android.bp | 14 +- llvm/utils/TableGen/GlobalISel/Android.bp | 10 +- llvm/utils/TableGen/tdtags | 2 +- 108 files changed, 463 insertions(+), 463 deletions(-) diff --git a/llvm/Android.bp b/llvm/Android.bp index 2d30b18ddcdc..61ab1a90fd13 100644 --- 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: "llvm18-defaults", + defaults: ["llvm18-defaults-no-generated-headers"], + header_libs: ["llvm18-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: "llvm18-defaults-no-generated-headers", host_supported: true, clang: true, @@ -44,7 +44,7 @@ llvm_defaults { "-Wno-error=unreachable-code-loop-increment", ], - header_libs: ["llvm-headers-no-generated-headers"], + header_libs: ["llvm18-headers-no-generated-headers"], target: { android: { @@ -99,7 +99,7 @@ llvm_defaults { } cc_library_headers { - name: "llvm-headers-no-generated-headers", + name: "llvm18-headers-no-generated-headers", vendor_available: true, host_supported: true, export_include_dirs: ["include"], @@ -120,26 +120,26 @@ cc_library_headers { } cc_library_headers { - name: "llvm-headers", + name: "llvm18-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: ["llvm18-headers-no-generated-headers"], + export_header_lib_headers: ["llvm18-headers-no-generated-headers"], generated_headers: [ - "llvm-gen-attributes", - "llvm-gen-intrinsics", - "llvm-gen-revision", - "llvm-gen-extension", - "llvm-gen-omp_gen", - "llvm-gen-acc_gen", + "llvm18-gen-attributes", + "llvm18-gen-intrinsics", + "llvm18-gen-revision", + "llvm18-gen-extension", + "llvm18-gen-omp_gen", + "llvm18-gen-acc_gen", ], export_generated_headers: [ - "llvm-gen-attributes", - "llvm-gen-intrinsics", - "llvm-gen-revision", - "llvm-gen-extension", - "llvm-gen-omp_gen", - "llvm-gen-acc_gen", + "llvm18-gen-attributes", + "llvm18-gen-intrinsics", + "llvm18-gen-revision", + "llvm18-gen-extension", + "llvm18-gen-omp_gen", + "llvm18-gen-acc_gen", ], target: { windows: { @@ -148,14 +148,14 @@ cc_library_headers { }, } -llvm_tblgen { - name: "llvm-gen-attributes", +llvm18_tblgen { + name: "llvm18-gen-attributes", in: "include/llvm/IR/Attributes.td", outs: ["llvm/IR/Attributes.inc"], } -llvm_tblgen { - name: "llvm-gen-intrinsics", +llvm18_tblgen { + name: "llvm18-gen-intrinsics", in: "include/llvm/IR/Intrinsics.td", outs: [ "llvm/IR/IntrinsicEnums.inc", @@ -180,8 +180,8 @@ llvm_tblgen { ], } -llvm_tblgen { - name: "llvm-gen-omp_gen", +llvm18_tblgen { + name: "llvm18-gen-omp_gen", in: "include/llvm/Frontend/OpenMP/OMP.td", outs: [ "llvm/Frontend/OpenMP/OMP.h.inc", @@ -189,8 +189,8 @@ llvm_tblgen { ], } -llvm_tblgen { - name: "llvm-gen-acc_gen", +llvm18_tblgen { + name: "llvm18-gen-acc_gen", in: "include/llvm/Frontend/OpenACC/ACC.td", outs: [ "llvm/Frontend/OpenMP/ACC.h.inc", @@ -198,14 +198,14 @@ llvm_tblgen { ], } -llvm_tblgen { - name: "llvm-gen-riscv-target-def", +llvm18_tblgen { + name: "llvm18-gen-riscv-target-def", in: "lib/Target/RISCV/RISCV.td", outs: ["llvm/TargetParser/RISCVTargetParserDef.inc"], } genrule { - name: "llvm-gen-revision", + name: "llvm18-gen-revision", out: ["llvm/Support/VCSRevision.h"], srcs: [".git/logs/HEAD*"], tool_files: ["git_sha1_gen.py"], @@ -213,15 +213,15 @@ genrule { } genrule { - name: "llvm-gen-extension", + name: "llvm18-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_llvm18_components_defaults { + name: "force_build_llvm18_components", // Host build disabled by soong/llvm.go unless FORCE_BUILD_LLVM_COMPONENTS // environment variable is set } @@ -229,129 +229,129 @@ force_build_llvm_components_defaults { // LLVM shared library build llvm_arm_static_libraries = [ - "libLLVMARMCodeGen", - "libLLVMARMAsmParser", - "libLLVMARMAsmPrinter", - "libLLVMARMInfo", - "libLLVMARMDesc", - "libLLVMARMDisassembler", - "libLLVMARMUtils", + "libLLVM18ARMCodeGen", + "libLLVM18ARMAsmParser", + "libLLVM18ARMAsmPrinter", + "libLLVM18ARMInfo", + "libLLVM18ARMDesc", + "libLLVM18ARMDisassembler", + "libLLVM18ARMUtils", ] llvm_x86_static_libraries = [ - "libLLVMX86CodeGen", - "libLLVMX86Info", - "libLLVMX86Desc", - "libLLVMX86AsmParser", - "libLLVMX86AsmPrinter", - "libLLVMX86Utils", - "libLLVMX86Disassembler", + "libLLVM18X86CodeGen", + "libLLVM18X86Info", + "libLLVM18X86Desc", + "libLLVM18X86AsmParser", + "libLLVM18X86AsmPrinter", + "libLLVM18X86Utils", + "libLLVM18X86Disassembler", ] llvm_mips_static_libraries = [ - "libLLVMMipsCodeGen", - "libLLVMMipsInfo", - "libLLVMMipsDesc", - "libLLVMMipsAsmParser", - "libLLVMMipsAsmPrinter", - "libLLVMMipsDisassembler", + "libLLVM18MipsCodeGen", + "libLLVM18MipsInfo", + "libLLVM18MipsDesc", + "libLLVM18MipsAsmParser", + "libLLVM18MipsAsmPrinter", + "libLLVM18MipsDisassembler", ] llvm_aarch64_static_libraries = [ - "libLLVMAArch64CodeGen", - "libLLVMAArch64Info", - "libLLVMAArch64Desc", - "libLLVMAArch64AsmParser", - "libLLVMAArch64AsmPrinter", - "libLLVMAArch64Utils", - "libLLVMAArch64Disassembler", + "libLLVM18AArch64CodeGen", + "libLLVM18AArch64Info", + "libLLVM18AArch64Desc", + "libLLVM18AArch64AsmParser", + "libLLVM18AArch64AsmPrinter", + "libLLVM18AArch64Utils", + "libLLVM18AArch64Disassembler", ] llvm_amdgpu_static_libraries = [ - "libLLVMAMDGPUCodeGen", - "libLLVMAMDGPUInfo", - "libLLVMAMDGPUDesc", - "libLLVMAMDGPUAsmParser", - "libLLVMAMDGPUAsmPrinter", - "libLLVMAMDGPUUtils", - "libLLVMAMDGPUDisassembler", + "libLLVM18AMDGPUCodeGen", + "libLLVM18AMDGPUInfo", + "libLLVM18AMDGPUDesc", + "libLLVM18AMDGPUAsmParser", + "libLLVM18AMDGPUAsmPrinter", + "libLLVM18AMDGPUUtils", + "libLLVM18AMDGPUDisassembler", ] cc_library_shared { host_supported: true, vendor_available: true, - name: "libLLVM", + name: "libLLVM18", defaults: [ - "llvm-defaults", - "force_build_llvm_components", + "llvm18-defaults", + "force_build_llvm18_components", ], whole_static_libs: [ // pre static libraries - "libLLVMLinker", - "libLLVMipo", - "libLLVMDebugInfoBTF", - "libLLVMDebugInfoDWARF", - "libLLVMDebugInfoMSF", - "libLLVMDebugInfoPDB", - "libLLVMSymbolize", - "libLLVMIRPrinter", - "libLLVMIRReader", - "libLLVMBitWriter", - "libLLVMBitReader", - "libLLVMPasses", - "libLLVMDemangle", - "libLLVMBitstreamReader", + "libLLVM18Linker", + "libLLVM18ipo", + "libLLVM18DebugInfoBTF", + "libLLVM18DebugInfoDWARF", + "libLLVM18DebugInfoMSF", + "libLLVM18DebugInfoPDB", + "libLLVM18Symbolize", + "libLLVM18IRPrinter", + "libLLVM18IRReader", + "libLLVM18BitWriter", + "libLLVM18BitReader", + "libLLVM18Passes", + "libLLVM18Demangle", + "libLLVM18BitstreamReader", // post static libraries - "libLLVMLTO", - "libLLVMAsmPrinter", - "libLLVMSelectionDAG", - "libLLVMCodeGen", - "libLLVMDebugInfoCodeView", - "libLLVMObject", - "libLLVMScalarOpts", - "libLLVMAggressiveInstCombine", - "libLLVMInstCombine", - "libLLVMInstrumentation", - "libLLVMTransformObjCARC", - "libLLVMTransformUtils", - "libLLVMAnalysis", - "libLLVMTarget", - "libLLVMTargetParser", - "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", - "libLLVMInterfaceStub", - "libLLVMDebuginfod", - "libLLVMWindowsDriver", - "libLLVMHipStdPar", - "libLLVMFrontendOffloading", + "libLLVM18LTO", + "libLLVM18AsmPrinter", + "libLLVM18SelectionDAG", + "libLLVM18CodeGen", + "libLLVM18DebugInfoCodeView", + "libLLVM18Object", + "libLLVM18ScalarOpts", + "libLLVM18AggressiveInstCombine", + "libLLVM18InstCombine", + "libLLVM18Instrumentation", + "libLLVM18TransformObjCARC", + "libLLVM18TransformUtils", + "libLLVM18Analysis", + "libLLVM18Target", + "libLLVM18TargetParser", + "libLLVM18GlobalISel", + "libLLVM18MCDisassembler", + "libLLVM18MC", + "libLLVM18MCParser", + "libLLVM18Core", + "libLLVM18AsmParser", + "libLLVM18Option", + "libLLVM18Support", + "libLLVM18Vectorize", + "libLLVM18ProfileData", + "libLLVM18ProfileDataCoverage", + "libLLVM18LibDriver", + "libLLVM18ExecutionEngine", + "libLLVM18RuntimeDyld", + "libLLVM18MCJIT", + "libLLVM18OrcJIT", + "libLLVM18BinaryFormat", + "libLLVM18MIRParser", + "libLLVM18Remarks", + "libLLVM18JITLink", + "libLLVM18Coroutines", + "libLLVM18TextAPI", + "libLLVM18CFGuard", + "libLLVM18FrontendOpenMP", + "libLLVM18HelloNew", + "libLLVM18OrcShared", + "libLLVM18OrcTargetProcess", + "libLLVM18InterfaceStub", + "libLLVM18Debuginfod", + "libLLVM18WindowsDriver", + "libLLVM18HipStdPar", + "libLLVM18FrontendOffloading", ], export_include_dirs: ["include"], diff --git a/llvm/lib/Analysis/Android.bp b/llvm/lib/Analysis/Android.bp index 3b1c05d9c6a8..d1fab5a2297d 100644 --- a/llvm/lib/Analysis/Android.bp +++ b/llvm/lib/Analysis/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMAnalysis", + name: "libLLVM18Analysis", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: [ "AliasAnalysis.cpp", diff --git a/llvm/lib/Android.bp b/llvm/lib/Android.bp index 127ba59ce3c3..368b770b24d0 100644 --- a/llvm/lib/Android.bp +++ b/llvm/lib/Android.bp @@ -1,8 +1,8 @@ cc_defaults { - name: "llvm-lib-defaults", + name: "llvm18-lib-defaults", vendor_available: true, - defaults: ["llvm-defaults"], - export_header_lib_headers: ["llvm-headers"], + defaults: ["llvm18-defaults"], + export_header_lib_headers: ["llvm18-headers"], target: { windows: { enabled: true, diff --git a/llvm/lib/AsmParser/Android.bp b/llvm/lib/AsmParser/Android.bp index 3fff6b26b9ae..236e4a3a19fc 100644 --- a/llvm/lib/AsmParser/Android.bp +++ b/llvm/lib/AsmParser/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMAsmParser", + name: "libLLVM18AsmParser", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/BinaryFormat/Android.bp b/llvm/lib/BinaryFormat/Android.bp index b99bb0a082a0..0f8f0f1d1315 100644 --- a/llvm/lib/BinaryFormat/Android.bp +++ b/llvm/lib/BinaryFormat/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMBinaryFormat", + name: "libLLVM18BinaryFormat", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Bitcode/Reader/Android.bp b/llvm/lib/Bitcode/Reader/Android.bp index da7c543e214c..40051da66746 100644 --- a/llvm/lib/Bitcode/Reader/Android.bp +++ b/llvm/lib/Bitcode/Reader/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMBitReader", + name: "libLLVM18BitReader", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Bitcode/Writer/Android.bp b/llvm/lib/Bitcode/Writer/Android.bp index 754a252a7d80..533bd7edec54 100644 --- a/llvm/lib/Bitcode/Writer/Android.bp +++ b/llvm/lib/Bitcode/Writer/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMBitWriter", + name: "libLLVM18BitWriter", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Bitstream/Reader/Android.bp b/llvm/lib/Bitstream/Reader/Android.bp index 6300d088289f..3930cb8a49a7 100644 --- a/llvm/lib/Bitstream/Reader/Android.bp +++ b/llvm/lib/Bitstream/Reader/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMBitstreamReader", + name: "libLLVM18BitstreamReader", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/CodeGen/Android.bp b/llvm/lib/CodeGen/Android.bp index 35e83f36ec51..fb538a5f9b6f 100644 --- a/llvm/lib/CodeGen/Android.bp +++ b/llvm/lib/CodeGen/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMCodeGen", + name: "libLLVM18CodeGen", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: [ "*.cpp", diff --git a/llvm/lib/CodeGen/AsmPrinter/Android.bp b/llvm/lib/CodeGen/AsmPrinter/Android.bp index d94c00ccdf54..6cf7f011de1c 100644 --- a/llvm/lib/CodeGen/AsmPrinter/Android.bp +++ b/llvm/lib/CodeGen/AsmPrinter/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMAsmPrinter", + name: "libLLVM18AsmPrinter", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/CodeGen/GlobalISel/Android.bp b/llvm/lib/CodeGen/GlobalISel/Android.bp index 4dd07c6b511c..b9ad9ef4d594 100644 --- a/llvm/lib/CodeGen/GlobalISel/Android.bp +++ b/llvm/lib/CodeGen/GlobalISel/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMGlobalISel", + name: "libLLVM18GlobalISel", defaults: [ - "llvm-lib-defaults", + "llvm18-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 4c68ec63b316..f0057e5f6ff1 100644 --- a/llvm/lib/CodeGen/MIRParser/Android.bp +++ b/llvm/lib/CodeGen/MIRParser/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMMIRParser", + name: "libLLVM18MIRParser", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/CodeGen/SelectionDAG/Android.bp b/llvm/lib/CodeGen/SelectionDAG/Android.bp index 79c705aad151..f9f7cdd6a216 100644 --- a/llvm/lib/CodeGen/SelectionDAG/Android.bp +++ b/llvm/lib/CodeGen/SelectionDAG/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMSelectionDAG", + name: "libLLVM18SelectionDAG", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/DebugInfo/BTF/Android.bp b/llvm/lib/DebugInfo/BTF/Android.bp index 789f81acd037..58e4457c0eb9 100644 --- a/llvm/lib/DebugInfo/BTF/Android.bp +++ b/llvm/lib/DebugInfo/BTF/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMDebugInfoBTF", + name: "libLLVM18DebugInfoBTF", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/DebugInfo/CodeView/Android.bp b/llvm/lib/DebugInfo/CodeView/Android.bp index 6abfae166597..2598c912564f 100644 --- a/llvm/lib/DebugInfo/CodeView/Android.bp +++ b/llvm/lib/DebugInfo/CodeView/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMDebugInfoCodeView", + name: "libLLVM18DebugInfoCodeView", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/DebugInfo/DWARF/Android.bp b/llvm/lib/DebugInfo/DWARF/Android.bp index c198e1f111bb..49aef01a595d 100644 --- a/llvm/lib/DebugInfo/DWARF/Android.bp +++ b/llvm/lib/DebugInfo/DWARF/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMDebugInfoDWARF", + name: "libLLVM18DebugInfoDWARF", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/DebugInfo/MSF/Android.bp b/llvm/lib/DebugInfo/MSF/Android.bp index 9b096bd6d316..d01adb0eff2e 100644 --- a/llvm/lib/DebugInfo/MSF/Android.bp +++ b/llvm/lib/DebugInfo/MSF/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMDebugInfoMSF", + name: "libLLVM18DebugInfoMSF", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/DebugInfo/PDB/Android.bp b/llvm/lib/DebugInfo/PDB/Android.bp index 2ef641f4b41e..50a3cc7bce4d 100644 --- a/llvm/lib/DebugInfo/PDB/Android.bp +++ b/llvm/lib/DebugInfo/PDB/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMDebugInfoPDB", + name: "libLLVM18DebugInfoPDB", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: [ "*.cpp", diff --git a/llvm/lib/DebugInfo/Symbolize/Android.bp b/llvm/lib/DebugInfo/Symbolize/Android.bp index c859f58a8abe..2bbf9ee9b481 100644 --- a/llvm/lib/DebugInfo/Symbolize/Android.bp +++ b/llvm/lib/DebugInfo/Symbolize/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMSymbolize", + name: "libLLVM18Symbolize", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Debuginfod/Android.bp b/llvm/lib/Debuginfod/Android.bp index 731bb3cc25dc..0ee6666fcae1 100644 --- a/llvm/lib/Debuginfod/Android.bp +++ b/llvm/lib/Debuginfod/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMDebuginfod", + name: "libLLVM18Debuginfod", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Demangle/Android.bp b/llvm/lib/Demangle/Android.bp index 476e71874799..628ad189c77e 100644 --- a/llvm/lib/Demangle/Android.bp +++ b/llvm/lib/Demangle/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMDemangle", + name: "libLLVM18Demangle", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/ExecutionEngine/Android.bp b/llvm/lib/ExecutionEngine/Android.bp index 41a44925ba89..3daab68e22e2 100644 --- a/llvm/lib/ExecutionEngine/Android.bp +++ b/llvm/lib/ExecutionEngine/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMExecutionEngine", + name: "libLLVM18ExecutionEngine", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/ExecutionEngine/Interpreter/Android.bp b/llvm/lib/ExecutionEngine/Interpreter/Android.bp index 190a9a86c506..1368964f2307 100644 --- a/llvm/lib/ExecutionEngine/Interpreter/Android.bp +++ b/llvm/lib/ExecutionEngine/Interpreter/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMInterpreter", + name: "libLLVM18Interpreter", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/ExecutionEngine/JITLink/Android.bp b/llvm/lib/ExecutionEngine/JITLink/Android.bp index 044447e7770e..2508a13a9ef3 100644 --- a/llvm/lib/ExecutionEngine/JITLink/Android.bp +++ b/llvm/lib/ExecutionEngine/JITLink/Android.bp @@ -1,14 +1,14 @@ cc_library_static { - name: "libLLVMJITLink", + name: "libLLVM18JITLink", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], - generated_headers: ["llvm-gen-jitlink"], + generated_headers: ["llvm18-gen-jitlink"], srcs: ["*.cpp"], } -llvm_tblgen { - name: "llvm-gen-jitlink", +llvm18_tblgen { + name: "llvm18-gen-jitlink", in: "COFFOptions.td", outs: [ "COFFOptions.inc", diff --git a/llvm/lib/ExecutionEngine/MCJIT/Android.bp b/llvm/lib/ExecutionEngine/MCJIT/Android.bp index 6b43bb17d026..f6593957faf9 100644 --- a/llvm/lib/ExecutionEngine/MCJIT/Android.bp +++ b/llvm/lib/ExecutionEngine/MCJIT/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMMCJIT", + name: "libLLVM18MCJIT", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/ExecutionEngine/Orc/Android.bp b/llvm/lib/ExecutionEngine/Orc/Android.bp index 1bb2faeaf80d..0004fdb90956 100644 --- a/llvm/lib/ExecutionEngine/Orc/Android.bp +++ b/llvm/lib/ExecutionEngine/Orc/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMOrcJIT", + name: "libLLVM18OrcJIT", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp b/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp index 5e5497252dbf..5477452d5db3 100644 --- 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: "libLLVM18OrcShared", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/Android.bp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/Android.bp index 840e3ffda122..0cdb2f63bb9a 100644 --- 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: "libLLVM18OrcTargetProcess", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp b/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp index 408077ff8471..c765b3377818 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMRuntimeDyld", + name: "libLLVM18RuntimeDyld", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: [ "*.cpp", diff --git a/llvm/lib/Frontend/Offloading/Android.bp b/llvm/lib/Frontend/Offloading/Android.bp index 33e0d781d277..26f21fa3049a 100644 --- a/llvm/lib/Frontend/Offloading/Android.bp +++ b/llvm/lib/Frontend/Offloading/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMFrontendOffloading", + name: "libLLVM18FrontendOffloading", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Frontend/OpenACC/Android.bp b/llvm/lib/Frontend/OpenACC/Android.bp index 2596faa1ec29..f51fe57b3376 100644 --- a/llvm/lib/Frontend/OpenACC/Android.bp +++ b/llvm/lib/Frontend/OpenACC/Android.bp @@ -1,12 +1,12 @@ cc_library_static { - name: "libLLVMFrontendOpenACC", + name: "libLLVM18FrontendOpenACC", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } cc_defaults { name: "llvm-acc-defaults", - generated_headers: ["llvm-gen-acc_gen"], + generated_headers: ["llvm18-gen-acc_gen"], } diff --git a/llvm/lib/Frontend/OpenMP/Android.bp b/llvm/lib/Frontend/OpenMP/Android.bp index 4491b4974c1b..45ab0dc79358 100644 --- a/llvm/lib/Frontend/OpenMP/Android.bp +++ b/llvm/lib/Frontend/OpenMP/Android.bp @@ -1,12 +1,12 @@ cc_library_static { - name: "libLLVMFrontendOpenMP", + name: "libLLVM18FrontendOpenMP", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } cc_defaults { name: "llvm-omp-defaults", - generated_headers: ["llvm-gen-omp_gen"], + generated_headers: ["llvm18-gen-omp_gen"], } diff --git a/llvm/lib/IR/Android.bp b/llvm/lib/IR/Android.bp index 385691844e3f..2d406e7b5f50 100644 --- a/llvm/lib/IR/Android.bp +++ b/llvm/lib/IR/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMCore", + name: "libLLVM18Core", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/IRPrinter/Android.bp b/llvm/lib/IRPrinter/Android.bp index 7d8c94c9f3a9..4690f5b29c43 100644 --- a/llvm/lib/IRPrinter/Android.bp +++ b/llvm/lib/IRPrinter/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMIRPrinter", + name: "libLLVM18IRPrinter", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/IRReader/Android.bp b/llvm/lib/IRReader/Android.bp index a01a80fb828e..b06142309139 100644 --- a/llvm/lib/IRReader/Android.bp +++ b/llvm/lib/IRReader/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMIRReader", + name: "libLLVM18IRReader", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/InterfaceStub/Android.bp b/llvm/lib/InterfaceStub/Android.bp index 7d72c4823558..f7f8a8ed6b4c 100644 --- a/llvm/lib/InterfaceStub/Android.bp +++ b/llvm/lib/InterfaceStub/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMInterfaceStub", + name: "libLLVM18InterfaceStub", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: [ "*.cpp", diff --git a/llvm/lib/LTO/Android.bp b/llvm/lib/LTO/Android.bp index 928bd5c909bc..16b591722d03 100644 --- a/llvm/lib/LTO/Android.bp +++ b/llvm/lib/LTO/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMLTO", + name: "libLLVM18LTO", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Linker/Android.bp b/llvm/lib/Linker/Android.bp index a5e1a95359c4..893d06e6d628 100644 --- a/llvm/lib/Linker/Android.bp +++ b/llvm/lib/Linker/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMLinker", + name: "libLLVM18Linker", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/MC/Android.bp b/llvm/lib/MC/Android.bp index 05e8445f7f96..e532efd9aeb7 100644 --- a/llvm/lib/MC/Android.bp +++ b/llvm/lib/MC/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMMC", + name: "libLLVM18MC", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/MC/MCDisassembler/Android.bp b/llvm/lib/MC/MCDisassembler/Android.bp index c2f25fa3d220..1a6a3cccdf4e 100644 --- a/llvm/lib/MC/MCDisassembler/Android.bp +++ b/llvm/lib/MC/MCDisassembler/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMMCDisassembler", + name: "libLLVM18MCDisassembler", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/MC/MCParser/Android.bp b/llvm/lib/MC/MCParser/Android.bp index cc7cd1f01358..18b73bd52ead 100644 --- a/llvm/lib/MC/MCParser/Android.bp +++ b/llvm/lib/MC/MCParser/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMMCParser", + name: "libLLVM18MCParser", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Object/Android.bp b/llvm/lib/Object/Android.bp index c389476fd628..3731b2835dde 100644 --- a/llvm/lib/Object/Android.bp +++ b/llvm/lib/Object/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMObject", + name: "libLLVM18Object", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/ObjectYAML/Android.bp b/llvm/lib/ObjectYAML/Android.bp index 17f4a6796b8e..8890df42474b 100644 --- a/llvm/lib/ObjectYAML/Android.bp +++ b/llvm/lib/ObjectYAML/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMObjectYAML", + name: "libLLVM18ObjectYAML", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Option/Android.bp b/llvm/lib/Option/Android.bp index 035db4d7d483..7a4af774dad3 100644 --- a/llvm/lib/Option/Android.bp +++ b/llvm/lib/Option/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMOption", + name: "libLLVM18Option", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Passes/Android.bp b/llvm/lib/Passes/Android.bp index f98e1b66c8cd..cf735ba09ea5 100644 --- a/llvm/lib/Passes/Android.bp +++ b/llvm/lib/Passes/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMPasses", + name: "libLLVM18Passes", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/ProfileData/Android.bp b/llvm/lib/ProfileData/Android.bp index 710d5d406f15..451062589a12 100644 --- a/llvm/lib/ProfileData/Android.bp +++ b/llvm/lib/ProfileData/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMProfileData", + name: "libLLVM18ProfileData", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/ProfileData/Coverage/Android.bp b/llvm/lib/ProfileData/Coverage/Android.bp index 347c500133b9..86d37769110a 100644 --- a/llvm/lib/ProfileData/Coverage/Android.bp +++ b/llvm/lib/ProfileData/Coverage/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMProfileDataCoverage", + name: "libLLVM18ProfileDataCoverage", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Remarks/Android.bp b/llvm/lib/Remarks/Android.bp index 6ea22e87f48f..21e2ac5344c3 100644 --- a/llvm/lib/Remarks/Android.bp +++ b/llvm/lib/Remarks/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMRemarks", + name: "libLLVM18Remarks", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Support/Android.bp b/llvm/lib/Support/Android.bp index 0eae2e924471..a64f25934053 100644 --- a/llvm/lib/Support/Android.bp +++ b/llvm/lib/Support/Android.bp @@ -1,10 +1,10 @@ cc_library_static { - name: "libLLVMSupport", + name: "libLLVM18Support", vendor_available: true, - defaults: ["llvm-defaults-no-generated-headers"], + defaults: ["llvm18-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 + // llvm18-defaults turns off host builds by default, turn it back on for + // modules that are used to build llvm18-tblgen host: { enabled: true, }, @@ -43,10 +43,10 @@ cc_library_static { cc_library_static { name: "blake3_avx2", vendor_available: true, - defaults: ["llvm-defaults-no-generated-headers"], + defaults: ["llvm18-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 + // llvm18-defaults turns off host builds by default, turn it back on for + // modules that are used to build llvm18-tblgen host: { enabled: true, }, @@ -69,10 +69,10 @@ cc_library_static { cc_library_static { name: "blake3_avx512", vendor_available: true, - defaults: ["llvm-defaults-no-generated-headers"], + defaults: ["llvm18-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 + // llvm18-defaults turns off host builds by default, turn it back on for + // modules that are used to build llvm18-tblgen host: { enabled: true, }, @@ -96,10 +96,10 @@ cc_library_static { cc_library_static { name: "blake3_sse2", vendor_available: true, - defaults: ["llvm-defaults-no-generated-headers"], + defaults: ["llvm18-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 + // llvm18-defaults turns off host builds by default, turn it back on for + // modules that are used to build llvm18-tblgen host: { enabled: true, }, @@ -122,10 +122,10 @@ cc_library_static { cc_library_static { name: "blake3_sse41", vendor_available: true, - defaults: ["llvm-defaults-no-generated-headers"], + defaults: ["llvm18-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 + // llvm18-defaults turns off host builds by default, turn it back on for + // modules that are used to build llvm18-tblgen host: { enabled: true, }, diff --git a/llvm/lib/TableGen/Android.bp b/llvm/lib/TableGen/Android.bp index c3310178d698..3e504f23d9e6 100644 --- 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: "libLLVM18TableGen", + defaults: ["llvm18-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 + // llvm18-defaults turns off host builds by default, turn it back on for + // modules that are used to build llvm18-tblgen host: { enabled: true, }, diff --git a/llvm/lib/Target/AArch64/Android.bp b/llvm/lib/Target/AArch64/Android.bp index 37011a5dbe3d..7d7f97999f0a 100644 --- a/llvm/lib/Target/AArch64/Android.bp +++ b/llvm/lib/Target/AArch64/Android.bp @@ -1,8 +1,8 @@ cc_library_static { - name: "libLLVMAArch64CodeGen", + name: "libLLVM18AArch64CodeGen", defaults: [ - "llvm-lib-defaults", - "llvm-aarch64-defaults", + "llvm18-lib-defaults", + "llvm18-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: "llvm18-aarch64-defaults", + generated_headers: ["llvm18-gen-aarch64"], + static_libs: ["llvm18-aarch64-headers"], } cc_library_static { - name: "llvm-aarch64-headers", + name: "llvm18-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", +llvm18_tblgen { + name: "llvm18-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 9b409aec2c48..cb1ed9f51810 100644 --- 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: "libLLVM18AArch64AsmParser", defaults: [ - "llvm-lib-defaults", - "llvm-aarch64-defaults", + "llvm18-lib-defaults", + "llvm18-aarch64-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/AArch64/Disassembler/Android.bp b/llvm/lib/Target/AArch64/Disassembler/Android.bp index e7a04d35e32f..fa83583bc871 100644 --- 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: "libLLVM18AArch64Disassembler", defaults: [ - "llvm-lib-defaults", - "llvm-aarch64-defaults", + "llvm18-lib-defaults", + "llvm18-aarch64-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/AArch64/InstPrinter/Android.bp b/llvm/lib/Target/AArch64/InstPrinter/Android.bp index f1dac2a89f98..c954401a5f64 100644 --- 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: "libLLVM18AArch64AsmPrinter", defaults: [ - "llvm-lib-defaults", - "llvm-aarch64-defaults", + "llvm18-lib-defaults", + "llvm18-aarch64-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/Android.bp b/llvm/lib/Target/AArch64/MCTargetDesc/Android.bp index 9edc154a635c..22c8d3a8a55b 100644 --- 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: "libLLVM18AArch64Desc", defaults: [ - "llvm-lib-defaults", - "llvm-aarch64-defaults", + "llvm18-lib-defaults", + "llvm18-aarch64-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/AArch64/TargetInfo/Android.bp b/llvm/lib/Target/AArch64/TargetInfo/Android.bp index baa98cad20fb..096cd0ef36cb 100644 --- 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: "libLLVM18AArch64Info", defaults: [ - "llvm-lib-defaults", - "llvm-aarch64-defaults", + "llvm18-lib-defaults", + "llvm18-aarch64-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/AArch64/Utils/Android.bp b/llvm/lib/Target/AArch64/Utils/Android.bp index aa2db82bb61d..dc0e7d6d0684 100644 --- 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: "libLLVM18AArch64Utils", defaults: [ - "llvm-lib-defaults", - "llvm-aarch64-defaults", + "llvm18-lib-defaults", + "llvm18-aarch64-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/AMDGPU/Android.bp b/llvm/lib/Target/AMDGPU/Android.bp index 1c605f5939e9..8c359bbc9bfc 100644 --- a/llvm/lib/Target/AMDGPU/Android.bp +++ b/llvm/lib/Target/AMDGPU/Android.bp @@ -1,25 +1,25 @@ cc_library_static { - name: "libLLVMAMDGPUCodeGen", + name: "libLLVM18AMDGPUCodeGen", defaults: [ - "llvm-lib-defaults", - "llvm-amdgpu-defaults", + "llvm18-lib-defaults", + "llvm18-amdgpu-defaults", ], srcs: ["*.cpp"], } cc_defaults { - name: "llvm-amdgpu-defaults", + name: "llvm18-amdgpu-defaults", generated_headers: [ - "llvm-gen-amdgpu", - "llvm-gen-amdgpuisel", - "llvm-gen-instcombine", - "llvm-gen-r600", + "llvm18-gen-amdgpu", + "llvm18-gen-amdgpuisel", + "llvm18-gen-instcombine", + "llvm18-gen-r600", ], - static_libs: ["llvm-amdgpu-headers"], + static_libs: ["llvm18-amdgpu-headers"], } cc_library_static { - name: "llvm-amdgpu-headers", + name: "llvm18-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", +llvm18_tblgen { + name: "llvm18-gen-amdgpu", in: "AMDGPU.td", outs: [ "AMDGPUGenRegisterInfo.inc", @@ -51,8 +51,8 @@ llvm_tblgen { ], } -llvm_tblgen { - name: "llvm-gen-amdgpuisel", +llvm18_tblgen { + name: "llvm18-gen-amdgpuisel", in: "AMDGPUGISel.td", outs: [ "AMDGPUGenGlobalISel.inc", @@ -62,14 +62,14 @@ llvm_tblgen { ], } -llvm_tblgen { - name: "llvm-gen-instcombine", +llvm18_tblgen { + name: "llvm18-gen-instcombine", in: "InstCombineTables.td", outs: ["InstCombineTables.inc"], } -llvm_tblgen { - name: "llvm-gen-r600", +llvm18_tblgen { + name: "llvm18-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 9e6fd0883e1d..29017da55646 100644 --- 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: "libLLVM18AMDGPUAsmParser", defaults: [ - "llvm-lib-defaults", - "llvm-amdgpu-defaults", + "llvm18-lib-defaults", + "llvm18-amdgpu-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/AMDGPU/Disassembler/Android.bp b/llvm/lib/Target/AMDGPU/Disassembler/Android.bp index b184ef016286..301c7cb27b30 100644 --- 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: "libLLVM18AMDGPUDisassembler", defaults: [ - "llvm-lib-defaults", - "llvm-amdgpu-defaults", + "llvm18-lib-defaults", + "llvm18-amdgpu-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/AMDGPU/InstPrinter/Android.bp b/llvm/lib/Target/AMDGPU/InstPrinter/Android.bp index 0ee4ec3dcd99..6413374c50ed 100644 --- 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: "libLLVM18AMDGPUAsmPrinter", defaults: [ - "llvm-lib-defaults", - "llvm-amdgpu-defaults", + "llvm18-lib-defaults", + "llvm18-amdgpu-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/Android.bp b/llvm/lib/Target/AMDGPU/MCTargetDesc/Android.bp index 93a6ea5c3cae..c32116a2f344 100644 --- 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: "libLLVM18AMDGPUDesc", defaults: [ - "llvm-lib-defaults", - "llvm-amdgpu-defaults", + "llvm18-lib-defaults", + "llvm18-amdgpu-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/AMDGPU/TargetInfo/Android.bp b/llvm/lib/Target/AMDGPU/TargetInfo/Android.bp index db94c04bc92d..09f10266157f 100644 --- 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: "libLLVM18AMDGPUInfo", defaults: [ - "llvm-lib-defaults", - "llvm-amdgpu-defaults", + "llvm18-lib-defaults", + "llvm18-amdgpu-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/AMDGPU/Utils/Android.bp b/llvm/lib/Target/AMDGPU/Utils/Android.bp index f6fb594d1574..9e6ce36cd64a 100644 --- 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: "libLLVM18AMDGPUUtils", defaults: [ - "llvm-lib-defaults", - "llvm-amdgpu-defaults", + "llvm18-lib-defaults", + "llvm18-amdgpu-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/ARM/Android.bp b/llvm/lib/Target/ARM/Android.bp index 544f00880c3d..05d1099e9104 100644 --- a/llvm/lib/Target/ARM/Android.bp +++ b/llvm/lib/Target/ARM/Android.bp @@ -1,8 +1,8 @@ cc_library_static { - name: "libLLVMARMCodeGen", + name: "libLLVM18ARMCodeGen", defaults: [ - "llvm-lib-defaults", - "llvm-arm-defaults", + "llvm18-lib-defaults", + "llvm18-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: "llvm18-arm-defaults", + generated_headers: ["llvm18-gen-arm"], + static_libs: ["llvm18-arm-headers"], } cc_library_static { - name: "llvm-arm-headers", + name: "llvm18-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", +llvm18_tblgen { + name: "llvm18-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 3340db5a00f0..ec64269713cd 100644 --- 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: "libLLVM18ARMAsmParser", defaults: [ - "llvm-lib-defaults", - "llvm-arm-defaults", + "llvm18-lib-defaults", + "llvm18-arm-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/ARM/Disassembler/Android.bp b/llvm/lib/Target/ARM/Disassembler/Android.bp index 8deda869ecb7..995a515d5d6b 100644 --- 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: "libLLVM18ARMDisassembler", defaults: [ - "llvm-lib-defaults", - "llvm-arm-defaults", + "llvm18-lib-defaults", + "llvm18-arm-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/ARM/InstPrinter/Android.bp b/llvm/lib/Target/ARM/InstPrinter/Android.bp index f54529f96cf2..614a38e982be 100644 --- 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: "libLLVM18ARMAsmPrinter", defaults: [ - "llvm-lib-defaults", - "llvm-arm-defaults", + "llvm18-lib-defaults", + "llvm18-arm-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/ARM/MCTargetDesc/Android.bp b/llvm/lib/Target/ARM/MCTargetDesc/Android.bp index de05686195be..cd339fa0fd18 100644 --- 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: "libLLVM18ARMDesc", defaults: [ - "llvm-lib-defaults", - "llvm-arm-defaults", + "llvm18-lib-defaults", + "llvm18-arm-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/ARM/TargetInfo/Android.bp b/llvm/lib/Target/ARM/TargetInfo/Android.bp index cfead24187b9..3914f2150298 100644 --- 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: "libLLVM18ARMInfo", defaults: [ - "llvm-lib-defaults", - "llvm-arm-defaults", + "llvm18-lib-defaults", + "llvm18-arm-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/ARM/Utils/Android.bp b/llvm/lib/Target/ARM/Utils/Android.bp index bd2ae34207c2..18ae33e020d4 100644 --- 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: "libLLVM18ARMUtils", defaults: [ - "llvm-lib-defaults", - "llvm-arm-defaults", + "llvm18-lib-defaults", + "llvm18-arm-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/Android.bp b/llvm/lib/Target/Android.bp index 5101e66259aa..5f223b459b2f 100644 --- a/llvm/lib/Target/Android.bp +++ b/llvm/lib/Target/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMTarget", + name: "libLLVM18Target", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/Mips/Android.bp b/llvm/lib/Target/Mips/Android.bp index 8e1a99d55e6f..75104071d02b 100644 --- a/llvm/lib/Target/Mips/Android.bp +++ b/llvm/lib/Target/Mips/Android.bp @@ -1,20 +1,20 @@ cc_library_static { - name: "libLLVMMipsCodeGen", + name: "libLLVM18MipsCodeGen", defaults: [ - "llvm-lib-defaults", - "llvm-mips-defaults", + "llvm18-lib-defaults", + "llvm18-mips-defaults", ], srcs: ["*.cpp"], } cc_defaults { - name: "llvm-mips-defaults", - generated_headers: ["llvm-gen-mips"], - static_libs: ["llvm-mips-headers"], + name: "llvm18-mips-defaults", + generated_headers: ["llvm18-gen-mips"], + static_libs: ["llvm18-mips-headers"], } cc_library_static { - name: "llvm-mips-headers", + name: "llvm18-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", +llvm18_tblgen { + name: "llvm18-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 b61dd02d9e0b..4672df95db39 100644 --- 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: "libLLVM18MipsAsmParser", defaults: [ - "llvm-lib-defaults", - "llvm-mips-defaults", + "llvm18-lib-defaults", + "llvm18-mips-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/Mips/Disassembler/Android.bp b/llvm/lib/Target/Mips/Disassembler/Android.bp index 66118be649c8..39e90a413d05 100644 --- 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: "libLLVM18MipsDisassembler", defaults: [ - "llvm-lib-defaults", - "llvm-mips-defaults", + "llvm18-lib-defaults", + "llvm18-mips-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/Mips/InstPrinter/Android.bp b/llvm/lib/Target/Mips/InstPrinter/Android.bp index 28483b68b1c3..f37c117b9622 100644 --- 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: "libLLVM18MipsAsmPrinter", defaults: [ - "llvm-lib-defaults", - "llvm-mips-defaults", + "llvm18-lib-defaults", + "llvm18-mips-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/Mips/MCTargetDesc/Android.bp b/llvm/lib/Target/Mips/MCTargetDesc/Android.bp index cc06b28570b3..010f0878ba9a 100644 --- 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: "libLLVM18MipsDesc", defaults: [ - "llvm-lib-defaults", - "llvm-mips-defaults", + "llvm18-lib-defaults", + "llvm18-mips-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/Mips/TargetInfo/Android.bp b/llvm/lib/Target/Mips/TargetInfo/Android.bp index 938c076197b8..ffdc2a0e0fa1 100644 --- 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: "libLLVM18MipsInfo", defaults: [ - "llvm-lib-defaults", - "llvm-mips-defaults", + "llvm18-lib-defaults", + "llvm18-mips-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/X86/Android.bp b/llvm/lib/Target/X86/Android.bp index 695ed48835ae..82eb24cc06ea 100644 --- a/llvm/lib/Target/X86/Android.bp +++ b/llvm/lib/Target/X86/Android.bp @@ -1,8 +1,8 @@ cc_library_static { - name: "libLLVMX86CodeGen", + name: "libLLVM18X86CodeGen", defaults: [ - "llvm-lib-defaults", - "llvm-x86-defaults", + "llvm18-lib-defaults", + "llvm18-x86-defaults", ], srcs: [ "*.cpp", @@ -18,13 +18,13 @@ cc_library_static { } cc_defaults { - name: "llvm-x86-defaults", - generated_headers: ["llvm-gen-x86"], - static_libs: ["llvm-x86-headers"], + name: "llvm18-x86-defaults", + generated_headers: ["llvm18-gen-x86"], + static_libs: ["llvm18-x86-headers"], } cc_library_static { - name: "llvm-x86-headers", + name: "llvm18-x86-headers", vendor_available: true, host_supported: true, target: { @@ -35,8 +35,8 @@ cc_library_static { export_include_dirs: ["."], } -llvm_tblgen { - name: "llvm-gen-x86", +llvm18_tblgen { + name: "llvm18-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 830e02bfd764..b11dbbd3b46d 100644 --- 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: "libLLVM18X86AsmParser", defaults: [ - "llvm-lib-defaults", - "llvm-x86-defaults", + "llvm18-lib-defaults", + "llvm18-x86-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/X86/Disassembler/Android.bp b/llvm/lib/Target/X86/Disassembler/Android.bp index 0ee2e5ecd3a5..96c1be0e3830 100644 --- 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: "libLLVM18X86Disassembler", defaults: [ - "llvm-lib-defaults", - "llvm-x86-defaults", + "llvm18-lib-defaults", + "llvm18-x86-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/X86/InstPrinter/Android.bp b/llvm/lib/Target/X86/InstPrinter/Android.bp index bd37b9e5f787..c9e68bbcdc08 100644 --- 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: "libLLVM18X86AsmPrinter", defaults: [ - "llvm-lib-defaults", - "llvm-x86-defaults", + "llvm18-lib-defaults", + "llvm18-x86-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/X86/MCTargetDesc/Android.bp b/llvm/lib/Target/X86/MCTargetDesc/Android.bp index 7eb5a6e5b8ae..730ffc1f5d1b 100644 --- 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: "libLLVM18X86Desc", defaults: [ - "llvm-lib-defaults", - "llvm-x86-defaults", + "llvm18-lib-defaults", + "llvm18-x86-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/X86/TargetInfo/Android.bp b/llvm/lib/Target/X86/TargetInfo/Android.bp index a1a2f5c331f1..32e6a850b109 100644 --- 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: "libLLVM18X86Info", defaults: [ - "llvm-lib-defaults", - "llvm-x86-defaults", + "llvm18-lib-defaults", + "llvm18-x86-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Target/X86/Utils/Android.bp b/llvm/lib/Target/X86/Utils/Android.bp index 30d8ec19c57b..9097e3efff13 100644 --- 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: "libLLVM18X86Utils", defaults: [ - "llvm-lib-defaults", - "llvm-x86-defaults", + "llvm18-lib-defaults", + "llvm18-x86-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/TargetParser/Android.bp b/llvm/lib/TargetParser/Android.bp index 05fefb5e1f5c..fd153e7f7b51 100644 --- a/llvm/lib/TargetParser/Android.bp +++ b/llvm/lib/TargetParser/Android.bp @@ -1,10 +1,10 @@ cc_library_static { - name: "libLLVMTargetParser", + name: "libLLVM18TargetParser", vendor_available: true, - defaults: ["llvm-defaults-no-generated-headers"], + defaults: ["llvm18-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 + // llvm18-defaults turns off host builds by default, turn it back on for + // modules that are used to build llvm18-tblgen host: { enabled: true, }, @@ -12,7 +12,7 @@ cc_library_static { enabled: true, }, }, - generated_headers: ["llvm-gen-riscv-target-def"], + generated_headers: ["llvm18-gen-riscv-target-def"], srcs: [ "*.cpp", ], diff --git a/llvm/lib/TextAPI/Android.bp b/llvm/lib/TextAPI/Android.bp index 5214440e6d03..dce631c11d99 100644 --- a/llvm/lib/TextAPI/Android.bp +++ b/llvm/lib/TextAPI/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMTextAPI", + name: "libLLVM18TextAPI", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: [ "*.cpp", diff --git a/llvm/lib/ToolDrivers/llvm-lib/Android.bp b/llvm/lib/ToolDrivers/llvm-lib/Android.bp index d33020bd7d02..643c0e587430 100644 --- 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: "libLLVM18LibDriver", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], - generated_headers: ["llvm-gen-libdriver"], + generated_headers: ["llvm18-gen-libdriver"], srcs: ["*.cpp"], } -llvm_tblgen { - name: "llvm-gen-libdriver", +llvm18_tblgen { + name: "llvm18-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 b2c12fc2ff4d..f6f294fa8b34 100644 --- a/llvm/lib/Transforms/AggressiveInstCombine/Android.bp +++ b/llvm/lib/Transforms/AggressiveInstCombine/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMAggressiveInstCombine", + name: "libLLVM18AggressiveInstCombine", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Transforms/CFGuard/Android.bp b/llvm/lib/Transforms/CFGuard/Android.bp index 6686e5fe9f35..8d4104c6de84 100644 --- a/llvm/lib/Transforms/CFGuard/Android.bp +++ b/llvm/lib/Transforms/CFGuard/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMCFGuard", + name: "libLLVM18CFGuard", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Transforms/Coroutines/Android.bp b/llvm/lib/Transforms/Coroutines/Android.bp index 8d1becadc6da..ac65bb464a11 100644 --- a/llvm/lib/Transforms/Coroutines/Android.bp +++ b/llvm/lib/Transforms/Coroutines/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMCoroutines", + name: "libLLVM18Coroutines", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Transforms/Hello/Android.bp b/llvm/lib/Transforms/Hello/Android.bp index 64e2e6d35e11..200b06dc8765 100644 --- 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: "LLVM18Hello", defaults: [ - "llvm-lib-defaults", + "llvm18-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 54ddf0f4f7bd..5cab030fe718 100644 --- a/llvm/lib/Transforms/HelloNew/Android.bp +++ b/llvm/lib/Transforms/HelloNew/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMHelloNew", + name: "libLLVM18HelloNew", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Transforms/HipStdPar/Android.bp b/llvm/lib/Transforms/HipStdPar/Android.bp index b2e9fa1811df..2eea8af6c79b 100644 --- a/llvm/lib/Transforms/HipStdPar/Android.bp +++ b/llvm/lib/Transforms/HipStdPar/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMHipStdPar", + name: "libLLVM18HipStdPar", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Transforms/IPO/Android.bp b/llvm/lib/Transforms/IPO/Android.bp index 644cee12ce2e..e0af53fe579e 100644 --- a/llvm/lib/Transforms/IPO/Android.bp +++ b/llvm/lib/Transforms/IPO/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMipo", + name: "libLLVM18ipo", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Transforms/InstCombine/Android.bp b/llvm/lib/Transforms/InstCombine/Android.bp index dfcc7ca139c1..d1a56d5d94b2 100644 --- a/llvm/lib/Transforms/InstCombine/Android.bp +++ b/llvm/lib/Transforms/InstCombine/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMInstCombine", + name: "libLLVM18InstCombine", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Transforms/Instrumentation/Android.bp b/llvm/lib/Transforms/Instrumentation/Android.bp index b719f1758bfe..02a17be5f366 100644 --- a/llvm/lib/Transforms/Instrumentation/Android.bp +++ b/llvm/lib/Transforms/Instrumentation/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMInstrumentation", + name: "libLLVM18Instrumentation", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Transforms/ObjCARC/Android.bp b/llvm/lib/Transforms/ObjCARC/Android.bp index 64bc52982afc..10ed585e7fcf 100644 --- a/llvm/lib/Transforms/ObjCARC/Android.bp +++ b/llvm/lib/Transforms/ObjCARC/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMTransformObjCARC", + name: "libLLVM18TransformObjCARC", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Transforms/Scalar/Android.bp b/llvm/lib/Transforms/Scalar/Android.bp index 42e1eb880b88..6c0ec9cf1c79 100644 --- a/llvm/lib/Transforms/Scalar/Android.bp +++ b/llvm/lib/Transforms/Scalar/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMScalarOpts", + name: "libLLVM18ScalarOpts", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Transforms/Utils/Android.bp b/llvm/lib/Transforms/Utils/Android.bp index 8fcf7ef74bb1..29452db63fe1 100644 --- a/llvm/lib/Transforms/Utils/Android.bp +++ b/llvm/lib/Transforms/Utils/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMTransformUtils", + name: "libLLVM18TransformUtils", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/Transforms/Vectorize/Android.bp b/llvm/lib/Transforms/Vectorize/Android.bp index 78b16851a385..2470370cf891 100644 --- a/llvm/lib/Transforms/Vectorize/Android.bp +++ b/llvm/lib/Transforms/Vectorize/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMVectorize", + name: "libLLVM18Vectorize", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/lib/WindowsDriver/Android.bp b/llvm/lib/WindowsDriver/Android.bp index dedd878a4bf3..b891db6f377a 100644 --- a/llvm/lib/WindowsDriver/Android.bp +++ b/llvm/lib/WindowsDriver/Android.bp @@ -1,7 +1,7 @@ cc_library_static { - name: "libLLVMWindowsDriver", + name: "libLLVM18WindowsDriver", defaults: [ - "llvm-lib-defaults", + "llvm18-lib-defaults", ], srcs: ["*.cpp"], } diff --git a/llvm/soong/Android.bp b/llvm/soong/Android.bp index 5895945fe919..b2aff7a3508e 100644 --- a/llvm/soong/Android.bp +++ b/llvm/soong/Android.bp @@ -1,5 +1,5 @@ bootstrap_go_package { - name: "soong-llvm", + name: "soong-llvm18", pkgPath: "android/soong/external/llvm-project/llvm", deps: [ "blueprint", diff --git a/llvm/soong/llvm.go b/llvm/soong/llvm.go index 7ff99bdb6798..04f276e09c0d 100644 --- 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 llvm18 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("llvm18_defaults", llvmDefaultsFactory) + android.RegisterModuleType("force_build_llvm18_components_defaults", forceBuildLlvmComponentsDefaultsFactory) } func llvmDefaultsFactory() android.Module { diff --git a/llvm/soong/tblgen.go b/llvm/soong/tblgen.go index 2944044d080c..c0db9fbb69f1 100644 --- 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 llvm18 import ( "path/filepath" @@ -25,20 +25,20 @@ import ( ) func init() { - android.RegisterModuleType("llvm_tblgen", llvmTblgenFactory) + android.RegisterModuleType("llvm18_tblgen", llvm18TblgenFactory) } var ( - pctx = android.NewPackageContext("android/soong/llvm") + pctx = android.NewPackageContext("android/soong/llvm18") - llvmTblgen = pctx.HostBinToolVariable("llvmTblgen", "llvm-tblgen") + llvm18Tblgen = pctx.HostBinToolVariable("llvm18Tblgen", "llvm18-tblgen") - tblgenRule = pctx.StaticRule("tblgenRule", blueprint.RuleParams{ + tblgenRule18 = pctx.StaticRule("tblgenRule18", 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: "${llvm18Tblgen} ${includes} ${generator} -d ${depfile} -o ${out} ${in}", + CommandDeps: []string{"${llvm18Tblgen}"}, + Description: "LLVM18 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: tblgenRule18, Input: in, Output: out, Args: map[string]string{ @@ -232,7 +232,7 @@ func (t *tblgen) GeneratedDeps() android.Paths { return t.generatedHeaders } -func llvmTblgenFactory() android.Module { +func llvm18TblgenFactory() android.Module { t := &tblgen{} t.AddProperties(&t.properties) android.InitAndroidModule(t) diff --git a/llvm/utils/TableGen/Android.bp b/llvm/utils/TableGen/Android.bp index 69d0487a592a..d069df13c9de 100644 --- 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: "llvm18-tblgen", + defaults: ["llvm18-defaults-no-generated-headers"], srcs: ["*.cpp"], static_libs: [ - "libLLVMTableGenGlobalISel", - "libLLVMTableGen", - "libLLVMSupport", + "libLLVM18TableGenGlobalISel", + "libLLVM18TableGen", + "libLLVM18Support", ], 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 + // llvm18-defaults turns off host builds by default, turn it back on for + // modules that are used to build llvm18-tblgen host: { enabled: true, }, diff --git a/llvm/utils/TableGen/GlobalISel/Android.bp b/llvm/utils/TableGen/GlobalISel/Android.bp index 6faf3eda5c78..635c1c2c1f61 100644 --- 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: "libLLVM18TableGenGlobalISel", + defaults: ["llvm18-defaults-no-generated-headers"], srcs: ["*.cpp"], static_libs: [ - "libLLVMSupport", + "libLLVM18Support", ], 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 + // llvm18-defaults turns off host builds by default, turn it back on for + // modules that are used to build llvm18-tblgen host: { enabled: true, }, diff --git a/llvm/utils/TableGen/tdtags b/llvm/utils/TableGen/tdtags index a3fb0805e181..9de0316656b0 100644 --- 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=llvm18-tblgen LLVM_SRC_ROOT= # Command options. From 8f36bee47968171472f31509bff6b42fbbeedbe3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 21:40:49 +0000 Subject: [PATCH 2/2] build(deps): bump the github-actions group with 10 updates Bumps the github-actions group with 10 updates: | Package | From | To | | --- | --- | --- | | [actions/checkout](https://github.com/actions/checkout) | `3.1.0` | `4.1.7` | | [tj-actions/changed-files](https://github.com/tj-actions/changed-files) | `39` | `44` | | [actions/setup-python](https://github.com/actions/setup-python) | `4` | `5` | | [actions/upload-artifact](https://github.com/actions/upload-artifact) | `3` | `4` | | [actions/download-artifact](https://github.com/actions/download-artifact) | `3` | `4` | | [actions/setup-node](https://github.com/actions/setup-node) | `3` | `4` | | [actions/github-script](https://github.com/actions/github-script) | `6` | `7` | | [actions/labeler](https://github.com/actions/labeler) | `4` | `5` | | [ossf/scorecard-action](https://github.com/ossf/scorecard-action) | `2.1.2` | `2.4.0` | | [github/codeql-action](https://github.com/github/codeql-action) | `2.2.4` | `3.26.2` | Updates `actions/checkout` from 3.1.0 to 4.1.7 - [Release notes](https://github.com/actions/checkout/releases) - [Commits](https://github.com/actions/checkout/compare/v3.1.0...v4.1.7) Updates `tj-actions/changed-files` from 39 to 44 - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v39...v44) Updates `actions/setup-python` from 4 to 5 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) Updates `actions/upload-artifact` from 3 to 4 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) Updates `actions/download-artifact` from 3 to 4 - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) Updates `actions/setup-node` from 3 to 4 - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v3...v4) Updates `actions/github-script` from 6 to 7 - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6...v7) Updates `actions/labeler` from 4 to 5 - [Release notes](https://github.com/actions/labeler/releases) - [Commits](https://github.com/actions/labeler/compare/v4...v5) Updates `ossf/scorecard-action` from 2.1.2 to 2.4.0 - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/e38b1902ae4f44df626f11ba0734b14fb91f8f86...62b2cac7ed8198b15735ed49ab1e5cf35480ba46) Updates `github/codeql-action` from 2.2.4 to 3.26.2 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/17573ee1cc1b9d061760f3a006fc4aac4f944fd5...429e1977040da7a23b6822b13c129cd1ba93dbb2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/labeler dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/build-ci-container.yml | 2 +- .github/workflows/docs.yml | 8 ++++---- .github/workflows/issue-release-workflow.yml | 4 ++-- .github/workflows/issue-subscriber.yml | 2 +- .github/workflows/libclang-abi-tests.yml | 10 +++++----- .github/workflows/libcxx-build-and-test.yaml | 12 ++++++------ .github/workflows/libcxx-check-generated-files.yml | 2 +- .github/workflows/llvm-bugs.yml | 4 ++-- .github/workflows/llvm-project-tests.yml | 4 ++-- .github/workflows/llvm-tests.yml | 14 +++++++------- .github/workflows/new-prs.yml | 4 ++-- .github/workflows/pr-code-format.yml | 8 ++++---- .github/workflows/pr-subscriber.yml | 2 +- .github/workflows/release-binaries.yml | 6 +++--- .github/workflows/release-documentation.yml | 8 ++++---- .github/workflows/release-doxygen.yml | 4 ++-- .github/workflows/release-lit.yml | 2 +- .github/workflows/release-tasks.yml | 2 +- .github/workflows/scorecard.yml | 8 ++++---- .github/workflows/version-check.yml | 2 +- 20 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build-ci-container.yml b/.github/workflows/build-ci-container.yml index ad3d50d4d578..7ffa7f4a5814 100644 --- a/.github/workflows/build-ci-container.yml +++ b/.github/workflows/build-ci-container.yml @@ -34,7 +34,7 @@ jobs: echo "container-name-tag=$container_name:$tag" >> $GITHUB_OUTPUT - name: Checkout LLVM - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: sparse-checkout: .github/workflows/containers/github-action-ci/ diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 5936cdc46a90..faf95f5593e9 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -58,12 +58,12 @@ jobs: # a local checkout beforehand. - name: Fetch LLVM sources (Push) if: ${{ github.event_name == 'push' }} - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: fetch-depth: 1 - name: Get subprojects that have doc changes id: docs-changed-subprojects - uses: tj-actions/changed-files@v39 + uses: tj-actions/changed-files@v44 with: files_yaml: | llvm: @@ -94,11 +94,11 @@ jobs: - 'flang/include/flang/Optimizer/Dialect/FIROps.td' - name: Fetch LLVM sources (PR) if: ${{ github.event_name == 'pull_request' }} - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: fetch-depth: 1 - name: Setup Python env - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' cache: 'pip' diff --git a/.github/workflows/issue-release-workflow.yml b/.github/workflows/issue-release-workflow.yml index b09ef6555fa9..2f69b2d6e7fb 100644 --- a/.github/workflows/issue-release-workflow.yml +++ b/.github/workflows/issue-release-workflow.yml @@ -39,7 +39,7 @@ jobs: contains(github.event.action == 'opened' && github.event.issue.body || github.event.comment.body, '/cherry-pick') steps: - name: Fetch LLVM sources - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: repository: llvm/llvm-project # GitHub stores the token used for checkout and uses it for pushes @@ -74,7 +74,7 @@ jobs: steps: - name: Fetch LLVM sources - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: persist-credentials: false diff --git a/.github/workflows/issue-subscriber.yml b/.github/workflows/issue-subscriber.yml index ef6cd0674e80..d71dbffdb3cd 100644 --- a/.github/workflows/issue-subscriber.yml +++ b/.github/workflows/issue-subscriber.yml @@ -14,7 +14,7 @@ jobs: if: github.repository == 'llvm/llvm-project' steps: - name: Checkout Automation Script - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: sparse-checkout: llvm/utils/git/ ref: main diff --git a/.github/workflows/libclang-abi-tests.yml b/.github/workflows/libclang-abi-tests.yml index ccfc1e5fb8a7..d32ae125dd8d 100644 --- a/.github/workflows/libclang-abi-tests.yml +++ b/.github/workflows/libclang-abi-tests.yml @@ -39,7 +39,7 @@ jobs: LLVM_VERSION_PATCH: ${{ steps.version.outputs.LLVM_VERSION_PATCH }} steps: - name: Checkout source - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: fetch-depth: 250 @@ -131,7 +131,7 @@ jobs: sed -i 's/LLVM_[0-9]\+/LLVM_NOVERSION/' $lib-${{ matrix.ref }}.abi done - name: Upload ABI file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.name }} path: '*${{ matrix.ref }}.abi' @@ -144,12 +144,12 @@ jobs: - abi-dump steps: - name: Download baseline - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: build-baseline path: build-baseline - name: Download latest - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: build-latest path: build-latest @@ -163,7 +163,7 @@ jobs: done - name: Upload ABI Comparison if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: compat-report-${{ github.sha }} path: compat_reports/ diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml index 5727b956dc6d..9146fabe0312 100644 --- a/.github/workflows/libcxx-build-and-test.yaml +++ b/.github/workflows/libcxx-build-and-test.yaml @@ -68,14 +68,14 @@ jobs: cxx: 'g++-13' clang_tidy: 'OFF' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.7 - name: ${{ matrix.config }}.${{ matrix.cxx }} run: libcxx/utils/ci/run-buildbot ${{ matrix.config }} env: CC: ${{ matrix.cc }} CXX: ${{ matrix.cxx }} ENABLE_CLANG_TIDY: ${{ matrix.clang_tidy }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: ${{ matrix.config }}-${{ matrix.cxx }}-results @@ -117,14 +117,14 @@ jobs: cxx: 'clang++-17' clang_tidy: 'OFF' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.7 - name: ${{ matrix.config }} run: libcxx/utils/ci/run-buildbot ${{ matrix.config }} env: CC: ${{ matrix.cc }} CXX: ${{ matrix.cxx }} ENABLE_CLANG_TIDY: ${{ matrix.clang_tidy }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() # Upload artifacts even if the build or test suite fails with: name: ${{ matrix.config }}-results @@ -182,14 +182,14 @@ jobs: machine: libcxx-runners-8-set runs-on: ${{ matrix.machine }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.7 - name: ${{ matrix.config }} run: libcxx/utils/ci/run-buildbot ${{ matrix.config }} env: CC: clang-18 CXX: clang++-18 ENABLE_CLANG_TIDY: "OFF" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: ${{ matrix.config }}-results diff --git a/.github/workflows/libcxx-check-generated-files.yml b/.github/workflows/libcxx-check-generated-files.yml index 570055624b2a..525261981201 100644 --- a/.github/workflows/libcxx-check-generated-files.yml +++ b/.github/workflows/libcxx-check-generated-files.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch LLVM sources - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 - name: Install dependencies uses: aminya/setup-cpp@v1 diff --git a/.github/workflows/llvm-bugs.yml b/.github/workflows/llvm-bugs.yml index f592dd6ccd90..4797eea4e3d3 100644 --- a/.github/workflows/llvm-bugs.yml +++ b/.github/workflows/llvm-bugs.yml @@ -14,13 +14,13 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'llvm/llvm-project' steps: - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 check-latest: true - run: npm install mailgun.js form-data - name: Send notification - uses: actions/github-script@v6 + uses: actions/github-script@v7 env: MAILGUN_API_KEY: ${{ secrets.LLVM_BUGS_KEY }} with: diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml index 43b90193406f..e7917d8a12a5 100644 --- a/.github/workflows/llvm-project-tests.yml +++ b/.github/workflows/llvm-project-tests.yml @@ -77,7 +77,7 @@ jobs: # lldb. Using this setup-python action to make 3.10 the default # python fixes this. - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ inputs.python_version }} - name: Install Ninja @@ -86,7 +86,7 @@ jobs: # actions/checkout deletes any existing files in the new git directory, # so this needs to either run before ccache-action or it has to use # clean: false. - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.7 with: fetch-depth: 250 - name: Setup ccache diff --git a/.github/workflows/llvm-tests.yml b/.github/workflows/llvm-tests.yml index 127628d76f19..4dab6ffe3b0f 100644 --- a/.github/workflows/llvm-tests.yml +++ b/.github/workflows/llvm-tests.yml @@ -47,7 +47,7 @@ jobs: LLVM_VERSION_PATCH: ${{ steps.version.outputs.LLVM_VERSION_PATCH }} steps: - name: Checkout source - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: fetch-depth: 250 @@ -129,14 +129,14 @@ jobs: # Remove symbol versioning from dumps, so we can compare across major versions. sed -i 's/LLVM_${{ matrix.llvm_version_major }}/LLVM_NOVERSION/' ${{ matrix.ref }}.abi - name: Upload ABI file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.name }} path: ${{ matrix.ref }}.abi - name: Upload symbol list file if: matrix.name == 'build-baseline' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: symbol-list path: llvm.symbols @@ -149,17 +149,17 @@ jobs: - abi-dump steps: - name: Download baseline - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: build-baseline path: build-baseline - name: Download latest - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: build-latest path: build-latest - name: Download symbol list - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: symbol-list path: symbol-list @@ -178,7 +178,7 @@ jobs: abi-compliance-checker $EXTRA_ARGS -l libLLVM.so -old build-baseline/*.abi -new build-latest/*.abi || test "${{ needs.abi-dump-setup.outputs.ABI_HEADERS }}" = "llvm-c" - name: Upload ABI Comparison if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: compat-report-${{ github.sha }} path: compat_reports/ diff --git a/.github/workflows/new-prs.yml b/.github/workflows/new-prs.yml index a60f82ce35d1..31672a87e5b4 100644 --- a/.github/workflows/new-prs.yml +++ b/.github/workflows/new-prs.yml @@ -35,7 +35,7 @@ jobs: (github.event.pull_request.author_association != 'OWNER') steps: - name: Checkout Automation Script - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: sparse-checkout: llvm/utils/git/ ref: main @@ -67,7 +67,7 @@ jobs: github.event.pull_request.draft == false && github.event.pull_request.commits < 10 steps: - - uses: actions/labeler@v4 + - uses: actions/labeler@v5 with: configuration-path: .github/new-prs-labeler.yml # workaround for https://github.com/actions/labeler/issues/112 diff --git a/.github/workflows/pr-code-format.yml b/.github/workflows/pr-code-format.yml index 3d0c23917bd4..6ed25463232b 100644 --- a/.github/workflows/pr-code-format.yml +++ b/.github/workflows/pr-code-format.yml @@ -13,7 +13,7 @@ jobs: if: github.repository == 'llvm/llvm-project' steps: - name: Fetch LLVM sources - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: ref: ${{ github.event.pull_request.head.sha }} @@ -26,7 +26,7 @@ jobs: - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v39 + uses: tj-actions/changed-files@v44 with: separator: "," skip_initial_fetch: true @@ -35,7 +35,7 @@ jobs: # PR for security reasons as we're using pull_request_target. Checkout # the target branch with the necessary files. - name: Fetch code formatting utils - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: sparse-checkout: | llvm/utils/git/requirements_formatting.txt @@ -56,7 +56,7 @@ jobs: clangformat: 17.0.1 - name: Setup Python env - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' cache: 'pip' diff --git a/.github/workflows/pr-subscriber.yml b/.github/workflows/pr-subscriber.yml index 3952493bb698..97e5c3a1cfc4 100644 --- a/.github/workflows/pr-subscriber.yml +++ b/.github/workflows/pr-subscriber.yml @@ -14,7 +14,7 @@ jobs: if: github.repository == 'llvm/llvm-project' steps: - name: Checkout Automation Script - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: sparse-checkout: llvm/utils/git/ ref: main diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml index ebf6fa41898d..282e2b781467 100644 --- a/.github/workflows/release-binaries.yml +++ b/.github/workflows/release-binaries.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout LLVM - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.1 - name: Check Permissions env: @@ -91,7 +91,7 @@ jobs: - ubuntu-22.04 steps: - name: Checkout LLVM - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.1 with: ref: ${{ needs.prepare.outputs.ref }} @@ -133,7 +133,7 @@ jobs: steps: - name: Checkout LLVM - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.1 with: ref: ${{ needs.prepare.outputs.ref }} path: ${{ needs.prepare.outputs.build-dir }}/llvm-project diff --git a/.github/workflows/release-documentation.yml b/.github/workflows/release-documentation.yml index 64572906988b..ade7adab8c52 100644 --- a/.github/workflows/release-documentation.yml +++ b/.github/workflows/release-documentation.yml @@ -34,10 +34,10 @@ jobs: upload: ${{ inputs.upload && !contains(inputs.release-version, 'rc') }} steps: - name: Checkout LLVM - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.1 - name: Setup Python env - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: cache: 'pip' cache-dependency-path: './llvm/docs/requirements.txt' @@ -59,14 +59,14 @@ jobs: ./llvm/utils/release/build-docs.sh -release "${{ inputs.release-version }}" -no-doxygen - name: Create Release Notes Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: release-notes path: docs-build/html-export/ - name: Clone www-releases if: env.upload - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.1 with: repository: ${{ github.repository_owner }}/www-releases ref: main diff --git a/.github/workflows/release-doxygen.yml b/.github/workflows/release-doxygen.yml index 5e322849a1d0..692370774548 100644 --- a/.github/workflows/release-doxygen.yml +++ b/.github/workflows/release-doxygen.yml @@ -36,10 +36,10 @@ jobs: upload: ${{ inputs.upload && !contains(inputs.release-version, 'rc') }} steps: - name: Checkout LLVM - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.1 - name: Setup Python env - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: cache: 'pip' cache-dependency-path: './llvm/docs/requirements.txt' diff --git a/.github/workflows/release-lit.yml b/.github/workflows/release-lit.yml index 36b0b6edd518..210ad0ac6526 100644 --- a/.github/workflows/release-lit.yml +++ b/.github/workflows/release-lit.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout LLVM - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.1 with: ref: "llvmorg-${{ inputs.release-version }}" diff --git a/.github/workflows/release-tasks.yml b/.github/workflows/release-tasks.yml index 53da8662b020..57b1486259e2 100644 --- a/.github/workflows/release-tasks.yml +++ b/.github/workflows/release-tasks.yml @@ -36,7 +36,7 @@ jobs: sudo apt-get install python3-github - name: Checkout LLVM - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v4.1.1 - name: Create Release env: diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index b8e8ab26c3ff..027bdea42410 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -31,12 +31,12 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 + uses: actions/checkout@9a9194f87191a7e9055e3e9b95b8cfb13023bb08 # v3.1.0 with: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2 + uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0 with: results_file: results.sarif results_format: sarif @@ -49,7 +49,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 with: name: SARIF file path: results.sarif @@ -57,6 +57,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4 + uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2 with: sarif_file: results.sarif diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml index c6d779080bbe..87aa561fe5da 100644 --- a/.github/workflows/version-check.yml +++ b/.github/workflows/version-check.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch LLVM sources - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.7 with: fetch-depth: 0