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/ec | |
| 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/ec')
| -rwxr-xr-x | crypto/ec/asm/ecp_nistz256-armv4.pl | 4 | ||||
| -rw-r--r-- | crypto/ec/asm/ecp_nistz256-armv8.pl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/ec/asm/ecp_nistz256-armv4.pl b/crypto/ec/asm/ecp_nistz256-armv4.pl index ab11a8782e..d777459fd1 100755 --- a/crypto/ec/asm/ecp_nistz256-armv4.pl +++ b/crypto/ec/asm/ecp_nistz256-armv4.pl @@ -27,8 +27,8 @@ # operation. Keep in mind that +200% means 3x improvement. $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/ec/asm/ecp_nistz256-armv8.pl b/crypto/ec/asm/ecp_nistz256-armv8.pl index 4b2e925434..5a60f0b2fa 100644 --- a/crypto/ec/asm/ecp_nistz256-armv8.pl +++ b/crypto/ec/asm/ecp_nistz256-armv8.pl @@ -26,7 +26,7 @@ # operation. Keep in mind that +400% means 5x improvement. $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 |