diff options
| author | Ben Laurie <ben@links.org> | 2013-10-04 12:48:24 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2013-10-04 12:48:24 +0100 |
| commit | ab3b624b0ce887f8207a539c2e975394f7e0a004 (patch) | |
| tree | f982a990aca81fa5afbe6f920e24236f5252323a | |
| parent | 7c81de9a91e9270b9c9b8631127f9f73aa649c3c (diff) | |
| parent | 66e0f9db083b3a8fa28d2fa1a7e5d425263a84ab (diff) | |
| download | openssl-new-ab3b624b0ce887f8207a539c2e975394f7e0a004.tar.gz | |
Merge branch 'OpenSSL_1_0_2-stable' into agl-1.0.2aead
| -rw-r--r-- | crypto/perlasm/sparcv9_modes.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/perlasm/sparcv9_modes.pl b/crypto/perlasm/sparcv9_modes.pl index a13ffcec2d..6b47bb1af4 100644 --- a/crypto/perlasm/sparcv9_modes.pl +++ b/crypto/perlasm/sparcv9_modes.pl @@ -1657,8 +1657,8 @@ sub emit_assembler { s/\b(camellia_[^s]+)\s+(%f[0-9]{1,2}),\s*(%f[0-9]{1,2}),\s*(%f[0-9]{1,2})/ &uncamellia3($1,$2,$3,$4) /geo or - s/\b(des_\w+)\s+(?<rs1>%f[0-9]{1,2}),\s*(?<rs2>[%fx0-9]+)(,\s*(?<rs3>%f[0-9]{1,2})(,\s*(?<rs4>%f[0-9]{1,2}))?)?/ - &undes($1,$+{rs1},$+{rs2},$+{rs3},$+{rs4}) + s/\b(des_\w+)\s+(%f[0-9]{1,2}),\s*([%fx0-9]+)(?:,\s*(%f[0-9]{1,2})(?:,\s*(%f[0-9]{1,2}))?)?/ + &undes($1,$2,$3,$4,$5) /geo or s/\b(mov[ds]to\w+)\s+(%f[0-9]{1,2}),\s*(%[goli][0-7])/ &unmovxtox($1,$2,$3) |