r4307 - in glibc-package/trunk/debian: . patches patches/amd64
Author: aurel32
Date: 2010-05-31 20:29:51 +0000 (Mon, 31 May 2010)
New Revision: 4307
Added:
glibc-package/trunk/debian/patches/amd64/submitted-cpuid.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add patches/amd64/submitted-cpuid.diff to fix properly check CPU
family and model.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-05-30 18:42:14 UTC (rev 4306)
+++ glibc-package/trunk/debian/changelog 2010-05-31 20:29:51 UTC (rev 4307)
@@ -8,8 +8,10 @@
* Update tst-ttyname_r.out error value in expected-results-i486-gnu-libc
as part of the test is now passing.
* Add patches/mips/cvs-mips-atomic_h.diff to fix atomic issues on MIPS.
+ * Add patches/amd64/submitted-cpuid.diff to fix properly check CPU
+ family and model.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 30 May 2010 19:13:01 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 31 May 2010 22:23:37 +0200
eglibc (2.11.1-1) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/amd64/submitted-cpuid.diff
===================================================================
--- glibc-package/trunk/debian/patches/amd64/submitted-cpuid.diff (rev 0)
+++ glibc-package/trunk/debian/patches/amd64/submitted-cpuid.diff 2010-05-31 20:29:51 UTC (rev 4307)
@@ -0,0 +1,29 @@
+2010-05-26 H.J. Lu <hongjiu.lu@intel.com>
+
+ * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
+ Properly check family and model.
+
+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:
+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2010-05-30 18:42:14 UTC (rev 4306)
+++ glibc-package/trunk/debian/patches/series 2010-05-31 20:29:51 UTC (rev 4307)
@@ -60,6 +60,7 @@
amd64/local-biarch.diff
amd64/local-clone.diff
amd64/local-linuxthreads-gscope.diff
+amd64/submitted-cpuid.diff
amd64/submitted-tst-audit6-avx.diff
arm/local-atomic.diff
Reply to: