From: Bart Van Assche <bvanassche@acm.org>
Date: Sat, 5 Mar 2011 12:11:28 +0000 (+0000)
Subject: Darwin: Build fixes for four regression tests by Rich Coe (see also #267488).
X-Git-Tag: svn/VALGRIND_3_7_0~642
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11a3c9d409b10172bcbc4f030d309b63e24e6909;p=thirdparty%2Fvalgrind.git

Darwin: Build fixes for four regression tests by Rich Coe (see also #267488).


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

diff --git a/memcheck/tests/amd64/fxsave-amd64.c b/memcheck/tests/amd64/fxsave-amd64.c
index c3fe211d4d..49281dd8e4 100644
--- a/memcheck/tests/amd64/fxsave-amd64.c
+++ b/memcheck/tests/amd64/fxsave-amd64.c
@@ -45,6 +45,7 @@ void do_zeroise ( void )
     "fldz\n\t"
     "fldz\n\t"
     "finit\n");
+#ifndef VGP_amd64_darwin
    asm __volatile__("movups " VG_SYM(vecZ) ", %xmm0");
    asm __volatile__("movups " VG_SYM(vecZ) ", %xmm1");
    asm __volatile__("movups " VG_SYM(vecZ) ", %xmm2");
@@ -61,6 +62,24 @@ void do_zeroise ( void )
    asm __volatile__("movups " VG_SYM(vecZ) ", %xmm13");
    asm __volatile__("movups " VG_SYM(vecZ) ", %xmm14");
    asm __volatile__("movups " VG_SYM(vecZ) ", %xmm15");
+#else
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm0");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm1");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm2");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm3");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm4");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm5");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm6");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm7");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm8");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm9");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm10");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm11");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm12");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm13");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm14");
+   asm __volatile__("movups " VG_SYM(vecZ) "(%rip), %xmm15");
+#endif
    asm __volatile__(
       "pushq $0\n\t"
       "ldmxcsr 0(%rsp)\n\t"
diff --git a/none/tests/amd64/cmpxchg.c b/none/tests/amd64/cmpxchg.c
index 62f146280f..7a1c86b51f 100644
--- a/none/tests/amd64/cmpxchg.c
+++ b/none/tests/amd64/cmpxchg.c
@@ -33,14 +33,27 @@ int main ( void )
     "\tpush %rcx\n"
     "\tpush %rdx\n"
     "\txor %rax, %rax\n" // get eflags in a known state
+#ifndef VGP_amd64_darwin
     "\tmov " VG_SYM(rax) ",%rax\n"
     "\tmov " VG_SYM(rbx) ",%rbx\n"
     "\tmov " VG_SYM(rcx) ",%rcx\n"
     "\tmov " VG_SYM(rdx) ",%rdx\n"
+#else
+    "\tmov " VG_SYM(rax) "(%rip),%rax\n"
+    "\tmov " VG_SYM(rbx) "(%rip),%rbx\n"
+    "\tmov " VG_SYM(rcx) "(%rip),%rcx\n"
+    "\tmov " VG_SYM(rdx) "(%rip),%rdx\n"
+#endif
     "\tcmpxchg %bl,%cl \n"
+#ifndef VGP_amd64_darwin
     "\tmov %rax," VG_SYM(rax_out) "\n"
     "\tmov %rbx," VG_SYM(rbx_out) "\n"
     "\tmov %rcx," VG_SYM(rcx_out) "\n"
+#else
+    "\tmov %rax," VG_SYM(rax_out) "(%rip)\n"
+    "\tmov %rbx," VG_SYM(rbx_out) "(%rip)\n"
+    "\tmov %rcx," VG_SYM(rcx_out) "(%rip)\n"
+#endif
     "\tpop %rdx\n"
     "\tpop %rcx\n"
     "\tpop %rbx\n"
@@ -64,14 +77,27 @@ int main ( void )
     "\tpush %rcx\n"
     "\tpush %rdx\n"
     "\txor %rax, %rax\n" // get eflags in a known state
+#ifndef VGP_amd64_darwin
     "\tmov " VG_SYM(rax) ",%rax\n"
     "\tmov " VG_SYM(rbx) ",%rbx\n"
     "\tmov " VG_SYM(rcx) ",%rcx\n"
     "\tmov " VG_SYM(rdx) ",%rdx\n"
+#else
+    "\tmov " VG_SYM(rax) "(%rip),%rax\n"
+    "\tmov " VG_SYM(rbx) "(%rip),%rbx\n"
+    "\tmov " VG_SYM(rcx) "(%rip),%rcx\n"
+    "\tmov " VG_SYM(rdx) "(%rip),%rdx\n"
+#endif
     "\tcmpxchg %bl,%cl \n"
+#ifndef VGP_amd64_darwin
     "\tmov %rax," VG_SYM(rax_out) "\n"
     "\tmov %rbx," VG_SYM(rbx_out) "\n"
     "\tmov %rcx," VG_SYM(rcx_out) "\n"
+#else
+    "\tmov %rax," VG_SYM(rax_out) "(%rip)\n"
+    "\tmov %rbx," VG_SYM(rbx_out) "(%rip)\n"
+    "\tmov %rcx," VG_SYM(rcx_out) "(%rip)\n"
+#endif
     "\tpop %rdx\n"
     "\tpop %rcx\n"
     "\tpop %rbx\n"
@@ -95,14 +121,27 @@ int main ( void )
     "\tpush %rcx\n"
     "\tpush %rdx\n"
     "\txor %rax, %rax\n" // get eflags in a known state
+#ifndef VGP_amd64_darwin
     "\tmov " VG_SYM(rax) ",%rax\n"
     "\tmov " VG_SYM(rbx) ",%rbx\n"
     "\tmov " VG_SYM(rcx) ",%rcx\n"
     "\tmov " VG_SYM(rdx) ",%rdx\n"
+#else
+    "\tmov " VG_SYM(rax) "(%rip),%rax\n"
+    "\tmov " VG_SYM(rbx) "(%rip),%rbx\n"
+    "\tmov " VG_SYM(rcx) "(%rip),%rcx\n"
+    "\tmov " VG_SYM(rdx) "(%rip),%rdx\n"
+#endif
     "\tcmpxchg %bx,%cx \n"
+#ifndef VGP_amd64_darwin
     "\tmov %rax," VG_SYM(rax_out) "\n"
     "\tmov %rbx," VG_SYM(rbx_out) "\n"
     "\tmov %rcx," VG_SYM(rcx_out) "\n"
+#else
+    "\tmov %rax," VG_SYM(rax_out) "(%rip)\n"
+    "\tmov %rbx," VG_SYM(rbx_out) "(%rip)\n"
+    "\tmov %rcx," VG_SYM(rcx_out) "(%rip)\n"
+#endif
     "\tpop %rdx\n"
     "\tpop %rcx\n"
     "\tpop %rbx\n"
@@ -126,14 +165,27 @@ int main ( void )
     "\tpush %rcx\n"
     "\tpush %rdx\n"
     "\txor %rax, %rax\n" // get eflags in a known state
+#ifndef VGP_amd64_darwin
     "\tmov " VG_SYM(rax) ",%rax\n"
     "\tmov " VG_SYM(rbx) ",%rbx\n"
     "\tmov " VG_SYM(rcx) ",%rcx\n"
     "\tmov " VG_SYM(rdx) ",%rdx\n"
+#else
+    "\tmov " VG_SYM(rax) "(%rip),%rax\n"
+    "\tmov " VG_SYM(rbx) "(%rip),%rbx\n"
+    "\tmov " VG_SYM(rcx) "(%rip),%rcx\n"
+    "\tmov " VG_SYM(rdx) "(%rip),%rdx\n"
+#endif
     "\tcmpxchg %bx,%cx \n"
+#ifndef VGP_amd64_darwin
     "\tmov %rax," VG_SYM(rax_out) "\n"
     "\tmov %rbx," VG_SYM(rbx_out) "\n"
     "\tmov %rcx," VG_SYM(rcx_out) "\n"
+#else
+    "\tmov %rax," VG_SYM(rax_out) "(%rip)\n"
+    "\tmov %rbx," VG_SYM(rbx_out) "(%rip)\n"
+    "\tmov %rcx," VG_SYM(rcx_out) "(%rip)\n"
+#endif
     "\tpop %rdx\n"
     "\tpop %rcx\n"
     "\tpop %rbx\n"
@@ -158,14 +210,27 @@ int main ( void )
     "\tpush %rcx\n"
     "\tpush %rdx\n"
     "\txor %rax, %rax\n" // get eflags in a known state
+#ifndef VGP_amd64_darwin
     "\tmov " VG_SYM(rax) ",%rax\n"
     "\tmov " VG_SYM(rbx) ",%rbx\n"
     "\tmov " VG_SYM(rcx) ",%rcx\n"
     "\tmov " VG_SYM(rdx) ",%rdx\n"
+#else
+    "\tmov " VG_SYM(rax) "(%rip),%rax\n"
+    "\tmov " VG_SYM(rbx) "(%rip),%rbx\n"
+    "\tmov " VG_SYM(rcx) "(%rip),%rcx\n"
+    "\tmov " VG_SYM(rdx) "(%rip),%rdx\n"
+#endif
     "\tcmpxchg %ebx,%ecx \n"
+#ifndef VGP_amd64_darwin
     "\tmov %rax," VG_SYM(rax_out) "\n"
     "\tmov %rbx," VG_SYM(rbx_out) "\n"
     "\tmov %rcx," VG_SYM(rcx_out) "\n"
+#else
+    "\tmov %rax," VG_SYM(rax_out) "(%rip)\n"
+    "\tmov %rbx," VG_SYM(rbx_out) "(%rip)\n"
+    "\tmov %rcx," VG_SYM(rcx_out) "(%rip)\n"
+#endif
     "\tpop %rdx\n"
     "\tpop %rcx\n"
     "\tpop %rbx\n"
@@ -189,14 +254,27 @@ int main ( void )
     "\tpush %rcx\n"
     "\tpush %rdx\n"
     "\txor %rax, %rax\n" // get eflags in a known state
+#ifndef VGP_amd64_darwin
     "\tmov " VG_SYM(rax) ",%rax\n"
     "\tmov " VG_SYM(rbx) ",%rbx\n"
     "\tmov " VG_SYM(rcx) ",%rcx\n"
     "\tmov " VG_SYM(rdx) ",%rdx\n"
+#else
+    "\tmov " VG_SYM(rax) "(%rip),%rax\n"
+    "\tmov " VG_SYM(rbx) "(%rip),%rbx\n"
+    "\tmov " VG_SYM(rcx) "(%rip),%rcx\n"
+    "\tmov " VG_SYM(rdx) "(%rip),%rdx\n"
+#endif
     "\tcmpxchg %ebx,%ecx \n"
+#ifndef VGP_amd64_darwin
     "\tmov %rax," VG_SYM(rax_out) "\n"
     "\tmov %rbx," VG_SYM(rbx_out) "\n"
     "\tmov %rcx," VG_SYM(rcx_out) "\n"
+#else
+    "\tmov %rax," VG_SYM(rax_out) "(%rip)\n"
+    "\tmov %rbx," VG_SYM(rbx_out) "(%rip)\n"
+    "\tmov %rcx," VG_SYM(rcx_out) "(%rip)\n"
+#endif
     "\tpop %rdx\n"
     "\tpop %rcx\n"
     "\tpop %rbx\n"
@@ -221,14 +299,27 @@ int main ( void )
     "\tpush %rcx\n"
     "\tpush %rdx\n"
     "\txor %rax, %rax\n" // get eflags in a known state
+#ifndef VGP_amd64_darwin
     "\tmov " VG_SYM(rax) ",%rax\n"
     "\tmov " VG_SYM(rbx) ",%rbx\n"
     "\tmov " VG_SYM(rcx) ",%rcx\n"
     "\tmov " VG_SYM(rdx) ",%rdx\n"
+#else
+    "\tmov " VG_SYM(rax) "(%rip),%rax\n"
+    "\tmov " VG_SYM(rbx) "(%rip),%rbx\n"
+    "\tmov " VG_SYM(rcx) "(%rip),%rcx\n"
+    "\tmov " VG_SYM(rdx) "(%rip),%rdx\n"
+#endif
     "\tcmpxchg %rbx,%rcx \n"
+#ifndef VGP_amd64_darwin
     "\tmov %rax," VG_SYM(rax_out) "\n"
     "\tmov %rbx," VG_SYM(rbx_out) "\n"
     "\tmov %rcx," VG_SYM(rcx_out) "\n"
+#else
+    "\tmov %rax," VG_SYM(rax_out) "(%rip)\n"
+    "\tmov %rbx," VG_SYM(rbx_out) "(%rip)\n"
+    "\tmov %rcx," VG_SYM(rcx_out) "(%rip)\n"
+#endif
     "\tpop %rdx\n"
     "\tpop %rcx\n"
     "\tpop %rbx\n"
@@ -252,14 +343,27 @@ int main ( void )
     "\tpush %rcx\n"
     "\tpush %rdx\n"
     "\txor %rax, %rax\n" // get eflags in a known state
+#ifndef VGP_amd64_darwin
     "\tmov " VG_SYM(rax) ",%rax\n"
     "\tmov " VG_SYM(rbx) ",%rbx\n"
     "\tmov " VG_SYM(rcx) ",%rcx\n"
     "\tmov " VG_SYM(rdx) ",%rdx\n"
+#else
+    "\tmov " VG_SYM(rax) "(%rip),%rax\n"
+    "\tmov " VG_SYM(rbx) "(%rip),%rbx\n"
+    "\tmov " VG_SYM(rcx) "(%rip),%rcx\n"
+    "\tmov " VG_SYM(rdx) "(%rip),%rdx\n"
+#endif
     "\tcmpxchg %rbx,%rcx \n"
+#ifndef VGP_amd64_darwin
     "\tmov %rax," VG_SYM(rax_out) "\n"
     "\tmov %rbx," VG_SYM(rbx_out) "\n"
     "\tmov %rcx," VG_SYM(rcx_out) "\n"
+#else
+    "\tmov %rax," VG_SYM(rax_out) "(%rip)\n"
+    "\tmov %rbx," VG_SYM(rbx_out) "(%rip)\n"
+    "\tmov %rcx," VG_SYM(rcx_out) "(%rip)\n"
+#endif
     "\tpop %rdx\n"
     "\tpop %rcx\n"
     "\tpop %rbx\n"
diff --git a/none/tests/amd64/sbbmisc.c b/none/tests/amd64/sbbmisc.c
index ef542fab87..dd70efadc2 100644
--- a/none/tests/amd64/sbbmisc.c
+++ b/none/tests/amd64/sbbmisc.c
@@ -11,15 +11,30 @@ extern void sbb_ib_al ( void );
 asm("\n"
 VG_SYM(sbb_ib_al) ":\n"
 
+#ifndef VGP_amd64_darwin
 "\tmovb " VG_SYM(in_b) ", %al\n"
+#else
+"\tmovb " VG_SYM(in_b) "(%rip), %al\n"
+#endif
+
 "\tclc\n"
 "\tsbbb $5, %al\n"
+#ifndef VGP_amd64_darwin
 "\tmovb %al, " VG_SYM(out_b1) "\n"
 
 "\tmovb " VG_SYM(in_b) ", %al\n"
+#else
+"\tmovb %al, " VG_SYM(out_b1) "(%rip)\n"
+
+"\tmovb " VG_SYM(in_b) "(%rip), %al\n"
+#endif
 "\tstc\n"
 "\tsbbb $5, %al\n"
+#ifndef VGP_amd64_darwin
 "\tmovb %al, " VG_SYM(out_b2) "\n"
+#else
+"\tmovb %al," VG_SYM(out_b2) "(%rip) \n"
+#endif
 
 "\tretq\n"
 );
@@ -29,15 +44,29 @@ extern void sbb_iw_ax ( void );
 asm("\n"
 VG_SYM(sbb_iw_ax) ":\n"
 
+#ifndef VGP_amd64_darwin
 "\tmovw " VG_SYM(in_w) ", %ax\n"
+#else
+"\tmovw " VG_SYM(in_w) "(%rip), %ax\n"
+#endif
 "\tclc\n"
 "\tsbbw $555, %ax\n"
+#ifndef VGP_amd64_darwin
 "\tmovw %ax, " VG_SYM(out_w1) "\n"
 
 "\tmovw " VG_SYM(in_w) ", %ax\n"
+#else
+"\tmovw %ax, " VG_SYM(out_w1) "(%rip)\n"
+
+"\tmovw " VG_SYM(in_w) "(%rip), %ax\n"
+#endif
 "\tstc\n"
 "\tsbbw $555, %ax\n"
+#ifndef VGP_amd64_darwin
 "\tmovw %ax, " VG_SYM(out_w2) "\n"
+#else
+"\tmovw %ax, " VG_SYM(out_w2) "(%rip)\n"
+#endif
 
 "\tretq\n"
 );
@@ -47,15 +76,29 @@ extern void sbb_il_eax ( void );
 asm("\n"
 VG_SYM(sbb_il_eax) ":\n"
 
+#ifndef VGP_amd64_darwin
 "\tmovl " VG_SYM(in_l) ", %eax\n"
+#else
+"\tmovl " VG_SYM(in_l) "(%rip), %eax\n"
+#endif
 "\tclc\n"
 "\tsbbl $555666, %eax\n"
+#ifndef VGP_amd64_darwin
 "\tmovl %eax, " VG_SYM(out_l1) "\n"
 
 "\tmovl " VG_SYM(in_l) ", %eax\n"
+#else
+"\tmovl %eax, " VG_SYM(out_l1) "(%rip)\n"
+
+"\tmovl " VG_SYM(in_l) "(%rip), %eax\n"
+#endif
 "\tstc\n"
 "\tsbbl $555666, %eax\n"
+#ifndef VGP_amd64_darwin
 "\tmovl %eax, " VG_SYM(out_l2) "\n"
+#else
+"\tmovl %eax, " VG_SYM(out_l2) "(%rip)\n"
+#endif
 
 "\tretq\n"
 );
@@ -65,15 +108,31 @@ extern void sbb_eb_gb ( void );
 asm("\n"
 VG_SYM(sbb_eb_gb) ":\n"
 
+#ifndef VGP_amd64_darwin
 "\tmovb " VG_SYM(in_b) ", %al\n"
+#else
+"\tmovb " VG_SYM(in_b) "(%rip), %al\n"
+#endif
 "\tclc\n"
+#ifndef VGP_amd64_darwin
 "\tsbbb " VG_SYM(in_b2) ", %al\n"
 "\tmovb %al, " VG_SYM(out_b1) "\n"
 
 "\tmovb " VG_SYM(in_b) ", %al\n"
+#else
+"\tsbbb " VG_SYM(in_b2) "(%rip), %al\n"
+"\tmovb %al, " VG_SYM(out_b1) "(%rip)\n"
+
+"\tmovb " VG_SYM(in_b) "(%rip), %al\n"
+#endif
 "\tstc\n"
+#ifndef VGP_amd64_darwin
 "\tsbbb " VG_SYM(in_b2) ", %al\n"
 "\tmovb %al, " VG_SYM(out_b2) "\n"
+#else
+"\tsbbb " VG_SYM(in_b2) "(%rip), %al\n"
+"\tmovb %al, " VG_SYM(out_b2) "(%rip)\n"
+#endif
 
 "\tretq\n"
 );
@@ -84,17 +143,33 @@ asm("\n"
 VG_SYM(sbb_eb_gb_2) ":\n"
 "\tpushq %rcx\n"
 
+#ifndef VGP_amd64_darwin
 "\tmovb " VG_SYM(in_b) ", %cl\n"
 "\tmovb " VG_SYM(in_b2) ", %dh\n"
+#else
+"\tmovb " VG_SYM(in_b) "(%rip), %cl\n"
+"\tmovb " VG_SYM(in_b2) "(%rip), %dh\n"
+#endif
 "\tclc\n"
 "\tsbbb %dh,%cl\n"
+#ifndef VGP_amd64_darwin
 "\tmovb %cl, " VG_SYM(out_b1) "\n"
 
 "\tmovb " VG_SYM(in_b) ", %cl\n"
 "\tmovb " VG_SYM(in_b2) ", %dh\n"
+#else
+"\tmovb %cl, " VG_SYM(out_b1) "(%rip)\n"
+
+"\tmovb " VG_SYM(in_b) "(%rip), %cl\n"
+"\tmovb " VG_SYM(in_b2) "(%rip), %dh\n"
+#endif
 "\tstc\n"
 "\tsbbb %dh,%cl\n"
+#ifndef VGP_amd64_darwin
 "\tmovb %cl, " VG_SYM(out_b2) "\n"
+#else
+"\tmovb %cl, " VG_SYM(out_b2) "(%rip)\n"
+#endif
 
 "\tpopq %rcx\n"
 "\tretq\n"
@@ -105,15 +180,31 @@ extern void adc_eb_gb ( void );
 asm("\n"
 VG_SYM(adc_eb_gb) ":\n"
 
+#ifndef VGP_amd64_darwin
 "\tmovb " VG_SYM(in_b) ", %al\n"
+#else
+"\tmovb " VG_SYM(in_b) "(%rip), %al\n"
+#endif
 "\tclc\n"
+#ifndef VGP_amd64_darwin
 "\tadcb " VG_SYM(in_b2) ", %al\n"
 "\tmovb %al, " VG_SYM(out_b1) "\n"
 
 "\tmovb " VG_SYM(in_b) ", %al\n"
+#else
+"\tadcb " VG_SYM(in_b2) "(%rip), %al\n"
+"\tmovb %al, " VG_SYM(out_b1) "(%rip)\n"
+
+"\tmovb " VG_SYM(in_b) "(%rip), %al\n"
+#endif
 "\tstc\n"
+#ifndef VGP_amd64_darwin
 "\tadcb " VG_SYM(in_b2) ", %al\n"
 "\tmovb %al, " VG_SYM(out_b2) "\n"
+#else
+"\tadcb " VG_SYM(in_b2) "(%rip), %al\n"
+"\tmovb %al, " VG_SYM(out_b2) "(%rip)\n"
+#endif
 
 "\tretq\n"
 );
@@ -124,17 +215,33 @@ asm("\n"
 VG_SYM(adc_eb_gb_2) ":\n"
 "\tpushq %rcx\n"
 
+#ifndef VGP_amd64_darwin
 "\tmovb " VG_SYM(in_b) ", %cl\n"
 "\tmovb " VG_SYM(in_b2) ", %dh\n"
+#else
+"\tmovb " VG_SYM(in_b) "(%rip), %cl\n"
+"\tmovb " VG_SYM(in_b2) "(%rip), %dh\n"
+#endif
 "\tclc\n"
 "\tadcb %dh,%cl\n"
+#ifndef VGP_amd64_darwin
 "\tmovb %cl, " VG_SYM(out_b1) "\n"
 
 "\tmovb " VG_SYM(in_b) ", %cl\n"
 "\tmovb " VG_SYM(in_b2) ", %dh\n"
+#else
+"\tmovb %cl, " VG_SYM(out_b1) "(%rip)\n"
+
+"\tmovb " VG_SYM(in_b) "(%rip), %cl\n"
+"\tmovb " VG_SYM(in_b2) "(%rip), %dh\n"
+#endif
 "\tstc\n"
 "\tadcb %dh,%cl\n"
+#ifndef VGP_amd64_darwin
 "\tmovb %cl, " VG_SYM(out_b2) "\n"
+#else
+"\tmovb %cl, " VG_SYM(out_b2) "(%rip)\n"
+#endif
 
 "\tpopq %rcx\n"
 "\tretq\n"
@@ -144,15 +251,29 @@ extern void adc_ib_al ( void );
 asm("\n"
 VG_SYM(adc_ib_al) ":\n"
 
+#ifndef VGP_amd64_darwin
 "\tmovb " VG_SYM(in_b) ", %al\n"
+#else
+"\tmovb " VG_SYM(in_b) "(%rip), %al\n"
+#endif
 "\tclc\n"
 "\tadcb $5, %al\n"
+#ifndef VGP_amd64_darwin
 "\tmovb %al, " VG_SYM(out_b1) "\n"
 
 "\tmovb " VG_SYM(in_b) ", %al\n"
+#else
+"\tmovb %al, " VG_SYM(out_b1) "(%rip)\n"
+
+"\tmovb " VG_SYM(in_b) "(%rip), %al\n"
+#endif
 "\tstc\n"
 "\tadcb $5, %al\n"
+#ifndef VGP_amd64_darwin
 "\tmovb %al, " VG_SYM(out_b2) "\n"
+#else
+"\tmovb %al, " VG_SYM(out_b2) "(%rip)\n"
+#endif
 
 "\tretq\n"
 );
@@ -162,15 +283,29 @@ extern void adc_iw_ax ( void );
 asm("\n"
 VG_SYM(adc_iw_ax) ":\n"
 
+#ifndef VGP_amd64_darwin
 "\tmovw " VG_SYM(in_w) ", %ax\n"
+#else
+"\tmovw " VG_SYM(in_w) "(%rip), %ax\n"
+#endif
 "\tclc\n"
 "\tadcw $555, %ax\n"
+#ifndef VGP_amd64_darwin
 "\tmovw %ax, " VG_SYM(out_w1) "\n"
 
 "\tmovw " VG_SYM(in_w) ", %ax\n"
+#else
+"\tmovw %ax, " VG_SYM(out_w1) "(%rip)\n"
+
+"\tmovw " VG_SYM(in_w) "(%rip), %ax\n"
+#endif
 "\tstc\n"
 "\tadcw $555, %ax\n"
+#ifndef VGP_amd64_darwin
 "\tmovw %ax, " VG_SYM(out_w2) "\n"
+#else
+"\tmovw %ax, " VG_SYM(out_w2) "(%rip)\n"
+#endif
 
 "\tretq\n"
 );
@@ -180,15 +315,29 @@ extern void adc_il_eax ( void );
 asm("\n"
 VG_SYM(adc_il_eax) ":\n"
 
+#ifndef VGP_amd64_darwin
 "\tmovl " VG_SYM(in_l) ", %eax\n"
+#else
+"\tmovl " VG_SYM(in_l) "(%rip), %eax\n"
+#endif
 "\tclc\n"
 "\tadcl $555666, %eax\n"
+#ifndef VGP_amd64_darwin
 "\tmovl %eax, " VG_SYM(out_l1) "\n"
 
 "\tmovl " VG_SYM(in_l) ", %eax\n"
+#else
+"\tmovl %eax, " VG_SYM(out_l1) "(%rip)\n"
+
+"\tmovl " VG_SYM(in_l) "(%rip), %eax\n"
+#endif
 "\tstc\n"
 "\tadcl $555666, %eax\n"
+#ifndef VGP_amd64_darwin
 "\tmovl %eax, " VG_SYM(out_l2) "\n"
+#else
+"\tmovl %eax, " VG_SYM(out_l2) "(%rip)\n"
+#endif
 
 "\tretq\n"
 );
diff --git a/none/tests/amd64/sse4-64.c b/none/tests/amd64/sse4-64.c
index 40f06c40cf..d56c789b5e 100644
--- a/none/tests/amd64/sse4-64.c
+++ b/none/tests/amd64/sse4-64.c
@@ -19,7 +19,11 @@
 
 // rmme when reintegrated
 // Allocates a 16-aligned block.  Asserts if the allocation fails.
+#ifdef VGO_darwin
+#include <stdlib.h>
+#else
 #include <malloc.h>
+#endif
 __attribute__((unused))
 static void* memalign16(size_t szB)
 {
@@ -2006,7 +2010,11 @@ void test_POPCNTQ ( void )
          "movq %0,       %%rax"  "\n\t"
          "movq 0(%%rax), %%rdi"  "\n\t"
          "movq 8(%%rax), %%r11"  "\n\t"
+#ifndef VGP_amd64_darwin
          "popcntq %%rdi, %%r11"  "\n\t"
+#else
+         "popcnt  %%rdi, %%r11"  "\n\t"
+#endif
          "movq %%r11, 16(%%rax)"  "\n\t"
          "pushfq"                 "\n\t"
          "popq %%r12"             "\n\t"
@@ -2025,7 +2033,11 @@ void test_POPCNTQ ( void )
       __asm__ __volatile__(
          "movq %0,       %%rax"  "\n\t"
          "movq 8(%%rax), %%r11"  "\n\t"
+#ifndef VGP_amd64_darwin
          "popcntq 0(%%rax), %%r11"  "\n\t"
+#else
+         "popcnt  0(%%rax), %%r11"  "\n\t"
+#endif
          "movq %%r11, 16(%%rax)"  "\n\t"
          "pushfq"                 "\n\t"
          "popq %%r12"             "\n\t"
@@ -2054,7 +2066,11 @@ void test_POPCNTL ( void )
          "movq %0,       %%rax"  "\n\t"
          "movq 0(%%rax), %%rdi"  "\n\t"
          "movq 8(%%rax), %%r11"  "\n\t"
+#ifndef VGP_amd64_darwin
          "popcntl %%edi, %%r11d"  "\n\t"
+#else
+         "popcnt  %%edi, %%r11d"  "\n\t"
+#endif
          "movq %%r11, 16(%%rax)"  "\n\t"
          "pushfq"                 "\n\t"
          "popq %%r12"             "\n\t"
@@ -2073,7 +2089,11 @@ void test_POPCNTL ( void )
       __asm__ __volatile__(
          "movq %0,       %%rax"  "\n\t"
          "movq 8(%%rax), %%r11"  "\n\t"
+#ifndef VGP_amd64_darwin
          "popcntl 0(%%rax), %%r11d"  "\n\t"
+#else
+         "popcnt  0(%%rax), %%r11d"  "\n\t"
+#endif
          "movq %%r11, 16(%%rax)"  "\n\t"
          "pushfq"                 "\n\t"
          "popq %%r12"             "\n\t"
@@ -2102,7 +2122,11 @@ void test_POPCNTW ( void )
          "movq %0,       %%rax"  "\n\t"
          "movq 0(%%rax), %%rdi"  "\n\t"
          "movq 8(%%rax), %%r11"  "\n\t"
+#ifndef VGP_amd64_darwin
          "popcntw %%di,  %%r11w"  "\n\t"
+#else
+         "popcnt  %%di,  %%r11w"  "\n\t"
+#endif
          "movq %%r11, 16(%%rax)"  "\n\t"
          "pushfq"                 "\n\t"
          "popq %%r12"             "\n\t"
@@ -2121,7 +2145,11 @@ void test_POPCNTW ( void )
       __asm__ __volatile__(
          "movq %0,       %%rax"  "\n\t"
          "movq 8(%%rax), %%r11"  "\n\t"
+#ifndef VGP_amd64_darwin
          "popcntw 0(%%rax), %%r11w"  "\n\t"
+#else
+         "popcnt  0(%%rax), %%r11w"  "\n\t"
+#endif
          "movq %%r11, 16(%%rax)"  "\n\t"
          "pushfq"                 "\n\t"
          "popq %%r12"             "\n\t"