From: Nicholas Nethercote <njn@valgrind.org>
Date: Wed, 4 Mar 2009 01:23:04 +0000 (+0000)
Subject: Remove darwin code that crept into the trunk.
X-Git-Tag: svn/VALGRIND_3_5_0~905
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bd30d545e900f0580058f895ea3277423cc0983;p=thirdparty%2Fvalgrind.git

Remove darwin code that crept into the trunk.



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

diff --git a/tests/arch_test.c b/tests/arch_test.c
index 398cb67e6f..feeb67e03c 100644
--- a/tests/arch_test.c
+++ b/tests/arch_test.c
@@ -92,39 +92,9 @@ static void cpuid ( unsigned int n,
 #endif   // VGP_x86_linux || VGP_amd64_linux
 
 //---------------------------------------------------------------------------
-// {x86,amd64}-darwin (part 1 of 2)
+// {x86,amd64}-linux (part 2 of 2)
 //---------------------------------------------------------------------------
-#if defined(VGP_x86_darwin) || defined(VGP_amd64_darwin)
-static void cpuid ( unsigned int n,
-                    unsigned int* a, unsigned int* b,
-                    unsigned int* c, unsigned int* d )
-{
-   __asm__ __volatile__ (
-       "pushl %%eax\n\t"
-       "pushl %%ebx\n\t"
-       "pushl %%ecx\n\t"
-       "pushl %%edx\n\t"
-       "movl %4, %%eax\n\t"
-       "cpuid\n\t"
-       "movl %%eax,%0\n\t"
-       "movl %%ebx,%1\n\t"
-       "movl %%ecx,%2\n\t"
-       "movl %%edx,%3\n\t"
-       "popl %%edx\n\t"
-       "popl %%ecx\n\t"
-       "popl %%ebx\n\t"
-       "popl %%eax\n\t"
-       : "=m" (*a), "=m" (*b), "=m" (*c), "=m" (*d)
-       : "mr" (n)
-       );
-}
-#endif   // VGP_x86_darwin || VGP_amd64_darwin
-
-//---------------------------------------------------------------------------
-// {x86,amd64}-{linux,darwin} (part 2 of 2)
-//---------------------------------------------------------------------------
-#if defined(VGP_x86_linux)  || defined(VGP_amd64_linux) || \
-    defined(VGP_x86_darwin) || defined(VGP_amd64_darwin)
+#if defined(VGP_x86_linux)  || defined(VGP_amd64_linux)
 static Bool go(char* cpu)
 { 
    unsigned int level = 0, cmask = 0, dmask = 0, a, b, c, d;
@@ -182,8 +152,7 @@ static Bool go(char* cpu)
    }
    return False;
 }
-#endif   // VGP_x86_linux  || VGP_amd64_linux ||
-         // VGP_x86_darwin || VGP_amd64_darwin
+#endif   // VGP_x86_linux  || VGP_amd64_linux
 
 
 //---------------------------------------------------------------------------