diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-08-29 22:29:15 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2017-08-29 22:29:15 +0000 |
| commit | 4731ad81c77dc202309010a607d7728d0b47efa4 (patch) | |
| tree | 057156bf14c38972b5374ca31e101befbbd6412b | |
| parent | 2297fc89b4c0403350fcdf06c22f752e7958217f (diff) | |
| download | bcm5719-llvm-4731ad81c77dc202309010a607d7728d0b47efa4.tar.gz bcm5719-llvm-4731ad81c77dc202309010a607d7728d0b47efa4.zip | |
[cfi] Build __cfi_check as Thumb when applicable.
Summary:
Cross-DSO CFI needs all __cfi_check exports to use the same encoding
(ARM vs Thumb).
Reviewers: pcc
Subscribers: aemerson, srhines, kristof.beyls, hiraditya, llvm-commits
Differential Revision: https://reviews.llvm.org/D37243
llvm-svn: 312052
| -rw-r--r-- | llvm/lib/Transforms/IPO/CrossDSOCFI.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/Transforms/CrossDSOCFI/thumb.ll | 22 |
2 files changed, 28 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/IPO/CrossDSOCFI.cpp b/llvm/lib/Transforms/IPO/CrossDSOCFI.cpp index d94aa5da856..0098b60cb6a 100644 --- a/llvm/lib/Transforms/IPO/CrossDSOCFI.cpp +++ b/llvm/lib/Transforms/IPO/CrossDSOCFI.cpp @@ -16,6 +16,7 @@ #include "llvm/ADT/DenseSet.h" #include "llvm/ADT/EquivalenceClasses.h" #include "llvm/ADT/Statistic.h" +#include "llvm/ADT/Triple.h" #include "llvm/IR/Constant.h" #include "llvm/IR/Constants.h" #include "llvm/IR/Function.h" @@ -115,6 +116,11 @@ void CrossDSOCFI::buildCFICheck(Module &M) { // linker knows about the symbol; this pass replaces the function body. F->deleteBody(); F->setAlignment(4096); + + Triple T(M.getTargetTriple()); + if (T.isARM() || T.isThumb()) + F->addFnAttr("target-features", "+thumb-mode"); + auto args = F->arg_begin(); Value &CallSiteTypeId = *(args++); CallSiteTypeId.setName("CallSiteTypeId"); diff --git a/llvm/test/Transforms/CrossDSOCFI/thumb.ll b/llvm/test/Transforms/CrossDSOCFI/thumb.ll new file mode 100644 index 00000000000..c716d554a27 --- /dev/null +++ b/llvm/test/Transforms/CrossDSOCFI/thumb.ll @@ -0,0 +1,22 @@ +; RUN: opt -mtriple=armv7-linux-android -S -cross-dso-cfi < %s | FileCheck --check-prefix=THUMB %s +; RUN: opt -mtriple=thumbv7-linux-android -S -cross-dso-cfi < %s | FileCheck --check-prefix=THUMB %s +; RUN: opt -mtriple=i386-linux -S -cross-dso-cfi < %s | FileCheck --check-prefix=NOTHUMB %s +; RUN: opt -mtriple=x86_64-linux -S -cross-dso-cfi < %s | FileCheck --check-prefix=NOTHUMB %s + +target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" + +define signext i8 @f() !type !0 !type !1 { +entry: + ret i8 1 +} + +!llvm.module.flags = !{!2} + +!0 = !{i64 0, !"_ZTSFcvE"} +!1 = !{i64 0, i64 111} +!2 = !{i32 4, !"Cross-DSO CFI", i32 1} + +; THUMB: define void @__cfi_check({{.*}} #[[A:.*]] align 4096 +; THUMB: attributes #[[A]] = { {{.*}}"target-features"="+thumb-mode" + +; NOTHUMB: define void @__cfi_check({{.*}} align 4096 |
