Merge r9612 (make pushfpopf work on Darwin) from the DARWIN branch.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9613 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/tests/x86/pushfpopf_s.S b/memcheck/tests/x86/pushfpopf_s.S
index 23e297f..2bc43e8 100644
--- a/memcheck/tests/x86/pushfpopf_s.S
+++ b/memcheck/tests/x86/pushfpopf_s.S
@@ -1,11 +1,11 @@
-	.file	"twoparams.c"
+#include "tests/asm.h"
+
 	.version	"01.01"
 gcc2_compiled.:
 .text
 	.align 4
-.globl fooble
-	.type	 fooble,@function
-fooble:
+.globl VG_SYM_ASM(fooble)
+VG_SYM_ASM(fooble):
 	pushl	%ebp
 	movl	%esp, %ebp
 	movl	8(%ebp), %eax
@@ -37,5 +37,4 @@
 	popl	%ebp
 	ret
 .Lfe1:
-	.size	 fooble,.Lfe1-fooble
 	.ident	"GCC: (GNU) 2.96 20000731 (Red Hat Linux 7.1 2.96-98)"