x86-64: Add endbr64 to tst-quadmod[12].S

Add endbr64 to tst-quadmod1.S and tst-quadmod2.S so that func and foo
can be called indirectly.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
	* sysdeps/x86_64/tst-quadmod1.S (func): Add endbr64 if IBT is
	enabled.
	(foo): Likewise.
	* sysdeps/x86_64/tst-quadmod2.S (func) : Likewise.
	(foo): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 03dbce43d9907cb232a9a1bd9d33b415cf1102b2..2a1a53d9df5514eb6921b5339fc3bc89f42f66e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-07-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/x86_64/tst-quadmod1.S (func): Add endbr64 if IBT is
+       enabled.
+       (foo): Likewise.
+       * sysdeps/x86_64/tst-quadmod2.S (func) : Likewise.
+       (foo): Likewise.
+
 2018-07-20  Joseph Myers  <joseph@codesourcery.com>
 
        * scripts/build-many-glibcs.py (Context.checkout): Default

diff --git a/sysdeps/x86_64/tst-quadmod1.S b/sysdeps/x86_64/tst-quadmod1.S
index 26f2f1b5994253a415e8cb7f821cab3c6edd9e48..c60f9dc89d97318964c1058ef51a972c2cdd31ff 100644 (file)
--- a/sysdeps/x86_64/tst-quadmod1.S
+++ b/sysdeps/x86_64/tst-quadmod1.S
@@ -28,6 +28,9 @@
        .type   func, @function
 func:
        .cfi_startproc
+#if defined __CET__ && (__CET__ & 1) != 0
+       endbr64
+#endif
        xorl    %edi, %edi
        jmp     exit@PLT
        .cfi_endproc
@@ -37,6 +40,9 @@ func:
 foo:
        .cfi_startproc
        .cfi_def_cfa_register 6
+#if defined __CET__ && (__CET__ & 1) != 0
+       endbr64
+#endif
        movq    .Ljmp(%rip), %rax
        subq    $BIAS, %rax
        jmp     *%rax

diff --git a/sysdeps/x86_64/tst-quadmod2.S b/sysdeps/x86_64/tst-quadmod2.S
index e923adf672d8256816e35de44a9f600038852273..af03444d4f86bf968eea1b20af39246a5e8f1926 100644 (file)
--- a/sysdeps/x86_64/tst-quadmod2.S
+++ b/sysdeps/x86_64/tst-quadmod2.S
@@ -27,6 +27,9 @@
        .type   func, @function
 func:
        .cfi_startproc
+#if defined __CET__ && (__CET__ & 1) != 0
+       endbr64
+#endif
        xorl    %edi, %edi
        jmp     exit@PLT
        .cfi_endproc
@@ -36,6 +39,9 @@ func:
 foo:
        .cfi_startproc
        .cfi_def_cfa_register 6
+#if defined __CET__ && (__CET__ & 1) != 0
+       endbr64
+#endif
        movq    .Ljmp(%rip), %rax
        subq    $BIAS, %rax
        jmp     *%rax