kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
KWSys Robot 2014-03-19 15:21:09 -04:00 committed by Brad King
parent c1dde67e62
commit 12faf00d71
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SystemInformation.cxx
View File

@ -5023,21 +5023,26 @@ bool SystemInformationImplementation::QueryHPUXProcessor()
case CPU_PA_RISC1_0: case CPU_PA_RISC1_0:
this->ChipID.Vendor = "Hewlett-Packard"; this->ChipID.Vendor = "Hewlett-Packard";
this->ChipID.Family = 0x100; this->ChipID.Family = 0x100;
break;
case CPU_PA_RISC1_1: case CPU_PA_RISC1_1:
this->ChipID.Vendor = "Hewlett-Packard"; this->ChipID.Vendor = "Hewlett-Packard";
this->ChipID.Family = 0x110; this->ChipID.Family = 0x110;
break;
case CPU_PA_RISC2_0: case CPU_PA_RISC2_0:
this->ChipID.Vendor = "Hewlett-Packard"; this->ChipID.Vendor = "Hewlett-Packard";
this->ChipID.Family = 0x200; 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: case CPU_HP_INTEL_EM_1_0:
# endif # endif
# ifdef CPU_IA64_ARCHREV_0 # ifdef CPU_IA64_ARCHREV_0
case CPU_IA64_ARCHREV_0: case CPU_IA64_ARCHREV_0:
# endif # endif
this->ChipID.Vendor = "GenuineIntel"; this->ChipID.Vendor = "GenuineIntel";
this->Features.HasIA64 = true; this->Features.HasIA64 = true;
break; break;
# endif
default: default:
return false; return false;
} }