This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.12-26-g3c88fe1
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 May 2010 18:14:42 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.12-26-g3c88fe1
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 3c88fe1e3ab8c6115e9b0c6eb109718da2116a33 (commit)
from d2f73151763c27173d9a771cea722380d7fc61c2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3c88fe1e3ab8c6115e9b0c6eb109718da2116a33
commit 3c88fe1e3ab8c6115e9b0c6eb109718da2116a33
Author: H.J. Lu <hongjiu.lu@intel.com>
Date: Thu May 27 11:14:18 2010 -0700
Incorrect x86 CPU family and model check.
diff --git a/ChangeLog b/ChangeLog
index e5866bf..e43e757 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
index efb89b6..f13a9f4 100644
--- a/sysdeps/x86_64/multiarch/init-arch.c
+++ b/sysdeps/x86_64/multiarch/init-arch.c
@@ -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:
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/x86_64/multiarch/init-arch.c | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources