fix compilation paths for cpuid_flags for x86

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 566a7dcd4e3966ae3c4889a003ff01350e52798f..4077d396d87b9a52b9071c8f56c26fb821159004 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -577,7 +577,7 @@ set (hs_exec_common_SRCS
     ${hs_exec_common_SRCS}
     src/util/arch/x86/cpuid_flags.c
     )
-elif (ARCH_ARM32 OR ARCH_AARCH64)
+else (ARCH_ARM32 OR ARCH_AARCH64)
 set (hs_exec_common_SRCS
     ${hs_exec_common_SRCS}
     src/util/arch/arm/cpuid_flags.c

diff --git a/src/util/arch/x86/cpuid_flags.c b/src/util/arch/x86/cpuid_flags.c
index 0b529c0bf0e0aa119b1152d7f80be75f021134f1..81c7e4563009dead30d9001673c1cf76dbb0522d 100644 (file)
--- a/src/util/arch/x86/cpuid_flags.c
+++ b/src/util/arch/x86/cpuid_flags.c
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "cpuid_flags.h"
+#include "util/arch/common/cpuid_flags.h"
 #include "cpuid_inline.h"
 #include "ue2common.h"
 #include "hs_compile.h" // for HS_MODE_ flags

diff --git a/src/util/arch/x86/cpuid_inline.h b/src/util/arch/x86/cpuid_inline.h
index b6768cc26920a2a04a2192a8733a657e057377d0..97f19aed4a4e8d3a391834da93087228c9b13484 100644 (file)
--- a/src/util/arch/x86/cpuid_inline.h
+++ b/src/util/arch/x86/cpuid_inline.h
@@ -30,7 +30,7 @@
 #define CPUID_INLINE_H_
 
 #include "ue2common.h"
-#include "cpuid_flags.h"
+#include "util/arch/common/cpuid_flags.h"
 
 #if !defined(_WIN32) && !defined(CPUID_H_)
 #include <cpuid.h>