Use armv8 .quad instead of .dword

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21939)

diff --git a/crypto/sm4/asm/vpsm4-armv8.pl b/crypto/sm4/asm/vpsm4-armv8.pl
index a09e44cada7cbd155a58e3459f12aa2bc892d1ab..11da0d3976f9c000d263bd4461c38890014f4feb 100755 (executable)
--- a/crypto/sm4/asm/vpsm4-armv8.pl
+++ b/crypto/sm4/asm/vpsm4-armv8.pl
@@ -569,11 +569,11 @@ _vpsm4_consts:
        .long 0xA0A7AEB5, 0xBCC3CAD1, 0xD8DFE6ED, 0xF4FB0209
        .long 0x10171E25, 0x2C333A41, 0x484F565D, 0x646B7279
 .Lfk:
-       .dword 0x56aa3350a3b1bac6,0xb27022dc677d9197
+       .quad 0x56aa3350a3b1bac6,0xb27022dc677d9197
 .Lshuffles:
-       .dword 0x0B0A090807060504,0x030201000F0E0D0C
+       .quad 0x0B0A090807060504,0x030201000F0E0D0C
 .Lxts_magic:
-       .dword 0x0101010101010187,0x0101010101010101
+       .quad 0x0101010101010187,0x0101010101010101
 
 .size  _vpsm4_consts,.-_vpsm4_consts
 ___

diff --git a/crypto/sm4/asm/vpsm4_ex-armv8.pl b/crypto/sm4/asm/vpsm4_ex-armv8.pl
index 992ac98af72c2c5995958382344c64a6931ea328..60aebc2faf7f990dd58681c056af9f2afd47b893 100644 (file)
--- a/crypto/sm4/asm/vpsm4_ex-armv8.pl
+++ b/crypto/sm4/asm/vpsm4_ex-armv8.pl
@@ -553,18 +553,18 @@ _${prefix}_consts:
        .long 0xA0A7AEB5, 0xBCC3CAD1, 0xD8DFE6ED, 0xF4FB0209
        .long 0x10171E25, 0x2C333A41, 0x484F565D, 0x646B7279
 .Lfk:
-       .dword 0x56aa3350a3b1bac6,0xb27022dc677d9197
+       .quad 0x56aa3350a3b1bac6,0xb27022dc677d9197
 .Lshuffles:
-       .dword 0x0B0A090807060504,0x030201000F0E0D0C
+       .quad 0x0B0A090807060504,0x030201000F0E0D0C
 .Lxts_magic:
-       .dword 0x0101010101010187,0x0101010101010101
+       .quad 0x0101010101010187,0x0101010101010101
 .Lsbox_magic:
-       .dword 0x0b0e0104070a0d00,0x0306090c0f020508
-       .dword 0x62185a2042387a00,0x22581a6002783a40
-       .dword 0x15df62a89e54e923,0xc10bb67c4a803df7
-       .dword 0xb9aa6b78c1d21300,0x1407c6d56c7fbead
-       .dword 0x6404462679195b3b,0xe383c1a1fe9edcbc
-       .dword 0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f
+       .quad 0x0b0e0104070a0d00,0x0306090c0f020508
+       .quad 0x62185a2042387a00,0x22581a6002783a40
+       .quad 0x15df62a89e54e923,0xc10bb67c4a803df7
+       .quad 0xb9aa6b78c1d21300,0x1407c6d56c7fbead
+       .quad 0x6404462679195b3b,0xe383c1a1fe9edcbc
+       .quad 0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f
 
 .size  _${prefix}_consts,.-_${prefix}_consts
 ___