[src/trunk]: src/external/gpl3/gcc/dist/libsanitizer/asan Do the mcontext stu...

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

details:   https://anonhg.NetBSD.org/src/rev/82789402a872
branches:  trunk
changeset: 333187:82789402a872
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Oct 22 16:53:16 2014 +0000

description:
Do the mcontext stuff differently so that we don't fail compilation.

diffstat:

 external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc |  39 +++++++++++++++--
 1 files changed, 33 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 3dee8c77e5de -r 82789402a872 external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc
--- a/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc    Wed Oct 22 16:52:47 2014 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc    Wed Oct 22 16:53:16 2014 +0000
@@ -48,15 +48,42 @@
   return &_DYNAMIC;  // defined in link.h
 }
 
+void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) {
 #ifdef __NetBSD__
-#define gregs __gregs
-#define REG_RIP _REG_RIP
-#define REG_RBP _REG_RBP
-#define REG_RSP _REG_RSP
+# if defined(__arm__)
+#  define REG_PC _REG_PC
+#  define REG_BP _REG_FP
+#  define REG_SP _REG_SP
+# elif defined(__x86_64__)
+#  define REG_PC _REG_RIP
+#  define REG_BP _REG_RBP
+#  define REG_SP _REG_RSP
+# elif defined(__i386__)
+#  define REG_PC _REG_EIP
+#  define REG_BP _REG_EBP
+#  define REG_SP _REG_ESP
+# elif defined(__powerpc__) || defined(__powerpc64__)
+#  define REG_PC _REG_PC
+#  define REG_BP _REG_R1
+#  define REG_SP _REG_R31
+# elif defined(__sparc__)
+  ucontext_t *ucontext = (ucontext_t*)context;
+  *pc = _UC_MACHINE_PC(ucontext);
+  *sp = _UC_MACHINE_SP(ucontext);
+  *bp = sp[15]; // XXX: christos
+# else
+  // Lot's are missing, please add more.
 #endif
 
-void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) {
-#if ASAN_ANDROID
+# ifdef REG_PC
+  ucontext_t *ucontext = (ucontext_t*)context;
+  *pc = ucontext->uc_mcontext.__gregs[REG_PC];
+  *bp = ucontext->uc_mcontext.__gregs[REG_BP];
+  *sp = ucontext->uc_mcontext.__gregs[REG_SP];
+# else
+  *pc = *bp = *sp = 0;
+# endif
+#elif ASAN_ANDROID
   *pc = *sp = *bp = 0;
 #elif defined(__arm__)
   ucontext_t *ucontext = (ucontext_t*)context;