From e7e1308d7f709e6e6665db9ef042b7e335714198 Mon Sep 17 00:00:00 2001 From: Konstantinos Margaritis Date: Fri, 16 Oct 2020 12:29:45 +0300 Subject: [PATCH] fix compilation paths for cpuid_flags for x86 --- CMakeLists.txt | 2 +- src/util/arch/x86/cpuid_flags.c | 2 +- src/util/arch/x86/cpuid_inline.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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