Tue Mar 31 17:18:35 2015 UTC ()

Deal with NetBSD using dwarf EH


(matt)

diff -r1.3 -r1.4 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc

--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc 2014/10/23 17:50:24	1.3
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc 2015/03/31 17:18:35	1.4

 @@ -380,38 +380,38 @@ bool MemoryMappingLayout::GetObjectNameA
   return IterateForObjectNameAndOffset(addr, offset, filename, filename_size);
+}
 bool SanitizerSetThreadName(const char *name) {
    return 0 == pthread_setname_np(pthread_self(), "%s", (void *)(intptr_t)name);
+}
 bool SanitizerGetThreadName(char *name, int max_len) {
    return 0 == pthread_getname_np(pthread_self(), name, max_len);
+}
 #ifndef SANITIZER_GO
 //------------------------- SlowUnwindStack -----------------------------------
-#ifdef __arm__
+#if defined(__arm__) && defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
 #include "unwind-arm-common.h"
 #define UNWIND_STOP _URC_END_OF_STACK
 #define UNWIND_CONTINUE _URC_NO_REASON
 #else
 #include <unwind.h>
 #define UNWIND_STOP _URC_NORMAL_STOP
 #define UNWIND_CONTINUE _URC_NO_REASON
 #endif
 uptr Unwind_GetIP(struct _Unwind_Context *ctx) {
-#ifdef __arm__
+#if defined(__arm__) && defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
   uptr val;
   _Unwind_VRS_Result res = _Unwind_VRS_Get(ctx, _UVRSC_CORE,
 /* r15 = PC */, _UVRSD_UINT32, &val);
   CHECK(res == _UVRSR_OK && "_Unwind_VRS_Get failed");
   // Clear the Thumb bit.
   return val & ~(uptr)1;
 #else
   return (uptr)_Unwind_GetIP(ctx);
 #endif
+}
 _Unwind_Reason_Code Unwind_Trace(struct _Unwind_Context *ctx, void *param) {
   StackTrace *b = (StackTrace*)param;