diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-20 13:42:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-20 13:42:27 (GMT) |
| commit | ed6ddb89bf84e7835f65b33572981551db667c74 (patch) | |
| tree | d701527b5e60a4a13b4a90cd05f8d76b8f9f2f62 | |
| parent | 0f79dab48bf17e867fe19a7b7140fa7513f4b72d (diff) | |
| parent | 12faf00d71e9a9d9f48ee13ef9dd0011fa95c385 (diff) | |
| download | CMake-ed6ddb89bf84e7835f65b33572981551db667c74.zip CMake-ed6ddb89bf84e7835f65b33572981551db667c74.tar.gz CMake-ed6ddb89bf84e7835f65b33572981551db667c74.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 9c26380..720a7c3 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -5023,21 +5023,26 @@ bool SystemInformationImplementation::QueryHPUXProcessor() case CPU_PA_RISC1_0: this->ChipID.Vendor = "Hewlett-Packard"; this->ChipID.Family = 0x100; + break; case CPU_PA_RISC1_1: this->ChipID.Vendor = "Hewlett-Packard"; this->ChipID.Family = 0x110; + break; case CPU_PA_RISC2_0: this->ChipID.Vendor = "Hewlett-Packard"; this->ChipID.Family = 0x200; -# ifdef CPU_HP_INTEL_EM_1_0 + break; +# if defined(CPU_HP_INTEL_EM_1_0) || defined(CPU_IA64_ARCHREV_0) +# ifdef CPU_HP_INTEL_EM_1_0 case CPU_HP_INTEL_EM_1_0: -# endif -# ifdef CPU_IA64_ARCHREV_0 +# endif +# ifdef CPU_IA64_ARCHREV_0 case CPU_IA64_ARCHREV_0: -# endif +# endif this->ChipID.Vendor = "GenuineIntel"; this->Features.HasIA64 = true; break; +# endif default: return false; } |