Merged r9602 and r9603 (make cpuid pass on Darwin, rename .s files to .S)

from the DARWIN branch.

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

diff --git a/cachegrind/tests/x86/Makefile.am b/cachegrind/tests/x86/Makefile.am
index 8c8e7e24a794332b24f7470604f544264e52ea17..db9a8758678b9884c6d13536aad912268775585f 100644 (file)
--- a/cachegrind/tests/x86/Makefile.am
+++ b/cachegrind/tests/x86/Makefile.am
@@ -12,6 +12,6 @@ check_PROGRAMS = \
 
 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

diff --git a/memcheck/tests/x86/Makefile.am b/memcheck/tests/x86/Makefile.am
index bba38b5737042a2a2ff4cb37a01b5fa67b62f0b2..49c9d3fb1a803486d1550afb3a23c4edfe0d3705 100644 (file)
--- a/memcheck/tests/x86/Makefile.am
+++ b/memcheck/tests/x86/Makefile.am
@@ -46,7 +46,7 @@ AM_CCASFLAGS = @FLAG_M32@
 
 # must be built with these flags -- bug only occurred with them
 fpeflags_CFLAGS                = $(AM_CFLAGS) -march=i686
-pushfpopf_SOURCES      = pushfpopf_c.c pushfpopf_s.s
+pushfpopf_SOURCES      = pushfpopf_c.c pushfpopf_s.S
 tronical_SOURCES       = tronical.S
 
 more_x86_fp_LDADD      = -lm

diff --git a/memcheck/tests/x86/pushfpopf_s.s b/memcheck/tests/x86/pushfpopf_s.S
similarity index 100%
rename from memcheck/tests/x86/pushfpopf_s.s
rename to memcheck/tests/x86/pushfpopf_s.S

diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
index 5ddfeb2bd05414aebf6f213392eb1c82dab51eaa..bce98a83f528ed2712c1f0cf489b2a765ea51112 100644 (file)
--- a/none/tests/x86/Makefile.am
+++ b/none/tests/x86/Makefile.am
@@ -67,8 +67,8 @@ check_PROGRAMS = \
        bug137714-x86 \
        bug152818-x86 \
        cmpxchg8b \
-        cpuid \
-        cse_fail \
+       cpuid \
+       cse_fail \
        faultstatus \
         fcmovnu \
         fpu_lazy_eflags \
@@ -89,13 +89,14 @@ if BUILD_SSSE3_TESTS
  check_PROGRAMS += ssse3_misaligned
 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@
 
 
 # generic C ones
-cpuid_SOURCES          = cpuid_c.c cpuid_s.s
+cpuid_SOURCES          = cpuid_c.c cpuid_s.S
 # fpu_lazy_eflags must use these flags -- the bug only occurred with them
 fpu_lazy_eflags_CFLAGS = $(AM_CFLAGS) -O2 -march=pentiumpro
 fxtract_LDADD          = -lm

diff --git a/none/tests/x86/cpuid_s.s b/none/tests/x86/cpuid_s.S
similarity index 78%
rename from none/tests/x86/cpuid_s.s
rename to none/tests/x86/cpuid_s.S
index 27bcc935da9ad584bfc9cd291be0e5b089486323..3dabdcd01e620bab576adacfc21303b582b5ad5b 100644 (file)
--- a/none/tests/x86/cpuid_s.s
+++ b/none/tests/x86/cpuid_s.S
@@ -1,4 +1,4 @@
-
+#include "tests/asm.h"
        
        .file   "oneparam.c"
        .version        "01.01"
@@ -6,9 +6,8 @@ gcc2_compiled.:
 .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 @@ get_cpuid0:
        
        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 @@ get_cpuid1:
        
        popl    %ebp
        ret
-.Lfe2:
-       .size    get_cpuid1,.Lfe2-get_cpuid1