github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

move cpuid_flags.h header to common

Browse Source
This commit is contained in:
Konstantinos Margaritis 2020-10-08 20:48:20 +03:00
parent 5d773dd9db
commit d2cf1a7882
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -569,7 +569,7 @@ set (hs_exec_common_SRCS
src/alloc.c src/alloc.c
src/scratch.c src/scratch.c
src/util/arch/x86/cpuid_flags.c src/util/arch/x86/cpuid_flags.c
src/util/arch/x86/cpuid_flags.h src/util/arch/common/cpuid_flags.h
src/util/multibit.c src/util/multibit.c
) )

3
src/hs.cpp
View File

@ -44,9 +44,10 @@
#include "parser/prefilter.h" #include "parser/prefilter.h"
#include "parser/unsupported.h" #include "parser/unsupported.h"
#include "util/compile_error.h" #include "util/compile_error.h"
#include "util/arch/common/cpuid_flags.h"
#if defined(ARCH_X86_64) #if defined(ARCH_X86_64)
#include "util/arch/x86/cpuid_flags.h"
#include "util/arch/x86/cpuid_inline.h" #include "util/arch/x86/cpuid_inline.h"
#elif defined(ARCH_ARM32) || defined(ARCH_AARCH64)
#endif #endif
#include "util/depth.h" #include "util/depth.h"
#include "util/popcount.h" #include "util/popcount.h"

2
src/util/arch/x86/cpuid_flags.h → src/util/arch/common/cpuid_flags.h
View File

@ -31,7 +31,7 @@
#include "ue2common.h" #include "ue2common.h"
#if !defined(_WIN32) && !defined(CPUID_H_) #if (defined(ARCH_IA32) || defined(ARCH_X86_64)) && !defined(_WIN32) && !defined(CPUID_H_)
#include <cpuid.h> #include <cpuid.h>
/* system header doesn't have a header guard */ /* system header doesn't have a header guard */
#define CPUID_H_ #define CPUID_H_

5
src/util/target_info.cpp
View File

@ -29,8 +29,9 @@
#include "hs_compile.h" // for various hs_platform_info flags #include "hs_compile.h" // for various hs_platform_info flags
#include "target_info.h" #include "target_info.h"
#if defined(ARCH_X86_64) #include "util/arch/common/cpuid_flags.h"
#include "util/arch/x86/cpuid_flags.h" #if defined(ARCH_IA32) || defined(ARCH_X86_64)
#elif defined(ARCH_ARM32) || defined(ARCH_AARCH64)
#endif #endif
namespace ue2 { namespace ue2 {