Minor optimization of popcount in l10nflist

diff --git a/ChangeLog b/ChangeLog
index 88ed726e1365292ca06bed020541fd2e131c4571..83bee3f6e3de29410344908143b46a20e8e8a60f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-08-11  Ulrich Drepper  <drepper@gmail.com>
 
+       * intl/l10nflist.c: Allow architecture-specific pop function.
+       * sysdeps/x86_64/l10nflist.c: New file.
+
        * intl/l10nflist.c (_nl_make_l10nflist): Use locale-independent
        classification.
 

diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index a38e0efe90913e1e6daa91725f132705b3911feb..82af2633b50356cf5abce3f4983c2a19916b398e 100644 (file)
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -150,6 +150,7 @@ argz_next__ (argz, argz_len, entry)
 
 
 /* Return number of bits set in X.  */
+#ifndef ARCH_POP
 static int pop PARAMS ((int x));
 
 static inline int
@@ -164,6 +165,7 @@ pop (x)
 
   return x;
 }
+#endif
 
 \f
 struct loaded_l10nfile *

diff --git a/sysdeps/x86_64/l10nflist.c b/sysdeps/x86_64/l10nflist.c
new file mode 100644 (file)
index 0000000..2e08372
--- /dev/null
+++ b/sysdeps/x86_64/l10nflist.c
@@ -0,0 +1,13 @@
+#ifdef __POPCNT__
+# include <popcntintrin.h>
+
+static inline unsigned int
+pop (unsigned int x)
+{
+  return _mm_popcnt_u32 (x);
+}
+# define ARCH_POP 1
+
+#endif
+
+#include <intl/l10nflist.c>