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/aes | |
| 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/aes')
| -rw-r--r-- | crypto/aes/asm/aes-armv4.pl | 4 | ||||
| -rw-r--r-- | crypto/aes/asm/aes-mips.pl | 4 | ||||
| -rw-r--r-- | crypto/aes/asm/aes-s390x.pl | 2 | ||||
| -rw-r--r-- | crypto/aes/asm/bsaes-armv7.pl | 4 | ||||
| -rwxr-xr-x | crypto/aes/asm/vpaes-armv8.pl | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl index f72d027458..3efe415e66 100644 --- a/crypto/aes/asm/aes-armv4.pl +++ b/crypto/aes/asm/aes-armv4.pl @@ -33,8 +33,8 @@ # improvement on Cortex A8 core and ~21.5 cycles per byte. $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/aes/asm/aes-mips.pl b/crypto/aes/asm/aes-mips.pl index a82d8af6f2..77dfe1ac9b 100644 --- a/crypto/aes/asm/aes-mips.pl +++ b/crypto/aes/asm/aes-mips.pl @@ -81,13 +81,13 @@ $pf = ($flavour =~ /nubi/i) ? $t0 : $t2; $big_endian=(`echo MIPSEL | $ENV{CC} -E -`=~/MIPSEL/)?1:0 if ($ENV{CC}); -for (@ARGV) { $output=$_ if (/^\w[\w\-]*\.\w+$/); } +for (@ARGV) { $output=$_ if (/\w[\w\-]*\.\w+$/); } open STDOUT,">$output"; if (!defined($big_endian)) { $big_endian=(unpack('L',pack('N',1))==1); } -while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} +while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} open STDOUT,">$output"; my ($MSB,$LSB)=(0,3); # automatically converted to little-endian diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl index 71d5b55077..4aacf1b6b5 100644 --- a/crypto/aes/asm/aes-s390x.pl +++ b/crypto/aes/asm/aes-s390x.pl @@ -92,7 +92,7 @@ if ($flavour =~ /3[12]/) { $g="g"; } -while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} +while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} open STDOUT,">$output"; $softonly=0; # allow hardware support diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl index 03b8d825cd..58d0173de2 100644 --- a/crypto/aes/asm/bsaes-armv7.pl +++ b/crypto/aes/asm/bsaes-armv7.pl @@ -48,8 +48,8 @@ # <ard.biesheuvel@linaro.org> $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/aes/asm/vpaes-armv8.pl b/crypto/aes/asm/vpaes-armv8.pl index bc90b9f3bb..f44c62a0a2 100755 --- a/crypto/aes/asm/vpaes-armv8.pl +++ b/crypto/aes/asm/vpaes-armv8.pl @@ -30,7 +30,7 @@ # (***) presented for reference/comparison purposes; $flavour = shift; -while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} +while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; ( $xlate="${dir}arm-xlate.pl" and -f $xlate ) or |