diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2009-07-31 11:53:35 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-07-31 11:53:35 -0700 |
| commit | 6f6f1215f68e5ae15ad18373234815fe7b2acc9e (patch) | |
| tree | c6ca7c84df2663d2af45a5ebb47e1cb7d181e31d /sysdeps/x86_64/multiarch | |
| parent | 1877ea16ca0714abd715d6ce0aa1b840c3850241 (diff) | |
| download | glibc-6f6f1215f68e5ae15ad18373234815fe7b2acc9e.tar.gz | |
Support multiarch for i686.
This patch adds multiarch support when configured for i686. I modified
some x86-64 functions to support 32bit. I will contribute 32bit SSE string
and memory functions later.
Diffstat (limited to 'sysdeps/x86_64/multiarch')
| -rw-r--r-- | sysdeps/x86_64/multiarch/init-arch.c | 18 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/init-arch.h | 6 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/sched_cpucount.c | 2 |
3 files changed, 15 insertions, 11 deletions
diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c index 49b421eac8..c152ab29eb 100644 --- a/sysdeps/x86_64/multiarch/init-arch.c +++ b/sysdeps/x86_64/multiarch/init-arch.c @@ -18,6 +18,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <cpuid.h> #include "init-arch.h" @@ -27,12 +28,10 @@ struct cpu_features __cpu_features attribute_hidden; static void get_common_indeces (void) { - asm volatile ("cpuid" - : "=a" (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax), - "=b" (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ebx), - "=c" (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx), - "=d" (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].edx) - : "0" (1)); + __cpuid (1, __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax, + __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ebx, + __cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx, + __cpu_features.cpuid[COMMON_CPUID_INDEX_1].edx); unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax; __cpu_features.family = (eax >> 8) & 0x0f; @@ -47,10 +46,7 @@ __init_cpu_features (void) unsigned int ecx; unsigned int edx; - asm volatile ("cpuid" - : "=a" (__cpu_features.max_cpuid), "=b" (ebx), "=c" (ecx), - "=d" (edx) - : "0" (0)); + __cpuid (0, __cpu_features.max_cpuid, ebx, ecx, edx); /* This spells out "GenuineIntel". */ if (ebx == 0x756e6547 && ecx == 0x6c65746e && edx == 0x49656e69) @@ -71,9 +67,11 @@ __init_cpu_features (void) { __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 } } /* This spells out "AuthenticAMD". */ diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h index 0151e8b95b..8d9b1e8d8c 100644 --- a/sysdeps/x86_64/multiarch/init-arch.h +++ b/sysdeps/x86_64/multiarch/init-arch.h @@ -61,6 +61,9 @@ extern const struct cpu_features *__get_cpu_features (void) /* Following are the feature tests used throughout libc. */ #ifndef NOT_IN_libc +# define HAS_SSE2 \ + ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].edx & (1 << 26)) != 0) + # define HAS_POPCOUNT \ ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & (1 << 23)) != 0) @@ -70,6 +73,9 @@ extern const struct cpu_features *__get_cpu_features (void) # define HAS_FMA \ ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & (1 << 12)) != 0) #else +# define HAS_SSE2 \ + ((__get_cpu_features ()->cpuid[COMMON_CPUID_INDEX_1].edx & (1 << 26)) != 0) + # define HAS_POPCOUNT \ ((__get_cpu_features ()->cpuid[COMMON_CPUID_INDEX_1].ecx & (1 << 23)) != 0) diff --git a/sysdeps/x86_64/multiarch/sched_cpucount.c b/sysdeps/x86_64/multiarch/sched_cpucount.c index b6f425e948..fde6dcca60 100644 --- a/sysdeps/x86_64/multiarch/sched_cpucount.c +++ b/sysdeps/x86_64/multiarch/sched_cpucount.c @@ -27,7 +27,7 @@ #define POPCNT(l) \ ({ __cpu_mask r; \ - asm ("popcntq %1, %0" : "=r" (r) : "0" (l));\ + asm ("popcnt %1, %0" : "=r" (r) : "0" (l));\ r; }) #define __sched_cpucount static popcount_cpucount #include <posix/sched_cpucount.c> |