Incorrect x86 CPU family and model check.

This commit is contained in:
H.J. Lu 2010-05-27 11:14:18 -07:00 committed by Ulrich Drepper
parent d2f7315176
commit 3c88fe1e3a
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2010-05-26 H.J. Lu <hongjiu.lu@intel.com>
[BZ #11640]
* sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
Properly check family and model.
2010-05-26 Takashi Yoshii <takashi.yoshii.zj@renesas.com>
* sysdeps/unix/sysv/linux/sh/sh4/register-dump.h: Fix iov[] size.

View File

@ -62,15 +62,15 @@ __init_cpu_features (void)
unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax;
unsigned int extended_family = (eax >> 20) & 0xff;
unsigned int extended_model = (eax >> 12) & 0xf0;
if (__cpu_features.family == 0x0f)
if (family == 0x0f)
{
family += extended_family;
model += extended_model;
}
else if (__cpu_features.family == 0x06)
else if (family == 0x06)
{
model += extended_model;
switch (__cpu_features.model)
switch (model)
{
case 0x1a:
case 0x1e: