From: Julian Seward <jseward@acm.org>
Date: Fri, 1 Jan 2010 12:44:12 +0000 (+0000)
Subject: n-break build on x86-darwin following r10982.
X-Git-Tag: svn/VALGRIND_3_6_0~440
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bcd1e026b4ff33d40c13d2130fc43acd8df698c;p=thirdparty%2Fvalgrind.git

n-break build on x86-darwin following r10982.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10983
---

diff --git a/coregrind/m_cpuid.S b/coregrind/m_cpuid.S
index d9728e2782..1b67b4cf7e 100644
--- a/coregrind/m_cpuid.S
+++ b/coregrind/m_cpuid.S
@@ -149,7 +149,7 @@
         ret
 #endif
 
-#if defined(VGA_x86) || defined(VGA_amd64)
+#if defined(VGP_x86_linux) || defined(VGP_amd64_linux)
 /* Let the linker know we don't need an executable stack */
 .section .note.GNU-stack,"",@progbits
 #endif
diff --git a/coregrind/m_signals.c b/coregrind/m_signals.c
index 8f46e1d301..66115d8460 100644
--- a/coregrind/m_signals.c
+++ b/coregrind/m_signals.c
@@ -54,7 +54,7 @@
    a signal with kill, its expected to be synchronous: ie, the signal
    will have been delivered by the time the syscall finishes.
    
-   4. Asyncronous, general signals.  All other signals, sent by
+   4. Asynchronous, general signals.  All other signals, sent by
    another process with kill.  These are generally blocked, except for
    two special cases: we poll for them each time we're about to run a
    thread for a time quanta, and while running blocking syscalls.
@@ -490,14 +490,15 @@ typedef struct SigQueue {
       return VG_(mk_SysRes_x86_darwin)( scclass, err ? True : False, 
                                         wHI, wLO );
    }
-   static inline Addr VG_UCONTEXT_LINK_REG( void* ucV ) {
-      return 0; /* No, really.  We have no LRs today. */
-   }
-   static inline Addr VG_UCONTEXT_FRAME_PTR( void* ucV ) {
-      ucontext_t* uc = (ucontext_t*)ucV;
+   static inline
+   void VG_UCONTEXT_TO_UnwindStartRegs( UnwindStartRegs* srP,
+                                        void* ucV ) {
+      ucontext_t* uc = (ucontext_t*)(ucV);
       struct __darwin_mcontext32* mc = uc->uc_mcontext;
       struct __darwin_i386_thread_state* ss = &mc->__ss;
-      return ss->__ebp;
+      srP->r_pc = (ULong)(ss->__eip);
+      srP->r_sp = (ULong)(ss->__esp);
+      srP->misc.X86.r_ebp = (UInt)(ss->__ebp);
    }
 
 #elif defined(VGP_amd64_darwin)