mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 19:03:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Enable pcre:arm64-windows

Browse Source 
Update sljitConfigInternal.h for ARM64, resolve error C2375: 'FlushInstructionCache': redefinition; different linkage
This commit is contained in:
Tony Lin 2019-04-10 09:55:52 +00:00
parent 8c3e093d05
commit 9b45a7b09c
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ports/pcre/fix-arm64-config-define.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/sljit/sljitConfigInternal.h b/sljit/sljitConfigInternal.h
index 2bda29e..56ba7a6 100644
--- a/sljit/sljitConfigInternal.h
+++ b/sljit/sljitConfigInternal.h
@@ -151,6 +151,8 @@
#define SLJIT_CONFIG_X86_64 1
#elif defined(_M_ARM)
#define SLJIT_CONFIG_ARM_V5 1
+#elif defined(_M_ARM64)
+#define SLJIT_CONFIG_ARM_64 1
#else
#define SLJIT_CONFIG_X86_32 1
#endif
@@ -330,7 +332,6 @@
__clear_cache((char*)(from), (char*)(to))
#elif(_WIN32)
#pragma comment(lib, "kernel32.lib")
-uint32_t FlushInstructionCache(void *hProcess, void *lpBaseAddress, uintptr_t dwSize);
#define SLJIT_CACHE_FLUSH(from, to) \
FlushInstructionCache(GetCurrentProcess(), (void*)(from), (uintptr_t)(to - from));
#endif

3
ports/pcre/portfile.cmake
View File

@ -19,7 +19,8 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-option-2.patch
${CMAKE_CURRENT_LIST_DIR}/fix-arm-config-define.patch)
${CMAKE_CURRENT_LIST_DIR}/fix-arm-config-define.patch
${CMAKE_CURRENT_LIST_DIR}/fix-arm64-config-define.patch)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}