mirror of
https://git.freebsd.org/ports.git
synced 2025-07-02 10:00:37 -04:00
1ebb93fd80
Port now bundles LZMA with known build issues. Import patch set from archivers/7-zip to fix the build on armv7 and arm64. PR: 271987 Approved by: portmgr (build fix blanket) Obtained from: archivers/7-zip
38 lines
942 B
C
38 lines
942 B
C
--- src/lzma/AesOpt.c.orig 2022-04-29 08:33:05 UTC
|
|
+++ src/lzma/AesOpt.c
|
|
@@ -506,7 +506,7 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
|
|
#endif // ! USE_INTEL_VAES
|
|
|
|
|
|
-#elif defined(MY_CPU_ARM_OR_ARM64) && defined(MY_CPU_LE)
|
|
+#elif defined(MY_CPU_ARM64) && defined(MY_CPU_LE)
|
|
|
|
#if defined(__clang__)
|
|
#if (__clang_major__ >= 8) // fix that check
|
|
@@ -773,4 +773,25 @@ AES_FUNC_START2 (AesCtr_Code_HW)
|
|
|
|
#endif // USE_HW_AES
|
|
|
|
-#endif // MY_CPU_ARM_OR_ARM64
|
|
+#else
|
|
+
|
|
+/* no USE_HW_AES */
|
|
+
|
|
+#pragma message("AES HW_SW stub was used")
|
|
+
|
|
+#define AES_TYPE_keys UInt32
|
|
+#define AES_TYPE_data Byte
|
|
+
|
|
+#define AES_FUNC_START(name) \
|
|
+ void MY_FAST_CALL name(UInt32 *p, Byte *data, size_t numBlocks) \
|
|
+
|
|
+#define AES_COMPAT_STUB(name) \
|
|
+ AES_FUNC_START(name); \
|
|
+ AES_FUNC_START(name ## _HW) \
|
|
+ { name(p, data, numBlocks); }
|
|
+
|
|
+AES_COMPAT_STUB (AesCbc_Encode)
|
|
+AES_COMPAT_STUB (AesCbc_Decode)
|
|
+AES_COMPAT_STUB (AesCtr_Code)
|
|
+
|
|
+#endif
|