Remove ia32cap_P references from the perlasm code. It's already not used by any assembly .pl files, as evidenced by the fact that pregenerate passes without changes to generated files. Bug: 42290548 Change-Id: I1533df8c2acd5c1798441129c45e239c6a6a6964 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/87287 Reviewed-by: Xiangfei Ding <xfding@google.com> Commit-Queue: Rudolf Polzer <rpolzer@google.com>
diff --git a/crypto/perlasm/x86gas.pl b/crypto/perlasm/x86gas.pl index 62a5710..980a5a9 100644 --- a/crypto/perlasm/x86gas.pl +++ b/crypto/perlasm/x86gas.pl
@@ -177,12 +177,6 @@ { push(@out,"$non_lazy_ptr{$i}:\n.indirect_symbol\t$i\n.long\t0\n"); } } } - if (0 && grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out) { - my $tmp=".comm\t${nmdecor}OPENSSL_ia32cap_P,16"; - if ($::macosx) { push (@out,"$tmp,2\n"); } - elsif ($::elf) { push (@out,"$tmp,4\n"); } - else { push (@out,"$tmp\n"); } - } push(@out,$initseg) if ($initseg); } @@ -215,8 +209,6 @@ &::mov($dst,&::DWP("$indirect-$reflabel",$base)); $non_lazy_ptr{"$nmdecor$sym"}=$indirect; } - elsif ($sym eq "OPENSSL_ia32cap_P" && $::elf>0) - { &::lea($dst,&::DWP("$sym-$reflabel",$base)); } else { &::lea($dst,&::DWP("_GLOBAL_OFFSET_TABLE_+[.-$reflabel]", $base));
diff --git a/crypto/perlasm/x86masm.pl b/crypto/perlasm/x86masm.pl index a32483c..01d3596 100644 --- a/crypto/perlasm/x86masm.pl +++ b/crypto/perlasm/x86masm.pl
@@ -145,16 +145,6 @@ push(@out,"$segment ENDS\n"); - if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out) - { my $comm=<<___; -.bss SEGMENT 'BSS' -COMM ${nmdecor}OPENSSL_ia32cap_P:DWORD:4 -.bss ENDS -___ - # comment out OPENSSL_ia32cap_P declarations - grep {s/(^EXTERN\s+${nmdecor}OPENSSL_ia32cap_P)/\;$1/} @out; - push (@out,$comm); - } push (@out,$initseg) if ($initseg); push (@out,"END\n"); }
diff --git a/crypto/perlasm/x86nasm.pl b/crypto/perlasm/x86nasm.pl index 61c70f4..c9bc2cb 100644 --- a/crypto/perlasm/x86nasm.pl +++ b/crypto/perlasm/x86nasm.pl
@@ -130,16 +130,7 @@ } sub ::file_end -{ if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out) - { my $comm=<<___; -${drdecor}segment .bss -${drdecor}common ${nmdecor}OPENSSL_ia32cap_P 16 -___ - # comment out OPENSSL_ia32cap_P declarations - grep {s/(^extern\s+${nmdecor}OPENSSL_ia32cap_P)/\;$1/} @out; - push (@out,$comm) - } - push (@out,$initseg) if ($initseg); +{ } sub ::comment { foreach (@_) { push(@out,"\t; $_\n"); } }