From 12faf00d71e9a9d9f48ee13ef9dd0011fa95c385 Mon Sep 17 00:00:00 2001 From: KWSys Robot Date: Wed, 19 Mar 2014 15:21:09 -0400 Subject: KWSys 2014-03-19 (a8aa1014) Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ a8aa1014 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' dd873734..a8aa1014 Gerhard Grimm (1): fa86f1ba SystemInformation: Fix HP-UX PA-RISC processor detection Rolf Eike Beer (1): a8aa1014 SystemInformation: Fix HP-UX Intel processor detection Change-Id: I5891a6898cc73caf1b2be98859d5d4b11a24c5df --- SystemInformation.cxx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/SystemInformation.cxx b/SystemInformation.cxx index 9c26380..720a7c3 100644 --- a/SystemInformation.cxx +++ b/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; } -- cgit v0.12