From: Nicholas Nethercote <njn@valgrind.org>
Date: Fri, 24 Apr 2009 07:24:05 +0000 (+0000)
Subject: Merge r9605 (make tronical work on Darwin) from the DARWIN branch.
X-Git-Tag: svn/VALGRIND_3_5_0~788
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97a1106e27dcdcf342b7e8f4741f3a25c963bb37;p=thirdparty%2Fvalgrind.git

Merge r9605 (make tronical work on Darwin) from the DARWIN branch.



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

diff --git a/memcheck/tests/x86/Makefile.am b/memcheck/tests/x86/Makefile.am
index 49c9d3fb1a..fca09994d5 100644
--- a/memcheck/tests/x86/Makefile.am
+++ b/memcheck/tests/x86/Makefile.am
@@ -30,15 +30,15 @@ check_PROGRAMS = \
 	espindola2 \
 	int3-x86 \
 	fpeflags \
-        fprem \
-        fxsave \
+	fprem \
+	fxsave \
 	more_x86_fp \
-        pushfpopf \
+	pushfpopf \
 	pushfw_x86 \
 	pushpopmem \
-        sse_memory \
-        tronical \
-        xor-undef-x86
+	sse_memory \
+	tronical \
+	xor-undef-x86
 
 AM_CFLAGS   += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
 AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
diff --git a/memcheck/tests/x86/tronical.S b/memcheck/tests/x86/tronical.S
index c7ff61b326..9af3a184ad 100644
--- a/memcheck/tests/x86/tronical.S
+++ b/memcheck/tests/x86/tronical.S
@@ -49,13 +49,14 @@ int main()
 
 */
 
+#include "tests/asm.h"
+
 	.file	"tronical.c"
 	.version	"01.01"
 gcc2_compiled.:
 .text
 	.align 4
 .globl set
-	.type	 set,@function
 set:
 	pushl	%ebp
 	movl	foo, %eax
@@ -64,14 +65,11 @@ set:
 	popl	%ebp
 	ret
 .Lfe1:
-	.size	 set,.Lfe1-set
-	.section	.rodata
 .LC0:
-	.string	"blieb\n"
+	.ascii	"blieb\n"
 .text
 	.align 4
 .globl get
-	.type	 get,@function
 get:
 	pushl	%ebp
 	movl	%esp, %ebp
@@ -81,22 +79,20 @@ get:
 	js	.L4
 	subl	$12, %esp
 	pushl	$.LC0
-	call	printf
+	call	VG_SYM_ASM(printf)
 	addl	$16, %esp
 .L4:
 	leave
 	ret
 .Lfe2:
-	.size	 get,.Lfe2-get
 	.align 4
-.globl main
-	.type	 main,@function
-main:
+.globl VG_SYM_ASM(main)
+VG_SYM_ASM(main):
 	pushl	%ebp
 	movl	%esp, %ebp
 	subl	$20, %esp
 	pushl	$4
-	call	malloc
+	call	VG_SYM_ASM(malloc)
 	movl	%eax, foo
 	call	set
 	call	get
@@ -104,6 +100,5 @@ main:
 	leave
 	ret
 .Lfe3:
-	.size	 main,.Lfe3-main
 	.comm	foo,4,4
 	.ident	"GCC: (GNU) 2.96 20000731 (Red Hat Linux 7.1 2.96-98)"