Author: Zakk Chen Date: 2020-01-27T19:05:31+01:00 New Revision: 01fd650ba3d29709e82a608dfa7fcec35606385d
URL: https://github.com/llvm/llvm-project/commit/01fd650ba3d29709e82a608dfa7fcec35606385d DIFF: https://github.com/llvm/llvm-project/commit/01fd650ba3d29709e82a608dfa7fcec35606385d.diff LOG: [RISCV] Pass target-abi via module flag metadata Reviewers: lenary, asb Reviewed By: lenary Tags: #clang Differential Revision: https://reviews.llvm.org/D72755 (cherry picked from commit e15fb06e2d0a068de549464d72081811e7fac612) Added: clang/test/CodeGen/riscv-metadata.c Modified: clang/lib/CodeGen/CodeGenModule.cpp Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 57beda26677c..f8866ac4f7f6 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -537,6 +537,13 @@ void CodeGenModule::Release() { getModule().addModuleFlag(llvm::Module::Error, "min_enum_size", EnumWidth); } + if (Arch == llvm::Triple::riscv32 || Arch == llvm::Triple::riscv64) { + StringRef ABIStr = Target.getABI(); + llvm::LLVMContext &Ctx = TheModule.getContext(); + getModule().addModuleFlag(llvm::Module::Error, "target-abi", + llvm::MDString::get(Ctx, ABIStr)); + } + if (CodeGenOpts.SanitizeCfiCrossDso) { // Indicate that we want cross-DSO control flow integrity checks. getModule().addModuleFlag(llvm::Module::Override, "Cross-DSO CFI", 1); diff --git a/clang/test/CodeGen/riscv-metadata.c b/clang/test/CodeGen/riscv-metadata.c new file mode 100644 index 000000000000..19bde4ca73be --- /dev/null +++ b/clang/test/CodeGen/riscv-metadata.c @@ -0,0 +1,14 @@ +// RUN: %clang_cc1 -triple riscv32 -target-abi ilp32 -emit-llvm -o - %s | FileCheck -check-prefix=ILP32 %s +// RUN: %clang_cc1 -triple riscv32 -target-feature +f -target-abi ilp32f -emit-llvm -o - %s | FileCheck -check-prefix=ILP32F %s +// RUN: %clang_cc1 -triple riscv32 -target-feature +d -target-abi ilp32d -emit-llvm -o - %s | FileCheck -check-prefix=ILP32D %s +// RUN: %clang_cc1 -triple riscv64 -target-abi lp64 -emit-llvm -o - %s | FileCheck -check-prefix=LP64 %s +// RUN: %clang_cc1 -triple riscv64 -target-feature +f -target-abi lp64f -emit-llvm -o - %s | FileCheck -check-prefix=LP64F %s +// RUN: %clang_cc1 -triple riscv64 -target-feature +d -target-abi lp64d -emit-llvm -o - %s | FileCheck -check-prefix=LP64D %s + +// ILP32: !{{[0-9]+}} = !{i32 1, !"target-abi", !"ilp32"} +// ILP32F: !{{[0-9]+}} = !{i32 1, !"target-abi", !"ilp32f"} +// ILP32D: !{{[0-9]+}} = !{i32 1, !"target-abi", !"ilp32d"} + +// LP64: !{{[0-9]+}} = !{i32 1, !"target-abi", !"lp64"} +// LP64F: !{{[0-9]+}} = !{i32 1, !"target-abi", !"lp64f"} +// LP64D: !{{[0-9]+}} = !{i32 1, !"target-abi", !"lp64d"} _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
