Commit a5aa63a4 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarAndy Polyakov <appro@openssl.org>
parent 603358de

crypto/aes/asm/aes-armv4.pl

+2 −2
Original line number Diff line number Diff line
@@ -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;

crypto/aes/asm/aes-mips.pl

+2 −2
Original line number Diff line number Diff line
@@ -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

crypto/aes/asm/aes-s390x.pl

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/aes/asm/bsaes-armv7.pl

+2 −2
Original line number Diff line number Diff line
@@ -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;

crypto/aes/asm/vpaes-armv8.pl

+1 −1
Original line number Diff line number Diff line
@@ -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