Align armv8.pl references to OPENSSL_armcap_P.
This imports d741debb320bf54e8575d35603a44d4eb40fa1f9 from upstream.
We've been managing the shared libraries already because our
arm-xlate.pl automatically adds .hidden to .extern lines, but nice to
reduce the diff. (This does result in some duplicate .hidden lines in
the generated output, but we still want the arm-xlate.pl patch to
automatically hide .globl.)
Removing .comm lines does change the generated output, but having each
asm file define its own copy of OPENSSL_armcap_P as a common symbol
always seemed odd. I recall some weird issue where the armv4.pl files
subtly rely on it for iOS's strange .indirect_symbol machinery. (Not
actually because iOS wants a common symbol but because arm-xlate.pl
repurposes .comm to trigger .indirect_symbol.) Fortunately, aarch64 is
much better about PC-relative addressing, so it should be a no-op.
The .comm lines have also previously caused weird issues
(https://boringssl-review.googlesource.com/c/boringssl/+/32324), so
it's generally nice to get rid of them.
Update-Note: If aarch64 builds get some weird error about relocations,
it's this CL's fault.
Change-Id: I763ffa6cda750d99694ded8a5b68d7b27b09cfc9
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/44464
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/crypto/chacha/asm/chacha-armv8.pl b/crypto/chacha/asm/chacha-armv8.pl
index 05958c8..9c1c2d4 100755
--- a/crypto/chacha/asm/chacha-armv8.pl
+++ b/crypto/chacha/asm/chacha-armv8.pl
@@ -123,6 +123,7 @@
#include <openssl/arm_arch.h>
.extern OPENSSL_armcap_P
+.hidden OPENSSL_armcap_P
.section .rodata
diff --git a/crypto/fipsmodule/sha/asm/sha1-armv8.pl b/crypto/fipsmodule/sha/asm/sha1-armv8.pl
index dfde8c9..0a3acac 100644
--- a/crypto/fipsmodule/sha/asm/sha1-armv8.pl
+++ b/crypto/fipsmodule/sha/asm/sha1-armv8.pl
@@ -176,6 +176,7 @@
.text
.extern OPENSSL_armcap_P
+.hidden OPENSSL_armcap_P
.globl sha1_block_data_order
.type sha1_block_data_order,%function
.align 6
@@ -327,8 +328,6 @@
.long 0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6 //K_60_79
.asciz "SHA1 block transform for ARMv8, CRYPTOGAMS by <appro\@openssl.org>"
.align 2
-.comm OPENSSL_armcap_P,4,4
-.hidden OPENSSL_armcap_P
___
}}}
diff --git a/crypto/fipsmodule/sha/asm/sha512-armv8.pl b/crypto/fipsmodule/sha/asm/sha512-armv8.pl
index aff41ce..8b671e2 100644
--- a/crypto/fipsmodule/sha/asm/sha512-armv8.pl
+++ b/crypto/fipsmodule/sha/asm/sha512-armv8.pl
@@ -179,6 +179,7 @@
.text
.extern OPENSSL_armcap_P
+.hidden OPENSSL_armcap_P
.globl $func
.type $func,%function
.align 6
@@ -423,13 +424,6 @@
___
}
-$code.=<<___;
-#ifndef __KERNEL__
-.comm OPENSSL_armcap_P,4,4
-.hidden OPENSSL_armcap_P
-#endif
-___
-
{ my %opcode = (
"sha256h" => 0x5e004000, "sha256h2" => 0x5e005000,
"sha256su0" => 0x5e282800, "sha256su1" => 0x5e006000 );
diff --git a/util/diff_asm.go b/util/diff_asm.go
index 7b9b454..710a42c 100644
--- a/util/diff_asm.go
+++ b/util/diff_asm.go
@@ -31,8 +31,19 @@
func mapName(path string) string {
path = strings.Replace(path, filepath.FromSlash("/fipsmodule/"), string(filepath.Separator), 1)
- switch filepath.ToSlash(path) {
- case "crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl", "crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl", "crypto/rand/asm/rdrand-x86_64.pl":
+ pathSlash := filepath.ToSlash(path)
+ if strings.HasPrefix(pathSlash, "crypto/test/") {
+ return ""
+ }
+ switch pathSlash {
+ case "crypto/aes/asm/vpaes-armv7.pl",
+ "crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl",
+ "crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl",
+ "crypto/ec/asm/p256_beeu-x86_64-asm.pl",
+ "crypto/modes/asm/ghash-neon-armv8.pl",
+ "crypto/modes/asm/ghash-ssse3-x86.pl",
+ "crypto/modes/asm/ghash-ssse3-x86_64.pl",
+ "crypto/rand/asm/rdrand-x86_64.pl":
return ""
case "crypto/ec/asm/p256-x86_64-asm.pl":
return filepath.FromSlash("crypto/ec/asm/ecp_nistz256-x86_64.pl")
