fix clang build when QUILL_X86ARCH is defined

odygrd · Jun 16, 2023 · c5bf839 · c5bf839
1 parent d8ff560
commit c5bf839
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- [v3.0.2](#v302)
 - [v3.0.1](#v301)
 - [v3.0.0](#v300)
 - [v2.9.2](#v292)
@@ -45,6 +46,10 @@
 - [v1.1.0](#v110)
 - [v1.0.0](#v100)
 
+## v3.0.2
+
+- Add missing header on clang when `QUILL_X86ARCH` is defined.
+
 ## v3.0.1
 
 - Enhanced the reported message for reallocation of the unbounded queue to include the thread id.

diff --git a/quill/include/quill/Quill.h b/quill/include/quill/Quill.h
@@ -31,7 +31,7 @@ namespace quill
 /** Version Info **/
 constexpr uint32_t VersionMajor{3};
 constexpr uint32_t VersionMinor{0};
-constexpr uint32_t VersionPatch{1};
+constexpr uint32_t VersionPatch{2};
 constexpr uint32_t Version{VersionMajor * 10000 + VersionMinor * 100 + VersionPatch};
 
 /** forward declarations **/

diff --git a/quill/include/quill/detail/spsc_queue/BoundedQueue.h b/quill/include/quill/detail/spsc_queue/BoundedQueue.h
@@ -16,9 +16,12 @@
 #if defined(QUILL_X86ARCH)
   #if defined(_WIN32)
     #include <intrin.h>
-  #elif (defined(__GNUC__) && __GNUC__ > 10) || (defined(__clang_major__) && __clang_major__ > 11)
+  #elif defined(__GNUC__) && __GNUC__ > 10
     #include <emmintrin.h>
     #include <x86gprintrin.h>
+  #elif defined(__clang_major__)
+    // clang needs immintrin for _mm_clflushopt
+    #include <immintrin.h>
   #else
     // older compiler versions do not have <x86gprintrin.h>
     #include <immintrin.h>