Merge branch 'master' into popcount_cpu

stickz · Jul 5, 2024 · e3b64a0 · e3b64a0
2 parents 0c0bbbf + acc2c21
commit e3b64a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/libtorrent/configure.ac b/libtorrent/configure.ac
@@ -108,6 +108,7 @@ AC_CHECK_FUNCS(posix_memalign)
 TORRENT_CHECK_MADVISE()
 TORRENT_CHECK_CACHELINE()
 TORRENT_CHECK_POPCOUNT()
+TORRENT_CPU_POPCOUNT()
 TORRENT_CHECK_EXECINFO()
 TORRENT_CHECK_PTHREAD_SETNAME_NP()
 TORRENT_MINCORE()

diff --git a/libtorrent/scripts/common.m4 b/libtorrent/scripts/common.m4
@@ -125,6 +125,16 @@ AC_DEFUN([TORRENT_CHECK_POPCOUNT], [
   ])
 ])
 
+AC_DEFUN([TORRENT_CPU_POPCOUNT], [
+  AC_ARG_ENABLE(cpu-popcount,
+    AC_HELP_STRING([--enable-cpu-popcount], [Enable cpu-popcount [[default=check]]]),
+    [
+      if test "$enableval" = "yes"; then
+        AC_DEFINE(USE_CPU_POPCOUNT, 1, Use CPU popcount.)
+      fi
+    ])
+])
+
 AC_DEFUN([TORRENT_CHECK_CACHELINE], [
   AC_MSG_CHECKING(for cacheline)