Replace uses of endbr64 with _CET_ENDBR from cet.h

cet.h is needed for other platforms to emit the relevant .gnu.properties
sections that are necessary for them to enable IBT. It also avoids issues
with older toolchains on macOS that explode on encountering endbr64.

based on a diff by kettenis
ok beck kettenis

1 files changed, 8 insertions, 8 deletions

diff --git a/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl b/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl
index 3ceed3e899..187f0596d7 100644
--- a/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl
+++ b/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl
@@ -116,7 +116,7 @@ $code=<<___;
 .type   Camellia_EncryptBlock,\@abi-omnipotent
 .align  16
 Camellia_EncryptBlock:
-        endbr64
+        _CET_ENDBR
         movl    \$128,%eax
         subl    $arg0d,%eax
         movl    \$3,$arg0d
@@ -129,7 +129,7 @@ Camellia_EncryptBlock:
 .align  16
 .Lenc_rounds:
 Camellia_EncryptBlock_Rounds:
-        endbr64
+        _CET_ENDBR
         push    %rbx
         push    %rbp
         push    %r13
@@ -178,7 +178,7 @@ Camellia_EncryptBlock_Rounds:
 .type   _x86_64_Camellia_encrypt,\@abi-omnipotent
 .align  16
 _x86_64_Camellia_encrypt:
-        endbr64
+        _CET_ENDBR
         xor     0($key),@S[1]
         xor     4($key),@S[0]           # ^=key[0-3]
         xor     8($key),@S[3]
@@ -229,7 +229,7 @@ $code.=<<___;
 .type   Camellia_DecryptBlock,\@abi-omnipotent
 .align  16
 Camellia_DecryptBlock:
-        endbr64
+        _CET_ENDBR
         movl    \$128,%eax
         subl    $arg0d,%eax
         movl    \$3,$arg0d
@@ -242,7 +242,7 @@ Camellia_DecryptBlock:
 .align  16
 .Ldec_rounds:
 Camellia_DecryptBlock_Rounds:
-        endbr64
+        _CET_ENDBR
         push    %rbx
         push    %rbp
         push    %r13
@@ -291,7 +291,7 @@ Camellia_DecryptBlock_Rounds:
 .type   _x86_64_Camellia_decrypt,\@abi-omnipotent
 .align  16
 _x86_64_Camellia_decrypt:
-        endbr64
+        _CET_ENDBR
         xor     0($key),@S[1]
         xor     4($key),@S[0]           # ^=key[0-3]
         xor     8($key),@S[3]
@@ -406,7 +406,7 @@ $code.=<<___;
 .type   Camellia_Ekeygen,\@function,3
 .align  16
 Camellia_Ekeygen:
-        endbr64
+        _CET_ENDBR
         push    %rbx
         push    %rbp
         push    %r13
@@ -637,7 +637,7 @@ $code.=<<___;
 .type   Camellia_cbc_encrypt,\@function,6
 .align  16
 Camellia_cbc_encrypt:
-        endbr64
+        _CET_ENDBR
         cmp     \$0,%rdx
         je      .Lcbc_abort
         push    %rbx