|
From: <sv...@va...> - 2009-04-24 07:14:44
|
Author: njn
Date: 2009-04-24 08:14:38 +0100 (Fri, 24 Apr 2009)
New Revision: 9605
Log:
Make tronical build and run on Darwin. Unfortunately it doesn't pass
because of some bogus output about UUIDs.
Modified:
branches/DARWIN/memcheck/tests/x86/Makefile.am
branches/DARWIN/memcheck/tests/x86/tronical.S
Modified: branches/DARWIN/memcheck/tests/x86/Makefile.am
===================================================================
--- branches/DARWIN/memcheck/tests/x86/Makefile.am 2009-04-24 07:12:39 UTC (rev 9604)
+++ branches/DARWIN/memcheck/tests/x86/Makefile.am 2009-04-24 07:14:38 UTC (rev 9605)
@@ -34,6 +34,7 @@
pushfw_x86 \
pushpopmem \
sse_memory \
+ tronical \
xor-undef-x86
# DDD: not sure if these ones should work on Darwin or not... if not, should
@@ -42,8 +43,7 @@
check_PROGRAMS += \
int3-x86 \
more_x86_fp \
- pushfpopf \
- tronical
+ pushfpopf
endif
AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
Modified: branches/DARWIN/memcheck/tests/x86/tronical.S
===================================================================
--- branches/DARWIN/memcheck/tests/x86/tronical.S 2009-04-24 07:12:39 UTC (rev 9604)
+++ branches/DARWIN/memcheck/tests/x86/tronical.S 2009-04-24 07:14:38 UTC (rev 9605)
@@ -49,13 +49,14 @@
*/
+#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 @@
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 @@
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 @@
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)"
|