diff options
| author | Rainer Orth <ro@gcc.gnu.org> | 2018-11-05 19:22:54 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2018-11-05 19:22:54 +0000 |
| commit | 682ee6c3bc233edd24dd5a20a186313c8815e31e (patch) | |
| tree | a570da9c4840320c216e5249f4b55592540ff6e4 /compiler-rt/lib/sanitizer_common | |
| parent | 71c43ceaf862a5d9c9654f079fcaf82ed7ba40b4 (diff) | |
| download | bcm5719-llvm-682ee6c3bc233edd24dd5a20a186313c8815e31e.tar.gz bcm5719-llvm-682ee6c3bc233edd24dd5a20a186313c8815e31e.zip | |
[Sanitizers] Disable SANITIZER_CAN_FAST_UNWIND on all SPARC targets
While testing my to-be-submitted Solaris sanitizer support on gcc mainline, I ran into
an issue on Solaris/SPARC (sparc-sun-solaris2.11). Initially libasan.so failed to link:
Undefined first referenced
symbol in file
__sanitizer::BufferedStackTrace::FastUnwindStack(unsigned long, unsigned long, unsigned long, unsigned long, unsigned int) /var/gcc/gcc-9.0.0-20181024/11.5-gcc-gas/sparc-sun-solaris2.11/./libsanitizer/asan/.libs/libasan.so
This happens because SANITIZER_CAN_FAST_UNWIND is enabled on non-Linux
SPARC targets (cf. sanitizer_stacktrace.h), but the guard around the SPARCv8-only
definition in sanitizer_stacktrace_sparc.cc only works with clang:
clang predefines __sparcv8__ on non-Solaris, and __sparcv8 only on Solaris
gcc predefines __sparcv8 on Solaris, but __sparc_v8__ on non-Solaris
The attached patch allows for all three variants.
However, disabling SANITIZER_CAN_FAST_UNWIND on all SPARC targets
fixes a couple of testsuite failures in the Solaris asan testsuite, so for now it's better
to keep it disabled everywhere.
This allowed the libsanitizer build to complete and gave reasonable (though slightly
worse than on Solaris/x86) testsuite results.
Differential Revision: https://reviews.llvm.org/D54099
llvm-svn: 346155
Diffstat (limited to 'compiler-rt/lib/sanitizer_common')
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_sparc.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h index 562d2e9f737..450a40a9069 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h @@ -19,7 +19,7 @@ namespace __sanitizer { static const u32 kStackTraceMax = 256; -#if SANITIZER_LINUX && (defined(__sparc__) || defined(__mips__)) +#if defined(__sparc__) || (SANITIZER_LINUX && defined(__mips__)) # define SANITIZER_CAN_FAST_UNWIND 0 #elif SANITIZER_WINDOWS # define SANITIZER_CAN_FAST_UNWIND 0 diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_sparc.cc b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_sparc.cc index 9f9920ece80..f41a3cefb35 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_sparc.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_stacktrace_sparc.cc @@ -15,7 +15,7 @@ // This file is ported to Sparc v8, but it should be easy to port to // Sparc v9. -#if defined(__sparcv8__) +#if defined(__sparcv8__) || defined(__sparcv8) || defined(__sparc_v8__) #include "sanitizer_common.h" #include "sanitizer_stacktrace.h" @@ -55,4 +55,5 @@ void BufferedStackTrace::FastUnwindStack(uptr pc, uptr bp, uptr stack_top, } // namespace __sanitizer -#endif // !defined(__sparcv8__) +#endif // !defined(__sparcv8__) && !defined(__sparcv8) && + // !defined(__sparc_v8__) |
