summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-05-30 10:50:17 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-05-30 10:50:17 +0000
commit3a0486b1e945e92db5bb62ad4b392496c48323fe (patch)
tree24db03a0141a735f9dae9a83888c36d489e5004a
parentb4ddc0845ab5260023e9afa3f7bc71a0bc731ae6 (diff)
downloadbcm5719-llvm-3a0486b1e945e92db5bb62ad4b392496c48323fe.tar.gz
bcm5719-llvm-3a0486b1e945e92db5bb62ad4b392496c48323fe.zip
[sanitizer] Fix build on ARM.
llvm-svn: 209884
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc
index 447aaeeb688..35396392a0f 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cc
@@ -21,7 +21,8 @@ uptr StackTrace::GetPreviousInstructionPc(uptr pc) {
#if defined(__arm__)
// Cancel Thumb bit.
pc = pc & (~1);
-#elif defined(__powerpc__) || defined(__powerpc64__)
+#endif
+#if defined(__powerpc__) || defined(__powerpc64__)
// PCs are always 4 byte aligned.
return pc - 4;
#elif defined(__sparc__)
OpenPOWER on IntegriCloud