diff options
| author | David Benjamin <davidben@google.com> | 2016-06-26 20:18:50 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2016-06-28 00:59:26 +0300 |
| commit | fdd8e9c8c7547c523bd5219de1c6d739cafee461 (patch) | |
| tree | 5589ffdebb74f9e699dec7566e8df06ad555acb9 /crypto/chacha | |
| parent | ac81d929682d9693d91af0a7443d454d856c7592 (diff) | |
Switch perlasm calling convention.
Depending on architecture, perlasm differed on which one or both of:
perl foo.pl flavor output.S
perl foo.pl flavor > output.S
Upstream has now unified on the first form after making a number of
changes to their files (the second does not even work for their x86
files anymore). Sync those portions of our perlasm scripts with upstream
and update CMakeLists.txt and generate_build_files.py per the new
convention.
This imports various commits like this one:
184bc45f683c76531d7e065b6553ca9086564576 (this was done by taking a
diff, so I don't have the full list)
Confirmed that generate_build_files.py sees no change.
BUG=14
Change-Id: Id2fb5b8bc2a7369d077221b5df9a6947d41f50d2
Reviewed-on: https://boringssl-review.googlesource.com/8518
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/chacha')
| -rwxr-xr-x | crypto/chacha/asm/chacha-armv4.pl | 4 | ||||
| -rwxr-xr-x | crypto/chacha/asm/chacha-x86.pl | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl index b190445d..395b8154 100755 --- a/crypto/chacha/asm/chacha-armv4.pl +++ b/crypto/chacha/asm/chacha-armv4.pl @@ -28,8 +28,8 @@ # 20-25% worse; $flavour = shift; -if ($flavour=~/^\w[\w\-]*\.\w+$/) { $output=$flavour; undef $flavour; } -else { while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} } +if ($flavour=~/\w[\w\-]*\.\w+$/) { $output=$flavour; undef $flavour; } +else { while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} } if ($flavour && $flavour ne "void") { $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; diff --git a/crypto/chacha/asm/chacha-x86.pl b/crypto/chacha/asm/chacha-x86.pl index edce43dc..984ce11e 100755 --- a/crypto/chacha/asm/chacha-x86.pl +++ b/crypto/chacha/asm/chacha-x86.pl @@ -33,6 +33,9 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; push(@INC,"${dir}","${dir}../../perlasm"); require "x86asm.pl"; +$output=pop; +open STDOUT,">$output"; + &asm_init($ARGV[0],"chacha-x86.pl",$ARGV[$#ARGV] eq "386"); $xmm=$ymm=0; @@ -751,3 +754,5 @@ sub SSSE3ROUND { # critical path is 20 "SIMD ticks" per round &asciz ("ChaCha20 for x86, CRYPTOGAMS by <appro\@openssl.org>"); &asm_finish(); + +close STDOUT; |