--- valgrind-3.2.0/tests/Makefile.am.fix-only64bit	2006-06-14 17:20:30 +0400

+++ valgrind-3.2.0/tests/Makefile.am	2006-06-14 18:09:52 +0400

@@ -25,6 +25,12 @@

 # generic C ones

 cputest_SOURCES 	= cputest.c

 cputest_CFLAGS  	= $(AM_CFLAGS) -D__$(VG_ARCH)__

+if VG_X86_LINUX

+cputest_CFLAGS		+= -DVG_X86_LINUX

+endif

+if VG_AMD64_LINUX

+cputest_CFLAGS		+= -DVG_AMD64_LINUX

+endif

 cputest_DEPENDENCIES	= 

 cputest_LDADD		= 

 toobig_allocs_SOURCES	= toobig-allocs.c

--- valgrind-3.2.0/tests/cputest.c.fix-only64bit	2006-06-14 17:20:30 +0400

+++ valgrind-3.2.0/tests/cputest.c	2006-06-14 18:16:34 +0400

@@ -58,7 +58,9 @@

 { 

    unsigned int level = 0, mask = 0, a, b, c, d;

-   if ( strcmp( cpu, "x86" ) == 0 ) {

+   if ( 0 ) {

+#if defined(VG_X86_LINUX)

+   } else if ( strcmp( cpu, "x86" ) == 0 ) {

      return True;

    } else if ( strcmp( cpu, "x86-fpu" ) == 0 ) {

      level = 1;

@@ -78,7 +80,8 @@

    } else if ( strcmp( cpu, "x86-sse2" ) == 0 ) {

      level = 1;

      mask = 1 << 26;

-#if defined(__x86_64__)

+#endif

+#if defined(VG_AMD64_LINUX)

    } else if ( strcmp( cpu, "amd64" ) == 0 ) {

      return True;

 #endif