| Index: src/base/cpu.cc
 | 
| diff --git a/src/base/cpu.cc b/src/base/cpu.cc
 | 
| index 16eb7c9a85a6645dd2b5e2e7b67923ebd9bcf75e..775719292065716e86ac758e26e27e7e51b36735 100644
 | 
| --- a/src/base/cpu.cc
 | 
| +++ b/src/base/cpu.cc
 | 
| @@ -44,9 +44,7 @@
 | 
|  namespace v8 {
 | 
|  namespace base {
 | 
|  
 | 
| -#if defined(__pnacl__)
 | 
| -// Portable host shouldn't do feature detection.
 | 
| -#elif V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64
 | 
| +#if V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64
 | 
|  
 | 
|  // Define __cpuid() for non-MSVC libraries.
 | 
|  #if !V8_LIBC_MSVCRT
 | 
| @@ -341,11 +339,7 @@ CPU::CPU()
 | 
|        is_fp64_mode_(false),
 | 
|        has_non_stop_time_stamp_counter_(false) {
 | 
|    memcpy(vendor_, "Unknown", 8);
 | 
| -#if V8_OS_NACL
 | 
| -// Portable host shouldn't do feature detection.
 | 
| -// TODO(jfb): Remove the hardcoded ARM simulator flags in the build, and
 | 
| -// hardcode them here instead.
 | 
| -#elif V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64
 | 
| +#if V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64
 | 
|    int cpu_info[4];
 | 
|  
 | 
|    // __cpuid with an InfoType argument of 0 returns the number of
 | 
| 
 |