Fix compilation problems in x86-64 init-arch

diff --git a/ChangeLog b/ChangeLog
index 404e1fe..2a15d9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-10-21  Ulrich Drepper  <drepper@gmail.com>
 
+       * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features): Fix
+       compilation problems.
+
        * sysdeps/ieee754/dbl-64/e_log.c (__ieee754_log): Add a few more
        __builtin_expect.
 

diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
index 3fde5d9..65b0ee9 100644 (file)
--- a/sysdeps/x86_64/multiarch/init-arch.c
+++ b/sysdeps/x86_64/multiarch/init-arch.c
@@ -124,7 +124,7 @@ __init_cpu_features (void)
 
       get_common_indeces (&family, &model);
 
-      unsigned int ecx = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx;
+      ecx = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx;
 
       /* AMD processors prefer SSE instructions for memory/string routines
         if they are available, otherwise they prefer integer instructions.  */
@@ -132,6 +132,7 @@ __init_cpu_features (void)
        __cpu_features.feature[index_Prefer_SSE_for_memop]
          |= bit_Prefer_SSE_for_memop;
 
+      unsigned int eax;
       __cpuid (0x80000000, eax, ebx, ecx, edx);
       if (eax >= 0x80000001)
        __cpuid (0x80000001,