summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorJian Cai <caij2003@gmail.com>2019-08-16 23:30:16 +0000
committerJian Cai <caij2003@gmail.com>2019-08-16 23:30:16 +0000
commit16fa8b09702378bacfa3d07081afe6b353b99e60 (patch)
tree2771210fa99aef02f5e9393be0ed08ccd50c645c /clang
parent57ec292ab80002b8dbc3e9b201be5d4e22917449 (diff)
downloadbcm5719-llvm-16fa8b09702378bacfa3d07081afe6b353b99e60.tar.gz
bcm5719-llvm-16fa8b09702378bacfa3d07081afe6b353b99e60.zip
Reland "[ARM] push LR before __gnu_mcount_nc"
This relands r369147 with fixes to unit tests. https://reviews.llvm.org/D65019 llvm-svn: 369173
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/Basic/Targets/ARM.cpp2
-rw-r--r--clang/test/Frontend/gnu-mcount.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Basic/Targets/ARM.cpp b/clang/lib/Basic/Targets/ARM.cpp
index 3ae2091f4a0..b234f013485 100644
--- a/clang/lib/Basic/Targets/ARM.cpp
+++ b/clang/lib/Basic/Targets/ARM.cpp
@@ -322,7 +322,7 @@ ARMTargetInfo::ARMTargetInfo(const llvm::Triple &Triple,
if (Triple.getOS() == llvm::Triple::Linux ||
Triple.getOS() == llvm::Triple::UnknownOS)
this->MCountName = Opts.EABIVersion == llvm::EABI::GNU
- ? "\01__gnu_mcount_nc"
+ ? "llvm.arm.gnu.eabi.mcount"
: "\01mcount";
SoftFloatABI = llvm::is_contained(Opts.FeaturesAsWritten, "+soft-float-abi");
diff --git a/clang/test/Frontend/gnu-mcount.c b/clang/test/Frontend/gnu-mcount.c
index baac555d139..6e89dfefb75 100644
--- a/clang/test/Frontend/gnu-mcount.c
+++ b/clang/test/Frontend/gnu-mcount.c
@@ -66,7 +66,7 @@ int f() {
// CHECK-ARM64-EABI-OPENBSD: attributes #{{[0-9]+}} = { {{.*}}"instrument-function-entry-inlined"="__mcount"{{.*}} }
// CHECK-ARM64-EABI-OPENBSD-NOT: attributes #{{[0-9]+}} = { {{.*}}"instrument-function-entry-inlined"="\01__gnu_mcount_nc"{{.*}} }
// CHECK-ARM-EABI-MEABI-GNU-NOT: attributes #{{[0-9]+}} = { {{.*}}"instrument-function-entry-inlined"="mcount"{{.*}} }
-// CHECK-ARM-EABI-MEABI-GNU: attributes #{{[0-9]+}} = { {{.*}}"instrument-function-entry-inlined"="\01__gnu_mcount_nc"{{.*}} }
+// CHECK-ARM-EABI-MEABI-GNU: attributes #{{[0-9]+}} = { {{.*}}"instrument-function-entry-inlined"="llvm.arm.gnu.eabi.mcount"{{.*}} }
// CHECK-ARM-EABI-RTEMS: attributes #{{[0-9]+}} = { {{.*}}"instrument-function-entry-inlined"="mcount"{{.*}} }
// CHECK-ARM-EABI-RTEMS-NOT: attributes #{{[0-9]+}} = { {{.*}}"instrument-function-entry-inlined"="\01__gnu_mcount_nc"{{.*}} }
// CHECK-ARM64-EABI-RTEMS: attributes #{{[0-9]+}} = { {{.*}}"instrument-function-entry-inlined"="mcount"{{.*}} }
OpenPOWER on IntegriCloud