diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 17:45:04 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 17:45:04 +0000 |
| commit | 6aa82888e61d3e2232926ee68e764f17eae2e7e1 (patch) | |
| tree | 17b2fb350da15d1d097f22dc7e2e7d20db1bd486 /sysdeps/unix/sysv/linux/s390/s390-64/__makecontext_ret.S | |
| parent | ffbe9c552a1009167ec7a765c1543c7f3e4169d6 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/sendmsg-SCM_RIGHTS' into t/sendmsg-SCM_RIGHTS
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 | 12 |
1 files changed, 3 insertions, 9 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 33ce6dc6ce..d50115d7ad 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/__makecontext_ret.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/__makecontext_ret.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2012-2016 Free Software Foundation, Inc. +/* Copyright (C) 2012-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,15 +17,9 @@ #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) + /* Mark r14 as undefined in order to stop unwinding here! */ + cfi_undefined (r14) basr %r14,%r7 ltgr %r8,%r8 /* Check whether uc_link is 0. */ jz 1f |