diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-07-24 05:11:59 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-07-24 05:12:14 -0700 |
| commit | ca027e0f62789a0958b69dac4133616a90de6f7c (patch) | |
| tree | 3302d607d1ffbd1f957439b66847e809b71d558b | |
| parent | b99f1c957d37e6c5dfce2fee7bff17e5a09ce400 (diff) | |
| download | glibc-ca027e0f62789a0958b69dac4133616a90de6f7c.tar.gz glibc-ca027e0f62789a0958b69dac4133616a90de6f7c.tar.xz glibc-ca027e0f62789a0958b69dac4133616a90de6f7c.zip | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/x86_64/tst-quadmod1.S | 6 | ||||
| -rw-r--r-- | sysdeps/x86_64/tst-quadmod2.S | 6 |
3 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 03dbce43d9..2a1a53d9df 100644 --- 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 26f2f1b599..c60f9dc89d 100644 --- 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 e923adf672..af03444d4f 100644 --- 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 |