aarch64: Remove some flavour conditionals
This change is expected to be a non-functional change.
Original request:
https://boringssl-review.googlesource.com/c/boringssl/+/42084
Change-Id: Ifbf85eb6cafebabf0cf063b7dd147417d01c280c
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/43584
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/crypto/fipsmodule/aes/asm/aesv8-armx.pl b/crypto/fipsmodule/aes/asm/aesv8-armx.pl
index 5fd9864..a2825ce 100644
--- a/crypto/fipsmodule/aes/asm/aesv8-armx.pl
+++ b/crypto/fipsmodule/aes/asm/aesv8-armx.pl
@@ -340,11 +340,7 @@
.type ${prefix}_${dir}crypt,%function
.align 5
${prefix}_${dir}crypt:
-___
-$code.=<<___ if ($flavour =~ /64/);
AARCH64_VALID_CALL_TARGET
-___
-$code.=<<___;
ldr $rounds,[$key,#240]
vld1.32 {$rndkey0},[$key],#16
vld1.8 {$inout},[$inp]
diff --git a/crypto/fipsmodule/modes/asm/ghashv8-armx.pl b/crypto/fipsmodule/modes/asm/ghashv8-armx.pl
index 82f7637..4afb6da 100644
--- a/crypto/fipsmodule/modes/asm/ghashv8-armx.pl
+++ b/crypto/fipsmodule/modes/asm/ghashv8-armx.pl
@@ -86,11 +86,7 @@
.type gcm_init_v8,%function
.align 4
gcm_init_v8:
-___
-$code.=<<___ if ($flavour =~ /64/);
AARCH64_VALID_CALL_TARGET
-___
-$code.=<<___;
vld1.64 {$t1},[x1] @ load input H
vmov.i8 $xC2,#0xe1
vshl.i64 $xC2,$xC2,#57 @ 0xc2.0
@@ -150,11 +146,7 @@
.type gcm_gmult_v8,%function
.align 4
gcm_gmult_v8:
-___
-$code.=<<___ if ($flavour =~ /64/);
AARCH64_VALID_CALL_TARGET
-___
-$code.=<<___;
vld1.64 {$t1},[$Xi] @ load Xi
vmov.i8 $xC2,#0xe1
vld1.64 {$H-$Hhl},[$Htbl] @ load twisted H, ...
@@ -207,8 +199,6 @@
.type gcm_ghash_v8,%function
.align 4
gcm_ghash_v8:
-___
-$code.=<<___ if ($flavour =~ /64/);
AARCH64_VALID_CALL_TARGET
___
$code.=<<___ if ($flavour !~ /64/);
