From: yavtuk Date: Mon, 11 Apr 2022 20:40:59 +0000 (+0300) Subject: Prefer .inst rather than .long for probe instructions in arm64cpuid.pl X-Git-Tag: openssl-3.2.0-alpha1~2731 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d63eaf99b4c546fede9a732c2693d0b84641cf9;p=thirdparty%2Fopenssl.git Prefer .inst rather than .long for probe instructions in arm64cpuid.pl Fixes an issue disassembling the functions because the symtab contains an attribute indicating the presence of data within them. CLA: trivial Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/18086) --- diff --git a/crypto/arm64cpuid.pl b/crypto/arm64cpuid.pl index 3ba593a4885..ad48c53402a 100755 --- a/crypto/arm64cpuid.pl +++ b/crypto/arm64cpuid.pl @@ -84,7 +84,7 @@ _armv8_pmull_probe: .type _armv8_sm4_probe,%function _armv8_sm4_probe: AARCH64_VALID_CALL_TARGET - .long 0xcec08400 // sm4e v0.4s, v0.4s + .inst 0xcec08400 // sm4e v0.4s, v0.4s ret .size _armv8_sm4_probe,.-_armv8_sm4_probe @@ -92,7 +92,7 @@ _armv8_sm4_probe: .type _armv8_sha512_probe,%function _armv8_sha512_probe: AARCH64_VALID_CALL_TARGET - .long 0xcec08000 // sha512su0 v0.2d,v0.2d + .inst 0xcec08000 // sha512su0 v0.2d,v0.2d ret .size _armv8_sha512_probe,.-_armv8_sha512_probe @@ -100,7 +100,7 @@ _armv8_sha512_probe: .type _armv8_eor3_probe,%function _armv8_eor3_probe: AARCH64_VALID_CALL_TARGET - .long 0xce010800 // eor3 v0.16b, v0.16b, v1.16b, v2.16b + .inst 0xce010800 // eor3 v0.16b, v0.16b, v1.16b, v2.16b ret .size _armv8_eor3_probe,.-_armv8_eor3_probe @@ -116,7 +116,7 @@ _armv8_cpuid_probe: .type _armv8_sm3_probe,%function _armv8_sm3_probe: AARCH64_VALID_CALL_TARGET - .long 0xce63c004 // sm3partw1 v4.4s, v0.4s, v3.4s + .inst 0xce63c004 // sm3partw1 v4.4s, v0.4s, v3.4s ret .size _armv8_sm3_probe,.-_armv8_sm3_probe