diff --git a/libs/pll-modules b/libs/pll-modules index ccccbee2..989d3fa6 160000 --- a/libs/pll-modules +++ b/libs/pll-modules @@ -1 +1 @@ -Subproject commit ccccbee2e43d8881949d1144a2dccd33242d376d +Subproject commit 989d3fa63a2c7739d259488bfb5acd5980fbc757 diff --git a/src/util/sysutil.cpp b/src/util/sysutil.cpp index 8d6501f9..cdc4c72e 100644 --- a/src/util/sysutil.cpp +++ b/src/util/sysutil.cpp @@ -1,4 +1,4 @@ -#ifndef _WIN32 +#if (!defined(_WIN32) && !defined(__aarch64__)) #include #endif #include @@ -170,7 +170,9 @@ unsigned long sysutil_get_memtotal(bool ignore_errors) static void get_cpuid(int32_t out[4], int32_t x) { -#ifdef _WIN32 +#ifdef __aarch64__ +// not supported +#elif defined(_WIN32) __cpuid(out, x); #else __cpuid_count(x, 0, out[0], out[1], out[2], out[3]); diff --git a/src/version.h b/src/version.h index c47a4828..991fec66 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ #define RAXML_VERSION "1.1.0-master" -#define RAXML_DATE "10.05.2022" +#define RAXML_DATE "22.06.2022"