Merge r9897 (x86_amd64_features.c simplifcation) from the DARWIN branch.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9898 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/tests/x86_amd64_features.c b/tests/x86_amd64_features.c
index 8d5750c..9d17805 100644
--- a/tests/x86_amd64_features.c
+++ b/tests/x86_amd64_features.c
@@ -17,10 +17,8 @@
#define True 1
typedef int Bool;
-//---------------------------------------------------------------------------
-// {x86,amd64}-linux (part 1 of 2)
-//---------------------------------------------------------------------------
-#if defined(VGP_x86_linux) || defined(VGP_amd64_linux)
+
+#if defined(VGA_x86) || defined(VGA_amd64)
static void cpuid ( unsigned int n,
unsigned int* a, unsigned int* b,
unsigned int* c, unsigned int* d )
@@ -31,12 +29,6 @@
: "0" (n) /* input */
);
}
-#endif // VGP_x86_linux || VGP_amd64_linux
-
-//---------------------------------------------------------------------------
-// {x86,amd64}-linux (part 2 of 2)
-//---------------------------------------------------------------------------
-#if defined(VGA_x86) || defined(VGA_amd64)
static Bool go(char* cpu)
{
unsigned int level = 0, cmask = 0, dmask = 0, a, b, c, d;