about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-10-21 20:47:20 -0400
committerUlrich Drepper <drepper@gmail.com>2011-10-21 20:47:20 -0400
commitc196fed8f01a8599dd43edf1c7a1ea3ba9ed0598 (patch)
treebbd0e3a9f9b009b66c01b22baa3b3f9e687d89de
parent8ec250a48425e8640fc01504bc1a42b63467768e (diff)
downloadglibc-c196fed8f01a8599dd43edf1c7a1ea3ba9ed0598.tar.gz
glibc-c196fed8f01a8599dd43edf1c7a1ea3ba9ed0598.tar.xz
glibc-c196fed8f01a8599dd43edf1c7a1ea3ba9ed0598.zip
Fix compilation problems in x86-64 init-arch
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/x86_64/multiarch/init-arch.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 404e1fe49c..2a15d9c19a 100644
--- 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 3fde5d94ce..65b0ee93e5 100644
--- 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,