From 09bd0d05a6ab9eb4965763c100edf9b86ae03d2b Mon Sep 17 00:00:00 2001 From: Xiaokang Qian Date: Mon, 15 May 2023 09:14:39 +0000 Subject: [PATCH] Fix arm64 asm code back compatible issue with gcc 4.9.4 Fix: #20963 Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/20967) --- crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl | 2 +- crypto/sm3/asm/sm3-armv8.pl | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl b/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl index 0de7a86d22..e9f50cddfd 100644 --- a/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl +++ b/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl @@ -174,7 +174,7 @@ $code=<<___; #if __ARM_MAX_ARCH__>=8 ___ -$code.=".arch armv8.2-a+crypto\n.text\n"; +$code.=".arch armv8-a+crypto\n.text\n"; $input_ptr="x0"; #argument block $bit_length="x1"; diff --git a/crypto/sm3/asm/sm3-armv8.pl b/crypto/sm3/asm/sm3-armv8.pl index 729ca4fb31..56b4efd3bc 100644 --- a/crypto/sm3/asm/sm3-armv8.pl +++ b/crypto/sm3/asm/sm3-armv8.pl @@ -109,7 +109,6 @@ ___ $code=<<___; #include "arm_arch.h" -.arch armv8.2-a .text ___