The branch master has been updated via d136db212ecaeb65e399de8d6b30e8b5ecc044d9 (commit) from 7c14d0c1c0ece97f7406b4df466df6439146d6c6 (commit)
- Log ----------------------------------------------------------------- commit d136db212ecaeb65e399de8d6b30e8b5ecc044d9 Author: Matt Caswell <m...@openssl.org> Date: Thu May 20 14:02:12 2021 +0100 Remove some perl 5.14 use from rsaz-avx512.pl The non-destructive substitution syntax (s///r), was introduced in perl 5.14. We need to support 5.10 and above. Fixes #15378 Reviewed-by: Tomas Mraz <to...@openssl.org> Reviewed-by: Richard Levitte <levi...@openssl.org> Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15379) ----------------------------------------------------------------------- Summary of changes: crypto/bn/asm/rsaz-avx512.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/bn/asm/rsaz-avx512.pl b/crypto/bn/asm/rsaz-avx512.pl index c156de1f33..1842bec609 100644 --- a/crypto/bn/asm/rsaz-avx512.pl +++ b/crypto/bn/asm/rsaz-avx512.pl @@ -128,7 +128,8 @@ sub amm52x20_x1() { # of data for corresponding AMM operation; # _b_offset - offset in the |b| array pointing to the next qword digit; my ($_data_offset,$_b_offset,$_acc,$_R0,$_R0h,$_R1,$_R1h,$_R2,$_k0) = @_; -my $_R0_xmm = $_R0 =~ s/%y/%x/r; +my $_R0_xmm = $_R0; +$_R0_xmm =~ s/%y/%x/; $code.=<<___; movq $_b_offset($b_ptr), %r13 # b[i] @@ -525,7 +526,8 @@ ___ my ($out,$red_tbl,$red_tbl_idx,$tbl_idx) = @_6_args_universal_ABI; my ($t0,$t1,$t2,$t3,$t4) = map("%ymm$_", (0..4)); -my $t4xmm = $t4 =~ s/%y/%x/r; +my $t4xmm = $t4; +$t4xmm =~ s/%y/%x/; my ($tmp0,$tmp1,$tmp2,$tmp3,$tmp4) = map("%ymm$_", (16..20)); my ($cur_idx,$idx,$ones) = map("%ymm$_", (21..23));