From 963cb6fcb47ca212c0c57cc57bd7510f6549579c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 31 May 2009 17:52:05 -0700 Subject: Simplify CPUID value handling. SO far Intel and AMD use exactly the same bits meaning the same things in CPUID index 1. Simplify the code. Should an architecture come along which doesn't use the same semantics then it must use a different index value than COMMON_CPUID_INDEX_1. --- sysdeps/x86_64/multiarch/sched_cpucount.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sysdeps/x86_64/multiarch/sched_cpucount.c') diff --git a/sysdeps/x86_64/multiarch/sched_cpucount.c b/sysdeps/x86_64/multiarch/sched_cpucount.c index dc20182df4..e7f9daed05 100644 --- a/sysdeps/x86_64/multiarch/sched_cpucount.c +++ b/sysdeps/x86_64/multiarch/sched_cpucount.c @@ -1,6 +1,6 @@ /* Count bits in CPU set. x86-64 multi-arch version. This file is part of the GNU C Library. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 2009 Free Software Foundation, Inc. Contributed by Ulrich Drepper . The GNU C Library is free software; you can redistribute it and/or @@ -35,8 +35,7 @@ # undef __sched_cpucount libc_ifunc (__sched_cpucount, - INTEL_HAS_POPCOUNT || AMD_HAS_POPCOUNT - ? popcount_cpucount : generic_cpucount); + HAS_POPCOUNT ? popcount_cpucount : generic_cpucount); #else # include_next #endif -- cgit v1.2.1