Commit e195c8a2 authored by David Benjamin's avatar David Benjamin Committed by Rich Salz
Browse files

Remove filename argument to x86 asm_init. 



The assembler already knows the actual path to the generated file and,
in other perlasm architectures, is left to manage debug symbols itself.
Notably, in OpenSSL 1.1.x's new build system, which allows a separate
build directory, converting .pl to .s as the scripts currently do result
in the wrong paths.

This also avoids inconsistencies from some of the files using $0 and
some passing in the filename.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3431)
parent 07fbdfe9

crypto/aes/asm/aes-586.pl

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ $output = pop; 
open OUT,">$output";

*STDOUT=*OUT;



&asm_init($ARGV[0],"aes-586.pl",$x86only = $ARGV[$#ARGV] eq "386");

&asm_init($ARGV[0],$x86only = $ARGV[$#ARGV] eq "386");

&static_label("AES_Te");

&static_label("AES_Td");

crypto/aes/asm/aesni-x86.pl

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ $output = pop; 
open OUT,">$output";

*STDOUT=*OUT;



&asm_init($ARGV[0],$0);

&asm_init($ARGV[0]);



&external_label("OPENSSL_ia32cap_P");

&static_label("key_const");

crypto/aes/asm/vpaes-x86.pl

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ $output = pop; 
open OUT,">$output";

*STDOUT=*OUT;



&asm_init($ARGV[0],"vpaes-x86.pl",$x86only = $ARGV[$#ARGV] eq "386");

&asm_init($ARGV[0],$x86only = $ARGV[$#ARGV] eq "386");



$PREFIX="vpaes";

crypto/bf/asm/bf-586.pl

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ require "cbc.pl"; 
$output = pop;

open STDOUT,">$output";



&asm_init($ARGV[0],"bf-586.pl",$ARGV[$#ARGV] eq "386");

&asm_init($ARGV[0],$ARGV[$#ARGV] eq "386");



$BF_ROUNDS=16;

$BF_OFF=($BF_ROUNDS+2)*4;

crypto/bn/asm/bn-586.pl

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ require "x86asm.pl"; 
$output = pop;

open STDOUT,">$output";



&asm_init($ARGV[0],$0);

&asm_init($ARGV[0]);



$sse2=0;

for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }