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

2 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/libcrypto/rc4/asm/rc4-md5-x86_64.pl b/src/lib/libcrypto/rc4/asm/rc4-md5-x86_64.pl
index 3190e6a8e7..e5e8aa08a1 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-md5-x86_64.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-md5-x86_64.pl
@@ -109,7 +109,7 @@ $code.=<<___;
 .globl  $func
 .type   $func,\@function,$nargs
 $func:
-        endbr64
+        _CET_ENDBR
         cmp     \$0,$len
         je      .Labort
         push    %rbx
@@ -454,7 +454,7 @@ $code.=<<___;
 .type   RC4_set_key,\@function,3
 .align  16
 RC4_set_key:
-        endbr64
+        _CET_ENDBR
         lea     8($dat),$dat
         lea     ($inp,$len),$inp
         neg     $len
diff --git a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
index 0472acce8a..a9cf9d1bdf 100755
--- a/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-x86_64.pl
@@ -128,7 +128,7 @@ $code=<<___;
 .type   RC4,\@function,4
 .align  16
 RC4:
-        endbr64
+        _CET_ENDBR
         or      $len,$len
         jne     .Lentry
         ret
@@ -435,7 +435,7 @@ $code.=<<___;
 .type   RC4_set_key,\@function,3
 .align  16
 RC4_set_key:
-        endbr64
+        _CET_ENDBR
         lea     8($dat),$dat
         lea     ($inp,$len),$inp
         neg     $len