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/modes | |
| 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/modes')
| -rw-r--r-- | crypto/modes/asm/aesni-gcm-x86_64.pl | 2 | ||||
| -rw-r--r-- | crypto/modes/asm/ghash-armv4.pl | 4 | ||||
| -rw-r--r-- | crypto/modes/asm/ghash-x86.pl | 5 | ||||
| -rw-r--r-- | crypto/modes/asm/ghash-x86_64.pl | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/crypto/modes/asm/aesni-gcm-x86_64.pl b/crypto/modes/asm/aesni-gcm-x86_64.pl index 5d58bbbb..f777a6e4 100644 --- a/crypto/modes/asm/aesni-gcm-x86_64.pl +++ b/crypto/modes/asm/aesni-gcm-x86_64.pl @@ -49,7 +49,7 @@ die "can't locate x86_64-xlate.pl"; # output, so this isn't useful anyway. $avx = 0; -open OUT,"| \"$^X\" $xlate $flavour $output"; +open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""; *STDOUT=*OUT; if ($avx>1) {{{ diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl index bb0dba5f..299eedcb 100644 --- a/crypto/modes/asm/ghash-armv4.pl +++ b/crypto/modes/asm/ghash-armv4.pl @@ -72,8 +72,8 @@ # example... $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/modes/asm/ghash-x86.pl b/crypto/modes/asm/ghash-x86.pl index 0269169f..db6eeae0 100644 --- a/crypto/modes/asm/ghash-x86.pl +++ b/crypto/modes/asm/ghash-x86.pl @@ -129,6 +129,9 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; push(@INC,"${dir}","${dir}../../perlasm"); require "x86asm.pl"; +$output=pop; +open STDOUT,">$output"; + &asm_init($ARGV[0],"ghash-x86.pl",$x86only = $ARGV[$#ARGV] eq "386"); $sse2=0; @@ -1369,6 +1372,8 @@ my ($Xhi,$Xi)=@_; &asciz("GHASH for x86, CRYPTOGAMS by <appro\@openssl.org>"); &asm_finish(); +close STDOUT; + # A question was risen about choice of vanilla MMX. Or rather why wasn't # SSE2 chosen instead? In addition to the fact that MMX runs on legacy # CPUs such as PIII, "4-bit" MMX version was observed to provide better diff --git a/crypto/modes/asm/ghash-x86_64.pl b/crypto/modes/asm/ghash-x86_64.pl index 5a11fb94..df8546c1 100644 --- a/crypto/modes/asm/ghash-x86_64.pl +++ b/crypto/modes/asm/ghash-x86_64.pl @@ -98,7 +98,7 @@ die "can't locate x86_64-xlate.pl"; # output, so this isn't useful anyway. $avx = 0; -open OUT,"| \"$^X\" $xlate $flavour $output"; +open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""; *STDOUT=*OUT; $do4xaggr=1; |