[src/trunk]: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common Deal wi...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/376bdc47757b
branches:  trunk
changeset: 337059:376bdc47757b
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Mar 31 17:18:35 2015 +0000

description:
Deal with NetBSD using dwarf EH

diffstat:

 external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r c2dbe38d389d -r 376bdc47757b external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc
--- a/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc  Tue Mar 31 16:15:07 2015 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_netbsd.cc  Tue Mar 31 17:18:35 2015 +0000
@@ -390,7 +390,7 @@
 
 #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
@@ -401,7 +401,7 @@
 #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,
       15 /* r15 = PC */, _UVRSD_UINT32, &val);