Commit cfe1d992 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

x86_64 assembly pack: tolerate spaces in source directory name. 



[as it is now quoting $output is not required, but done just in case]

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 97855556

crypto/aes/asm/aes-x86_64.pl

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; 
( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or

die "can't locate x86_64-xlate.pl";



open OUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";

*STDOUT=*OUT;



$verticalspin=1;	# unlike 32-bit version $verticalspin performs

crypto/aes/asm/aesni-mb-x86_64.pl

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([ 
	$avx = ($2>=3.0) + ($2>3.0);

}



open OUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";

*STDOUT=*OUT;



# void aesni_multi_cbc_encrypt (

crypto/aes/asm/aesni-sha1-x86_64.pl

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ $shaext=1; ### set to zero if compiling for 1.0.1 


$stitched_decrypt=0;



open OUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";

*STDOUT=*OUT;



# void aesni_cbc_sha1_enc(const void *inp,

crypto/aes/asm/aesni-sha256-x86_64.pl

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([ 
$shaext=$avx;	### set to zero if compiling for 1.0.1

$avx=1		if (!$shaext && $avx);



open OUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";

*STDOUT=*OUT;



$func="aesni_cbc_sha256_enc";

crypto/aes/asm/aesni-x86_64.pl

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; 
( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or

die "can't locate x86_64-xlate.pl";



open OUT,"| \"$^X\" $xlate $flavour $output";

open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";

*STDOUT=*OUT;



$movkey = $PREFIX eq "aesni" ? "movups" : "movups";