From: Konstantinos Margaritis <konstantinos@vectorcamp.gr>
Date: Fri, 16 Oct 2020 09:29:45 +0000 (+0300)
Subject: fix compilation paths for cpuid_flags for x86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74919026c3cb5ed77a4ef70e77aadd45d2dbe6a0;p=thirdparty%2Fvectorscan.git

fix compilation paths for cpuid_flags for x86
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 566a7dcd..4077d396 100644
--- 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 0b529c0b..81c7e456 100644
--- 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 b6768cc2..97f19aed 100644
--- 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>