diff options
| author | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2016-05-25 10:04:06 -0300 |
|---|---|---|
| committer | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2016-05-25 10:04:06 -0300 |
| commit | 2feb372c585eb77141adbff24d4958e5a5e6678a (patch) | |
| tree | 79416b255a6e61e6fdbc913da3be86d87a8a25ff /sysdeps/unix/sysv/linux/s390/s390-64/__makecontext_ret.S | |
| parent | c69c361ca6bf95f8c665884ee863168a321d472a (diff) | |
| parent | 916ef0f69613613e11123657bff127bd26104630 (diff) | |
| download | glibc-2feb372c585eb77141adbff24d4958e5a5e6678a.tar.gz glibc-2feb372c585eb77141adbff24d4958e5a5e6678a.tar.xz glibc-2feb372c585eb77141adbff24d4958e5a5e6678a.zip | |
Merge release/2.20/master into ibm/2.20/master ibm/2.20/master
Conflicts: NEWS
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390/s390-64/__makecontext_ret.S')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/__makecontext_ret.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/__makecontext_ret.S b/sysdeps/unix/sysv/linux/s390/s390-64/__makecontext_ret.S index 71ecbab08e..a2bf3ca02d 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/__makecontext_ret.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/__makecontext_ret.S @@ -17,6 +17,14 @@ #include <sysdep.h> +/* We do not want .eh_frame info so that __makecontext_ret stops unwinding + if backtrace was called within a context created by makecontext. (There + is also no .eh_frame info for _start or thread_start.) */ +#undef cfi_startproc +#define cfi_startproc +#undef cfi_endproc +#define cfi_endproc + ENTRY(__makecontext_ret) basr %r14,%r7 ltgr %r8,%r8 /* Check whether uc_link is 0. */ |