Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Unify assembly files with macOS 

The remaining changes needed to make the assembly files work
with macOS.

Reviewed-by: Attila Fülöp <attila@fueloep.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Jorgen Lundman <lundman@lundman.net>
Closes #14451
This commit is contained in:
Jorgen Lundman 2023-02-07 02:27:55 +09:00 committed by GitHub
parent 6017fd9377
commit dffd40b3b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/icp/asm-x86_64/blake3/blake3_avx2.S
View File

@ -1791,7 +1791,6 @@ ENTRY_ALIGN(zfs_blake3_hash_many_avx2, 64)
SET_SIZE(zfs_blake3_hash_many_avx2) SET_SIZE(zfs_blake3_hash_many_avx2)
SECTION_STATIC SECTION_STATIC
.section .rodata
.p2align 6 .p2align 6
ADD0: ADD0:

5
module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S
View File

@ -53,6 +53,11 @@
/* Windows userland links with OpenSSL */ /* Windows userland links with OpenSSL */
#if !defined (_WIN32) || defined (_KERNEL) #if !defined (_WIN32) || defined (_KERNEL)
/* Apple needs _ */
#if defined (__APPLE__)
#define gcm_avx_can_use_movbe _gcm_avx_can_use_movbe
#endif
.extern gcm_avx_can_use_movbe .extern gcm_avx_can_use_movbe
.text .text

2
module/icp/asm-x86_64/modes/gcm_pclmulqdq.S
View File

@ -101,7 +101,7 @@ gcm_mul_pclmulqdq(uint64_t *x_in, uint64_t *y, uint64_t *res) {
// static uint8_t byte_swap16_mask[] = { // static uint8_t byte_swap16_mask[] = {
// 15, 14, 13, 12, 11, 10, 9, 8, 7, 6 ,5, 4, 3, 2, 1, 0 }; // 15, 14, 13, 12, 11, 10, 9, 8, 7, 6 ,5, 4, 3, 2, 1, 0 };
.section .rodata SECTION_STATIC
.balign XMM_ALIGN .balign XMM_ALIGN
.Lbyte_swap16_mask: .Lbyte_swap16_mask:
.byte 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 .byte 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0

2
module/icp/asm-x86_64/sha2/sha256_impl.S
View File

@ -2063,7 +2063,7 @@ ENTRY_NP(SHA256TransformBlocks)
.cfi_endproc .cfi_endproc
SET_SIZE(SHA256TransformBlocks) SET_SIZE(SHA256TransformBlocks)
.section .rodata SECTION_STATIC
.balign 64 .balign 64
SET_OBJ(K256) SET_OBJ(K256)
K256: K256:

3
module/icp/asm-x86_64/sha2/sha512_impl.S
View File

@ -2064,7 +2064,7 @@ ENTRY_NP(SHA512TransformBlocks)
.cfi_endproc .cfi_endproc
SET_SIZE(SHA512TransformBlocks) SET_SIZE(SHA512TransformBlocks)
.section .rodata SECTION_STATIC
.balign 64 .balign 64
SET_OBJ(K512) SET_OBJ(K512)
K512: K512:
@ -2113,4 +2113,3 @@ K512:
#if defined(__ELF__) #if defined(__ELF__)
.section .note.GNU-stack,"",%progbits .section .note.GNU-stack,"",%progbits
#endif #endif