From: Andreas Schwab Date: Wed, 5 Aug 2015 21:20:49 +0000 (+0200) Subject: Properly terminate FDE in makecontext for m68k (bug 18635) X-Git-Tag: glibc-2.23~708 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb1d31d06e400a42da4435e8649bb7a1451ef682;p=thirdparty%2Fglibc.git Properly terminate FDE in makecontext for m68k (bug 18635) --- diff --git a/ChangeLog b/ChangeLog index 4f985f1591c..8c4a5787c12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-08-05 Andreas Schwab + + [BZ #18635] + * sysdeps/unix/sysv/linux/m68k/m680x0/makecontext.S: Add nop + before return label. + 2015-08-05 H.J. Lu [BZ #18661] diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/makecontext.S b/sysdeps/unix/sysv/linux/m68k/m680x0/makecontext.S index f6ee50d2c75..5e717ab147f 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/makecontext.S +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/makecontext.S @@ -74,8 +74,11 @@ ENTRY(__makecontext) have to install the context listed in the uc_link element of the context 'makecontext' manipulated at the time of the 'makecontext' call. If the pointer is NULL the process must - terminate. */ + terminate. + Make sure to separate the return label from the previous unwind + region, because the unwinder uses ra-1 to find the FDE. */ cfi_endproc + nop 1: /* This removes the parameters passed to the function given to 'makecontext' from the stack. D7 contains the number of