src/patches/glibc/glibc-rh630801.patch

   1 2010-05-26  H.J. Lu  <hongjiu.lu@intel.com>
   2
   3         [BZ #11640]
   4         * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
   5         Properly check family and model.
   6
   7 Index: glibc-2.12-2-gc4ccff1/sysdeps/x86_64/multiarch/init-arch.c
   8 ===================================================================
   9 --- glibc-2.12-2-gc4ccff1.orig/sysdeps/x86_64/multiarch/init-arch.c
  10 +++ glibc-2.12-2-gc4ccff1/sysdeps/x86_64/multiarch/init-arch.c
  11 @@ -62,15 +62,15 @@ __init_cpu_features (void)
  12        unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax;
  13        unsigned int extended_family = (eax >> 20) & 0xff;
  14        unsigned int extended_model = (eax >> 12) & 0xf0;
  15 -      if (__cpu_features.family == 0x0f)
  16 +      if (family == 0x0f)
  17         {
  18           family += extended_family;
  19           model += extended_model;
  20         }
  21 -      else if (__cpu_features.family == 0x06)
  22 +      else if (family == 0x06)
  23         {
  24           model += extended_model;
  25 -         switch (__cpu_features.model)
  26 +         switch (model)
  27             {
  28             case 0x1a:
  29             case 0x1e: