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/bn | |
| parent | Add include directory options for assembler files that include from crypto/ (diff) | |
| download | openssl-a5aa63a456fb6e7129e3ba048b17d157df5a1bab.tar.xz openssl-a5aa63a456fb6e7129e3ba048b17d157df5a1bab.zip | |
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/bn')
| -rw-r--r-- | crypto/bn/asm/armv4-gf2m.pl | 4 | ||||
| -rw-r--r-- | crypto/bn/asm/armv4-mont.pl | 4 | ||||
| -rw-r--r-- | crypto/bn/asm/mips-mont.pl | 2 | ||||
| -rw-r--r-- | crypto/bn/asm/mips.pl | 2 | ||||
| -rw-r--r-- | crypto/bn/asm/s390x-gf2m.pl | 2 | ||||
| -rw-r--r-- | crypto/bn/asm/s390x-mont.pl | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/crypto/bn/asm/armv4-gf2m.pl b/crypto/bn/asm/armv4-gf2m.pl index 22aa4830f8..36681ee9cf 100644 --- a/crypto/bn/asm/armv4-gf2m.pl +++ b/crypto/bn/asm/armv4-gf2m.pl @@ -33,8 +33,8 @@ # http://conradoplg.cryptoland.net/files/2010/12/mocrysen13.pdf $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/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl index 6fb5bb40fb..c791502e99 100644 --- a/crypto/bn/asm/armv4-mont.pl +++ b/crypto/bn/asm/armv4-mont.pl @@ -48,8 +48,8 @@ # Snapdragon S4. $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/bn/asm/mips-mont.pl b/crypto/bn/asm/mips-mont.pl index a33cdf4111..3bccdf6931 100644 --- a/crypto/bn/asm/mips-mont.pl +++ b/crypto/bn/asm/mips-mont.pl @@ -67,7 +67,7 @@ $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0x00fff000 : 0x00ff0000; # ###################################################################### -while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} +while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} open STDOUT,">$output"; if ($flavour =~ /64|n32/i) { diff --git a/crypto/bn/asm/mips.pl b/crypto/bn/asm/mips.pl index acafde5e56..4c8eba0a05 100644 --- a/crypto/bn/asm/mips.pl +++ b/crypto/bn/asm/mips.pl @@ -49,7 +49,7 @@ # key length, more for longer keys. $flavour = shift || "o32"; -while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} +while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} open STDOUT,">$output"; if ($flavour =~ /64|n32/i) { diff --git a/crypto/bn/asm/s390x-gf2m.pl b/crypto/bn/asm/s390x-gf2m.pl index 9d18d40e77..1d76c9f416 100644 --- a/crypto/bn/asm/s390x-gf2m.pl +++ b/crypto/bn/asm/s390x-gf2m.pl @@ -35,7 +35,7 @@ if ($flavour =~ /3[12]/) { $g="g"; } -while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} +while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} open STDOUT,">$output"; $stdframe=16*$SIZE_T+4*8; diff --git a/crypto/bn/asm/s390x-mont.pl b/crypto/bn/asm/s390x-mont.pl index 9fd64e81ee..bdad486e4f 100644 --- a/crypto/bn/asm/s390x-mont.pl +++ b/crypto/bn/asm/s390x-mont.pl @@ -54,7 +54,7 @@ if ($flavour =~ /3[12]/) { $g="g"; } -while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} +while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} open STDOUT,">$output"; $stdframe=16*$SIZE_T+4*8; |