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.11-315-g22f4f44
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 4 Apr 2010 07:26:11 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.11-315-g22f4f44
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 22f4f44b6727887957aa1d4039eba290b064da63 (commit)
from 1a81139728494810f65aaa0d0c538ff8c2783dd5 (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=22f4f44b6727887957aa1d4039eba290b064da63
commit 22f4f44b6727887957aa1d4039eba290b064da63
Author: Ulrich Drepper <drepper@redhat.com>
Date: Sun Apr 4 00:25:46 2010 -0700
Fix concurrent handling of __cpu_features.
diff --git a/ChangeLog b/ChangeLog
index 91ae105..99aa680 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-04-04 H.J. Lu <hongjiu.lu@intel.com>
+ Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #11292]
+ * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features): Allow
+ concurrent initialization and use of __cpu_features.
+
+2010-04-04 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/x86_64/multiarch/init-arch.h (cpu_features): Add tag to
+ the enum.
+
2010-04-03 Ulrich Drepper <drepper@redhat.com>
[BZ #11333]
diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
index 50b2a38..efb89b6 100644
--- a/sysdeps/x86_64/multiarch/init-arch.c
+++ b/sysdeps/x86_64/multiarch/init-arch.c
@@ -1,6 +1,6 @@
/* Initialize CPU feature data.
This file is part of the GNU C Library.
- Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@redhat.com>.
The GNU C Library is free software; you can redistribute it and/or
@@ -18,6 +18,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <atomic.h>
#include <cpuid.h>
#include "init-arch.h"
@@ -26,7 +27,7 @@ struct cpu_features __cpu_features attribute_hidden;
static void
-get_common_indeces (void)
+get_common_indeces (unsigned int *family, unsigned int *model)
{
__cpuid (1, __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax,
__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ebx,
@@ -34,8 +35,8 @@ get_common_indeces (void)
__cpu_features.cpuid[COMMON_CPUID_INDEX_1].edx);
unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax;
- __cpu_features.family = (eax >> 8) & 0x0f;
- __cpu_features.model = (eax >> 4) & 0x0f;
+ *family = (eax >> 8) & 0x0f;
+ *model = (eax >> 4) & 0x0f;
}
@@ -45,27 +46,30 @@ __init_cpu_features (void)
unsigned int ebx;
unsigned int ecx;
unsigned int edx;
+ unsigned int family = 0;
+ unsigned int model = 0;
+ enum cpu_features_kind kind;
__cpuid (0, __cpu_features.max_cpuid, ebx, ecx, edx);
/* This spells out "GenuineIntel". */
if (ebx == 0x756e6547 && ecx == 0x6c65746e && edx == 0x49656e69)
{
- __cpu_features.kind = arch_kind_intel;
+ kind = arch_kind_intel;
- get_common_indeces ();
+ get_common_indeces (&family, &model);
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)
{
- __cpu_features.family += extended_family;
- __cpu_features.model += extended_model;
+ family += extended_family;
+ model += extended_model;
}
else if (__cpu_features.family == 0x06)
{
- __cpu_features.model += extended_model;
+ model += extended_model;
switch (__cpu_features.model)
{
case 0x1a:
@@ -85,12 +89,17 @@ __init_cpu_features (void)
/* This spells out "AuthenticAMD". */
else if (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65)
{
- __cpu_features.kind = arch_kind_amd;
+ kind = arch_kind_amd;
- get_common_indeces ();
+ get_common_indeces (&family, &model);
}
else
- __cpu_features.kind = arch_kind_other;
+ kind = arch_kind_other;
+
+ __cpu_features.family = family;
+ __cpu_features.model = model;
+ atomic_write_barrier ();
+ __cpu_features.kind = kind;
}
#undef __get_cpu_features
diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
index 69492cb..5c73813 100644
--- a/sysdeps/x86_64/multiarch/init-arch.h
+++ b/sysdeps/x86_64/multiarch/init-arch.h
@@ -1,5 +1,5 @@
/* This file is part of the GNU C Library.
- Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -52,7 +52,7 @@ enum
extern struct cpu_features
{
- enum
+ enum cpu_features_kind
{
arch_kind_unknown = 0,
arch_kind_intel,
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 12 ++++++++++++
sysdeps/x86_64/multiarch/init-arch.c | 33 +++++++++++++++++++++------------
sysdeps/x86_64/multiarch/init-arch.h | 4 ++--
3 files changed, 35 insertions(+), 14 deletions(-)
hooks/post-receive
--
GNU C Library master sources