commit 663860b1408516d02ebfcb3a9999a134e6cfb223
author Ben Cheng <bccheng@google.com> Thu Jan 31 15:38:14 2013 -0800
committer Ben Cheng <bccheng@google.com> Thu Jan 31 17:00:40 2013 -0800
tree 5a280c3821939b40b9cb8a0577f70d1072082cc4
parent 19211210d3c966ef856d8ca182abf8d78f1e7cbf

Refresh Valgrind to 3.8.1

Disable Android.mk for now until Android-specific changes are submitted later.

Change-Id: I0673f9b4edbbfacf5f52868c9735272e4bf811de

main/coregrind/m_sigframe/sigframe-arm-linux.c

diff --git a/main/coregrind/m_sigframe/sigframe-arm-linux.c b/main/coregrind/m_sigframe/sigframe-arm-linux.c
index 441c351..06069e4 100644
--- a/main/coregrind/m_sigframe/sigframe-arm-linux.c
+++ b/main/coregrind/m_sigframe/sigframe-arm-linux.c
@@ -8,11 +8,11 @@
    This file is part of Valgrind, a dynamic binary instrumentation
    framework.
 
-   Copyright (C) 2000-2011 Nicholas Nethercote
+   Copyright (C) 2000-2012 Nicholas Nethercote
       njn@valgrind.org
-   Copyright (C) 2004-2011 Paul Mackerras
+   Copyright (C) 2004-2012 Paul Mackerras
       paulus@samba.org
-   Copyright (C) 2008-2011 Evan Geller
+   Copyright (C) 2008-2012 Evan Geller
       gaze@bea.ms
 
    This program is free software; you can redistribute it and/or
@@ -259,7 +259,12 @@
    tst->arch.vex.guest_R0  = sigNo; 
 
    if (flags & VKI_SA_RESTORER)
-       tst->arch.vex.guest_R14 = (Addr) restorer; 
+       tst->arch.vex.guest_R14 = (Addr)restorer; 
+   else
+       tst->arch.vex.guest_R14 
+          = (flags & VKI_SA_SIGINFO)
+            ? (Addr)&VG_(arm_linux_SUBST_FOR_rt_sigreturn)
+            : (Addr)&VG_(arm_linux_SUBST_FOR_sigreturn);
 
    tst->arch.vex.guest_R15T = (Addr) handler; /* R15 == PC */
 }