diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-09-01 10:08:05 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-09-01 10:08:05 +0200 |
| commit | a562fe3cdbb82fae5868e245de31031c19432550 (patch) | |
| tree | 542c921e7b94c7c35b433f0dce140adbbaf3ec24 /sysdeps | |
| parent | 62f946ade44beeabffb8e91c989ff2bd47293e4c (diff) | |
| parent | c2735e958acc6a69daab71fdc463564860f20794 (diff) | |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/i386/i686/multiarch/init-arch.c | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/fpu/bits/mathinline.h | 4 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/init-arch.c | 10 |
3 files changed, 3 insertions, 13 deletions
diff --git a/sysdeps/i386/i686/multiarch/init-arch.c b/sysdeps/i386/i686/multiarch/init-arch.c index b371bae1dc..00a94d83dc 100644 --- a/sysdeps/i386/i686/multiarch/init-arch.c +++ b/sysdeps/i386/i686/multiarch/init-arch.c @@ -1,3 +1 @@ -#define ENABLE_SSSE3_ON_ATOM - #include <sysdeps/x86_64/multiarch/init-arch.c> diff --git a/sysdeps/x86_64/fpu/bits/mathinline.h b/sysdeps/x86_64/fpu/bits/mathinline.h index 8d4850dfc0..ece0f02678 100644 --- a/sysdeps/x86_64/fpu/bits/mathinline.h +++ b/sysdeps/x86_64/fpu/bits/mathinline.h @@ -36,14 +36,14 @@ __MATH_INLINE int __NTH (__signbitf (float __x)) { int __m; - asm ("pmovmskb %1, %0" : "=r" (__m) : "x" (__x)); + __asm ("pmovmskb %1, %0" : "=r" (__m) : "x" (__x)); return __m & 0x8; } __MATH_INLINE int __NTH (__signbit (double __x)) { int __m; - asm ("pmovmskb %1, %0" : "=r" (__m) : "x" (__x)); + __asm ("pmovmskb %1, %0" : "=r" (__m) : "x" (__x)); return __m & 0x80; } __MATH_INLINE int diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c index c152ab29eb..9a1e776c9a 100644 --- a/sysdeps/x86_64/multiarch/init-arch.c +++ b/sysdeps/x86_64/multiarch/init-arch.c @@ -64,15 +64,7 @@ __init_cpu_features (void) __cpu_features.model += extended_model; } else if (__cpu_features.family == 0x06) - { - __cpu_features.model += extended_model; - -#ifndef ENABLE_SSSE3_ON_ATOM - if (__cpu_features.model == 0x1c) - /* Avoid SSSE3 on Atom since it is slow. */ - __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx &= ~(1 << 9); -#endif - } + __cpu_features.model += extended_model; } /* This spells out "AuthenticAMD". */ else if (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65) |