Properly terminate FDE in makecontext for m68k (bug 18635)

diff --git a/ChangeLog b/ChangeLog
index 4f985f1591ccecbdc1a55d79122a0b9308413d65..8c4a5787c122e7d7c2f32166ba5a6e98f8c476d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+       [BZ #18635]
+       * sysdeps/unix/sysv/linux/m68k/m680x0/makecontext.S: Add nop
+       before return label.
+
 2015-08-05  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #18661]

diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/makecontext.S b/sysdeps/unix/sysv/linux/m68k/m680x0/makecontext.S
index f6ee50d2c758375202aa48579db20ca821477ad8..5e717ab147feb42c08f61270edf03b7841d6e91a 100644 (file)
--- 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