Darwin: fix x86 build and client syscall

diff --git a/cachegrind/tests/x86/fpu-28-108.S b/cachegrind/tests/x86/fpu-28-108.S
index cb770f818ef428f928bea0e92326a22bf0a39afd..7f99387ff8479d48950d358fef7783c570f06068 100644 (file)
--- a/cachegrind/tests/x86/fpu-28-108.S
+++ b/cachegrind/tests/x86/fpu-28-108.S
@@ -24,5 +24,8 @@ VG_SYM_ASM(main):
         movl    $0, %eax
         ret
 
+#if !defined(VGO_darwin)
         .section        .note.GNU-stack,"",@progbits
+#endif
+
 

diff --git a/coregrind/m_replacemalloc/vg_replace_malloc.c b/coregrind/m_replacemalloc/vg_replace_malloc.c
index 5f3aec0f0547b8b4aea28d973bea985270e1a60e..114e9222880991c60baaefaf0969a30209b2497c 100644 (file)
--- a/coregrind/m_replacemalloc/vg_replace_malloc.c
+++ b/coregrind/m_replacemalloc/vg_replace_malloc.c
@@ -1883,7 +1883,7 @@ extern int * __error(void) __attribute__((weak));
       VERIFY_ALIGNMENT(&aligned_alloc_info);                                   \
       TRIGGER_MEMCHECK_ERROR_IF_UNDEFINED((UWord)zone);                        \
       TRIGGER_MEMCHECK_ERROR_IF_UNDEFINED(n);                                  \
-      MALLOC_TRACE("zone_memalign(%p, %lu, %u)", zone,                \
+      MALLOC_TRACE("zone_memalign(%p, %lu, %lu)", zone,                        \
                    alignment, n);                                              \
                                                                                \
       if (alignment == 0 || alignment % sizeof(void*) != 0 ||                  \

diff --git a/coregrind/m_syswrap/syswrap-main.c b/coregrind/m_syswrap/syswrap-main.c
index 82f3adc5daaedc1af494382b6a7dd5e0b0610dac..ff9960225f81a0fc77bd95579ed5d89d93c1172a 100644 (file)
--- a/coregrind/m_syswrap/syswrap-main.c
+++ b/coregrind/m_syswrap/syswrap-main.c
@@ -2296,7 +2296,7 @@ void VG_(client_syscall) ( ThreadId tid, UInt trc )
    /* Save the syscall number in the thread state in case the syscall 
       is interrupted by a signal. */
    canonical_sysno = sci->orig_args.canonical_sysno;
-#if defined(VGO_freebsd) || defined(VGO_darwin)
+#if defined(VGO_freebsd) || defined(VGP_amd64_darwin)
    original_sysno = sci->orig_args.original_sysno;
 #else
    /*

diff --git a/coregrind/m_syswrap/syswrap-x86-darwin.c b/coregrind/m_syswrap/syswrap-x86-darwin.c
index 7459ef83a2ac08be076a0478268404e819e616c9..97c044f77e52edd65943afac87eb961b285a3da7 100644 (file)
--- a/coregrind/m_syswrap/syswrap-x86-darwin.c
+++ b/coregrind/m_syswrap/syswrap-x86-darwin.c
@@ -375,8 +375,8 @@ asm(
     To handle this in valgrind, we create and destroy a valgrind 
     thread for every work item.
 */
-void wqthread_hijack(Addr self, Addr kport, Addr stackaddr, Addr workitem, 
-                     Int reuse, Addr sp)
+void wqthread_hijack(Addr self, Addr kport, Addr stackaddr, Addr workitem,
+                     UInt reuse, Int kevent_count, Addr sp)
 {
    ThreadState *tst;
    VexGuestX86State *vex;

diff --git a/memcheck/tests/x86/pushfpopf_s.S b/memcheck/tests/x86/pushfpopf_s.S
index 3cdd64d569a4db44b5c4672bf2f9c5ff4d19b763..5fef88e144e82c74d1303ea1db4d7d78a1b6d4de 100644 (file)
--- a/memcheck/tests/x86/pushfpopf_s.S
+++ b/memcheck/tests/x86/pushfpopf_s.S
@@ -46,5 +46,7 @@ theend:
        .size   VG_SYM_ASM(fooble),.Lfe1-VG_SYM_ASM(fooble)
 #endif
        .ident  "GCC: (GNU) 2.96 20000731 (Red Hat Linux 7.1 2.96-98)"
+#if !defined(VGO_darwin)
         .section        .note.GNU-stack,"",@progbits
+#endif
 

diff --git a/memcheck/tests/x86/tronical.S b/memcheck/tests/x86/tronical.S
index 60427c1c2fd18daa9b391a74218026e1d7a4e595..52adfd82bd08be50338257cf748a520db83037a9 100644 (file)
--- a/memcheck/tests/x86/tronical.S
+++ b/memcheck/tests/x86/tronical.S
@@ -104,5 +104,7 @@ VG_SYM_ASM(main):
 .Lfe3:
        .comm   foo,4,4
        .ident  "GCC: (GNU) 2.96 20000731 (Red Hat Linux 7.1 2.96-98)"
+#if !defined(VGO_darwin)
         .section        .note.GNU-stack,"",@progbits
+#endif
 

diff --git a/none/tests/x86/cpuid_s.S b/none/tests/x86/cpuid_s.S
index e5012cc92d639b91daaea0bbdaec2667da5a80a1..8f8c9611d1be709140c7a0cf88ffb115df9e51a5 100644 (file)
--- a/none/tests/x86/cpuid_s.S
+++ b/none/tests/x86/cpuid_s.S
@@ -71,5 +71,8 @@ VG_SYM_ASM(get_cpuid1):
 
 
        .ident  "GCC: (GNU) 2.96 20000731 (Red Hat Linux 7.1 2.96-98)"
+#if !defined(VGO_darwin)
         .section        .note.GNU-stack,"",@progbits
+#endif
+