diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-11 00:49:47 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-11 00:54:31 +0100 |
| commit | a5aa63a456fb6e7129e3ba048b17d157df5a1bab (patch) | |
| tree | e475bc701075d17526bc7229d2899cc7c3cce42c /crypto/chacha | |
| parent | 603358de576217812cb3d752e97c78e476cdc879 (diff) | |
Fix some assembler generating scripts for better unification
Some of these scripts would recognise an output parameter if it looks
like a file path. That works both in both the classic and new build
schemes. Some fo these scripts would only recognise it if it's a
basename (i.e. no directory component). Those need to be corrected,
as the output parameter in the new build scheme is more likely to
contain a directory component than not.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto/chacha')
| -rwxr-xr-x | crypto/chacha/asm/chacha-armv4.pl | 4 | ||||
| -rwxr-xr-x | crypto/chacha/asm/chacha-s390x.pl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl index 4545101c31..c908399834 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-s390x.pl b/crypto/chacha/asm/chacha-s390x.pl index 00e4a146b2..42faadcd7f 100755 --- a/crypto/chacha/asm/chacha-s390x.pl +++ b/crypto/chacha/asm/chacha-s390x.pl @@ -23,7 +23,7 @@ if ($flavour =~ /3[12]/) { $g="g"; } -while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} +while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} open STDOUT,">$output"; sub AUTOLOAD() # thunk [simplified] x86-style perlasm |