kris/onging/CECPQ3_patch1543e5a26b53
removed the .file directive from x86asm.pl. This removes the parameter from asm_init altogether. See also upstream'se195c8a256
. Change-Id: I65761bc962d09f9210661a38ecf6df23eae8743d Reviewed-on: https://boringssl-review.googlesource.com/16247 Reviewed-by: Steven Valdez <svaldez@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
@@ -38,7 +38,7 @@ require "x86asm.pl"; | |||||
$output=pop; | $output=pop; | ||||
open STDOUT,">$output"; | open STDOUT,">$output"; | ||||
&asm_init($ARGV[0],"chacha-x86.pl",$ARGV[$#ARGV] eq "386"); | |||||
&asm_init($ARGV[0],$ARGV[$#ARGV] eq "386"); | |||||
$xmm=$ymm=1; | $xmm=$ymm=1; | ||||
$gasver=999; # enable everything | $gasver=999; # enable everything | ||||
@@ -195,7 +195,7 @@ $output = pop; | |||||
open OUT,">$output"; | open OUT,">$output"; | ||||
*STDOUT=*OUT; | *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_Te"); | ||||
&static_label("AES_Td"); | &static_label("AES_Td"); | ||||
@@ -69,7 +69,7 @@ $output = pop; | |||||
open OUT,">$output"; | open OUT,">$output"; | ||||
*STDOUT=*OUT; | *STDOUT=*OUT; | ||||
&asm_init($ARGV[0],$0); | |||||
&asm_init($ARGV[0]); | |||||
&external_label("OPENSSL_ia32cap_P"); | &external_label("OPENSSL_ia32cap_P"); | ||||
&static_label("key_const"); | &static_label("key_const"); | ||||
@@ -55,7 +55,7 @@ $output = pop; | |||||
open OUT,">$output"; | open OUT,">$output"; | ||||
*STDOUT=*OUT; | *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"; | $PREFIX="vpaes"; | ||||
@@ -7,7 +7,7 @@ require "x86asm.pl"; | |||||
$output = pop; | $output = pop; | ||||
open STDOUT,">$output"; | open STDOUT,">$output"; | ||||
&asm_init($ARGV[0],$0); | |||||
&asm_init($ARGV[0]); | |||||
$sse2=0; | $sse2=0; | ||||
for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } | for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } | ||||
@@ -7,7 +7,7 @@ require "x86asm.pl"; | |||||
$output = pop; | $output = pop; | ||||
open STDOUT,">$output"; | open STDOUT,">$output"; | ||||
&asm_init($ARGV[0],$0); | |||||
&asm_init($ARGV[0]); | |||||
&bn_mul_comba("bn_mul_comba8",8); | &bn_mul_comba("bn_mul_comba8",8); | ||||
&bn_mul_comba("bn_mul_comba4",4); | &bn_mul_comba("bn_mul_comba4",4); | ||||
@@ -33,7 +33,7 @@ require "x86asm.pl"; | |||||
$output = pop; | $output = pop; | ||||
open STDOUT,">$output"; | open STDOUT,">$output"; | ||||
&asm_init($ARGV[0],$0); | |||||
&asm_init($ARGV[0]); | |||||
$sse2=0; | $sse2=0; | ||||
for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } | for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } | ||||
@@ -14,7 +14,7 @@ require "x86asm.pl"; | |||||
$output=pop; | $output=pop; | ||||
open STDOUT,">$output"; | open STDOUT,">$output"; | ||||
&asm_init($ARGV[0],$0); | |||||
&asm_init($ARGV[0]); | |||||
$A="eax"; | $A="eax"; | ||||
$B="ebx"; | $B="ebx"; | ||||
@@ -132,7 +132,7 @@ require "x86asm.pl"; | |||||
$output=pop; | $output=pop; | ||||
open STDOUT,">$output"; | open STDOUT,">$output"; | ||||
&asm_init($ARGV[0],"ghash-x86.pl",$x86only = $ARGV[$#ARGV] eq "386"); | |||||
&asm_init($ARGV[0],$x86only = $ARGV[$#ARGV] eq "386"); | |||||
$sse2=0; | $sse2=0; | ||||
for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } | for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } | ||||
@@ -120,7 +120,7 @@ require "x86asm.pl"; | |||||
$output=pop; | $output=pop; | ||||
open STDOUT,">$output"; | open STDOUT,">$output"; | ||||
&asm_init($ARGV[0],"sha1-586.pl",$ARGV[$#ARGV] eq "386"); | |||||
&asm_init($ARGV[0],$ARGV[$#ARGV] eq "386"); | |||||
$xmm=$ymm=0; | $xmm=$ymm=0; | ||||
for (@ARGV) { $xmm=1 if (/-DOPENSSL_IA32_SSE2/); } | for (@ARGV) { $xmm=1 if (/-DOPENSSL_IA32_SSE2/); } | ||||
@@ -69,7 +69,7 @@ require "x86asm.pl"; | |||||
$output=pop; | $output=pop; | ||||
open STDOUT,">$output"; | open STDOUT,">$output"; | ||||
&asm_init($ARGV[0],"sha512-586.pl",$ARGV[$#ARGV] eq "386"); | |||||
&asm_init($ARGV[0],$ARGV[$#ARGV] eq "386"); | |||||
$xmm=$avx=0; | $xmm=$avx=0; | ||||
for (@ARGV) { $xmm=1 if (/-DOPENSSL_IA32_SSE2/); } | for (@ARGV) { $xmm=1 if (/-DOPENSSL_IA32_SSE2/); } | ||||
@@ -55,7 +55,7 @@ require "x86asm.pl"; | |||||
$output=pop; | $output=pop; | ||||
open STDOUT,">$output"; | open STDOUT,">$output"; | ||||
&asm_init($ARGV[0],"sha512-586.pl",$ARGV[$#ARGV] eq "386"); | |||||
&asm_init($ARGV[0],$ARGV[$#ARGV] eq "386"); | |||||
$sse2=0; | $sse2=0; | ||||
for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } | for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } | ||||
@@ -9,7 +9,7 @@ require "x86asm.pl"; | |||||
The first thing we do is setup the file and type of assembler | The first thing we do is setup the file and type of assembler | ||||
&asm_init($ARGV[0],$0); | |||||
&asm_init($ARGV[0]); | |||||
The first argument is the 'type'. Currently | The first argument is the 'type'. Currently | ||||
'cpp', 'sol', 'a.out', 'elf' or 'win32'. | 'cpp', 'sol', 'a.out', 'elf' or 'win32'. | ||||
@@ -62,7 +62,7 @@ So a very simple version of this function could be coded as | |||||
push(@INC,"perlasm","../../perlasm"); | push(@INC,"perlasm","../../perlasm"); | ||||
require "x86asm.pl"; | require "x86asm.pl"; | ||||
&asm_init($ARGV[0],"cacl.pl"); | |||||
&asm_init($ARGV[0]); | |||||
&external_label("other"); | &external_label("other"); | ||||
@@ -8,7 +8,7 @@ | |||||
# require 'x86asm.pl'; | # require 'x86asm.pl'; | ||||
# &asm_init(<flavor>,"des-586.pl"[,$i386only]); | |||||
# &asm_init(<flavor>[,$i386only]); | |||||
# &function_begin("foo"); | # &function_begin("foo"); | ||||
# ... | # ... | ||||
# &function_end("foo"); | # &function_end("foo"); | ||||
@@ -261,9 +261,8 @@ sub ::asm_finish | |||||
} | } | ||||
sub ::asm_init | sub ::asm_init | ||||
{ my ($type,$fn,$cpu)=@_; | |||||
{ my ($type,$cpu)=@_; | |||||
$filename=$fn; | |||||
$i386=$cpu; | $i386=$cpu; | ||||
$elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=$android=0; | $elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=$android=0; | ||||
@@ -303,8 +302,7 @@ EOF | |||||
$pic=0; | $pic=0; | ||||
for (@ARGV) { $pic=1 if (/\-[fK]PIC/i); } | for (@ARGV) { $pic=1 if (/\-[fK]PIC/i); } | ||||
$filename =~ s/\.pl$//; | |||||
&file($filename); | |||||
&file(); | |||||
} | } | ||||
sub ::hidden {} | sub ::hidden {} | ||||
@@ -85,7 +85,6 @@ sub ::DWC { "@_"; } | |||||
sub ::file | sub ::file | ||||
{ my $tmp=<<___; | { my $tmp=<<___; | ||||
TITLE $_[0].asm | |||||
IF \@Version LT 800 | IF \@Version LT 800 | ||||
ECHO MASM version 8.00 or later is strongly recommended. | ECHO MASM version 8.00 or later is strongly recommended. | ||||
ENDIF | ENDIF | ||||