|
From: <sv...@va...> - 2009-04-24 06:25:21
|
Author: njn
Date: 2009-04-24 07:25:15 +0100 (Fri, 24 Apr 2009)
New Revision: 9602
Log:
Make cpuid pass.
Modified:
branches/DARWIN/cachegrind/tests/x86/Makefile.am
branches/DARWIN/none/tests/x86/Makefile.am
branches/DARWIN/none/tests/x86/cpuid_s.s
Modified: branches/DARWIN/cachegrind/tests/x86/Makefile.am
===================================================================
--- branches/DARWIN/cachegrind/tests/x86/Makefile.am 2009-04-24 04:57:07 UTC (rev 9601)
+++ branches/DARWIN/cachegrind/tests/x86/Makefile.am 2009-04-24 06:25:15 UTC (rev 9602)
@@ -12,6 +12,6 @@
AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
-AM_CCASFLAGS = @FLAG_M32@
+AM_CCASFLAGS = $(AM_CPPFLAGS) @FLAG_M32@
fpu_28_108_SOURCES = fpu-28-108.S
Modified: branches/DARWIN/none/tests/x86/Makefile.am
===================================================================
--- branches/DARWIN/none/tests/x86/Makefile.am 2009-04-24 04:57:07 UTC (rev 9601)
+++ branches/DARWIN/none/tests/x86/Makefile.am 2009-04-24 06:25:15 UTC (rev 9602)
@@ -65,6 +65,7 @@
bug137714-x86 \
bug152818-x86 \
cmpxchg8b \
+ cpuid \
cse_fail \
faultstatus \
fcmovnu \
@@ -86,16 +87,10 @@
check_PROGRAMS += ssse3_misaligned
endif
-# DDD: not sure if these ones should work on Darwin or not... if not, should
-# be moved into x86-linux/.
-if ! VGCONF_OS_IS_DARWIN
- check_PROGRAMS += \
- cpuid
-endif
AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
-AM_CCASFLAGS = @FLAG_M32@
+AM_CCASFLAGS = $(AM_CPPFLAGS) @FLAG_M32@
# Some of the tests (bug125959_x86, bug152818_x86, insn_*) need
# -mdynamic-no-pic. I tried setting *_CFLAGS separately for all of them,
Modified: branches/DARWIN/none/tests/x86/cpuid_s.s
===================================================================
--- branches/DARWIN/none/tests/x86/cpuid_s.s 2009-04-24 04:57:07 UTC (rev 9601)
+++ branches/DARWIN/none/tests/x86/cpuid_s.s 2009-04-24 06:25:15 UTC (rev 9602)
@@ -1,4 +1,4 @@
-
+#include "tests/asm.h"
.file "oneparam.c"
.version "01.01"
@@ -6,9 +6,8 @@
.text
.align 4
-.globl get_cpuid0
- .type get_cpuid0,@function
-get_cpuid0:
+.globl VG_SYM_ASM(get_cpuid0)
+VG_SYM_ASM(get_cpuid0):
pushl %ebp
movl %esp, %ebp
movl 8(%ebp), %eax
@@ -35,13 +34,10 @@
popl %ebp
ret
-.Lfe1:
- .size get_cpuid0,.Lfe1-get_cpuid0
-.globl get_cpuid1
- .type get_cpuid1,@function
-get_cpuid1:
+.globl VG_SYM_ASM(get_cpuid1)
+VG_SYM_ASM(get_cpuid1):
pushl %ebp
movl %esp, %ebp
movl 8(%ebp), %eax
@@ -68,8 +64,6 @@
popl %ebp
ret
-.Lfe2:
- .size get_cpuid1,.Lfe2-get_cpuid1
|