Chromium Code Reviews| Index: src/trusted/platform_qualify/arch/x86/vcpuid.c |
| diff --git a/src/trusted/platform_qualify/arch/x86/vcpuid.c b/src/trusted/platform_qualify/arch/x86/vcpuid.c |
| index 9d123062bbedd88c67bd8fa76ee27f8f7b592002..93c1f5b17a9f471a3f3cc9cb1985d1cde19809cc 100644 |
| --- a/src/trusted/platform_qualify/arch/x86/vcpuid.c |
| +++ b/src/trusted/platform_qualify/arch/x86/vcpuid.c |
| @@ -490,6 +490,7 @@ static int DoTest(int (*thetest)(void), const char *s) { |
| # error Please specify platform as NACL_LINUX, NACL_OSX or NACL_WINDOWS |
| #endif |
| +#if !(NACL_WINDOWS && (NACL_BUILD_SUBARCH == 64)) |
|
Roland McGrath
2015/12/05 11:07:46
It would be better to factor out the caller code t
Nico
2015/12/05 15:35:38
Done, but seems somewhat out of scope for this par
|
| static int DoCPUFeatureTest(NaClCPUFeaturesX86 *features, |
| NaClCPUFeatureX86ID id, |
| int (*thetest)(void)) { |
| @@ -498,6 +499,7 @@ static int DoCPUFeatureTest(NaClCPUFeaturesX86 *features, |
| else |
| return 0; |
| } |
| +#endif /* 64-bit Windows */ |
| static void PrintFail(const char *why) { |
| fprintf(stderr, "ERROR: %s.\n", why); |