Merge branch 'upstream-kwsys' into update-kwsys
This commit is contained in:
commit
ed6ddb89bf
|
@ -5023,12 +5023,16 @@ 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;
|
||||
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
|
||||
|
@ -5038,6 +5042,7 @@ bool SystemInformationImplementation::QueryHPUXProcessor()
|
|||
this->ChipID.Vendor = "GenuineIntel";
|
||||
this->Features.HasIA64 = true;
|
||||
break;
|
||||
# endif
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue