Merge BoringSSL 20c93ab: Remove OPENSSL_IA32_SSE2 checks in x86 perlasm.

briansmith · Jan 21, 2025 · ee7f382 · ee7f382
2 parents 7fb4201 + 20c93ab
commit ee7f382
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/crypto/chacha/asm/chacha-x86.pl b/crypto/chacha/asm/chacha-x86.pl
@@ -45,7 +45,7 @@
 $output=pop;
 open STDOUT,">$output";
 
-&asm_init($ARGV[0],$ARGV[$#ARGV] eq "386");
+&asm_init($ARGV[0]);
 
 $xmm=$ymm=1;
 $gasver=999;  # enable everything

diff --git a/crypto/fipsmodule/aes/asm/vpaes-x86.pl b/crypto/fipsmodule/aes/asm/vpaes-x86.pl
@@ -62,7 +62,7 @@
 open OUT,">$output";
 *STDOUT=*OUT;
 
-&asm_init($ARGV[0],$x86only = $ARGV[$#ARGV] eq "386");
+&asm_init($ARGV[0]);
 
 $PREFIX="vpaes";
 

diff --git a/crypto/fipsmodule/bn/asm/x86-mont.pl b/crypto/fipsmodule/bn/asm/x86-mont.pl
@@ -42,8 +42,7 @@
 
 &asm_init($ARGV[0]);
 
-$sse2=0;
-for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
+$sse2=1;
 
 &external_label("OPENSSL_ia32cap_P") if ($sse2);
 

diff --git a/crypto/fipsmodule/modes/asm/ghash-x86.pl b/crypto/fipsmodule/modes/asm/ghash-x86.pl
@@ -141,8 +141,9 @@
 $output=pop;
 open STDOUT,">$output";
 
-&asm_init($ARGV[0],$x86only = $ARGV[$#ARGV] eq "386");
+&asm_init($ARGV[0]);
 
+$x86only=0;
 $sse2=1;
 
 if (!$x86only) {{{