ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

3rdparty/lzma: Fix ARM64 build with clang-cl

This commit is contained in:
Stenzek 2024-03-21 19:34:50 +10:00 committed by Connor McLaughlin
parent a703076720
commit cc7b58eef0
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/lzma/src/7zCrc.c vendored
View File

@ -75,7 +75,7 @@ UInt32 Z7_FASTCALL CrcUpdateT1(UInt32 v, const void *data, size_t size, const UI
// #pragma message("ARM*") // #pragma message("ARM*")
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(__clang__)
#if defined(MY_CPU_ARM64) #if defined(MY_CPU_ARM64)
#if (_MSC_VER >= 1910) #if (_MSC_VER >= 1910)
#ifndef __clang__ #ifndef __clang__

4
3rdparty/lzma/src/AesOpt.c vendored
View File

@ -576,7 +576,7 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
#if defined(__clang__) || defined(__GNUC__) #if defined(__clang__) || defined(__GNUC__)
#ifdef MY_CPU_ARM64 #ifdef MY_CPU_ARM64
#define ATTRIB_AES __attribute__((__target__("+crypto"))) #define ATTRIB_AES __attribute__((__target__("+crypto,aes")))
#else #else
#define ATTRIB_AES __attribute__((__target__("fpu=crypto-neon-fp-armv8"))) #define ATTRIB_AES __attribute__((__target__("fpu=crypto-neon-fp-armv8")))
#endif #endif
@ -590,7 +590,7 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
#define ATTRIB_AES #define ATTRIB_AES
#endif #endif
#if defined(_MSC_VER) && defined(MY_CPU_ARM64) #if defined(_MSC_VER) && !defined(__clang__) && defined(MY_CPU_ARM64)
#include <arm64_neon.h> #include <arm64_neon.h>
#else #else
#include <arm_neon.h> #include <arm_neon.h>

2
3rdparty/lzma/src/LzFind.c vendored
View File

@ -625,7 +625,7 @@ void MatchFinder_Init(CMatchFinder *p)
#endif #endif
#endif #endif
#if defined(_MSC_VER) && defined(MY_CPU_ARM64) #if defined(_MSC_VER) && !defined(__clang__) && defined(MY_CPU_ARM64)
#include <arm64_neon.h> #include <arm64_neon.h>
#else #else
#include <arm_neon.h> #include <arm_neon.h>

4
3rdparty/lzma/src/Sha256Opt.c vendored
View File

@ -224,7 +224,7 @@ void Z7_FASTCALL Sha256_UpdateBlocks_HW(UInt32 state[8], const Byte *data, size_
#if defined(__clang__) || defined(__GNUC__) #if defined(__clang__) || defined(__GNUC__)
#ifdef MY_CPU_ARM64 #ifdef MY_CPU_ARM64
#define ATTRIB_SHA __attribute__((__target__("+crypto"))) #define ATTRIB_SHA __attribute__((__target__("+crypto,sha2")))
#else #else
#define ATTRIB_SHA __attribute__((__target__("fpu=crypto-neon-fp-armv8"))) #define ATTRIB_SHA __attribute__((__target__("fpu=crypto-neon-fp-armv8")))
#endif #endif
@ -234,7 +234,7 @@ void Z7_FASTCALL Sha256_UpdateBlocks_HW(UInt32 state[8], const Byte *data, size_
#define _ARM_USE_NEW_NEON_INTRINSICS #define _ARM_USE_NEW_NEON_INTRINSICS
#endif #endif
#if defined(_MSC_VER) && defined(MY_CPU_ARM64) #if defined(_MSC_VER) && !defined(__clang__) && defined(MY_CPU_ARM64)
#include <arm64_neon.h> #include <arm64_neon.h>
#else #else
#include <arm_neon.h> #include <arm_neon.h>