aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/tile/makecontext.c8
-rw-r--r--sysdeps/unix/sysv/linux/tile/setcontext.S2
3 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 490c0ac..d855f76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-21 Chris Metcalf <cmetcalf@ezchip.com>
+
+ * sysdeps/unix/sysv/linux/tile/makecontext.c (__makecontext): Call
+ __startcontext to initialize the new context.
+ * sysdeps/unix/sysv/linux/tile/setcontext.S (__startcontext): Set
+ up CFI directive to forbid further backtracing.
+
2015-07-21 Marko Myllynen <myllynen@redhat.com>
* charmaps/ANSI_X3.110-1983: Remove obsolete repertoire map
diff --git a/sysdeps/unix/sysv/linux/tile/makecontext.c b/sysdeps/unix/sysv/linux/tile/makecontext.c
index b14b8d5..c77d005 100644
--- a/sysdeps/unix/sysv/linux/tile/makecontext.c
+++ b/sysdeps/unix/sysv/linux/tile/makecontext.c
@@ -52,14 +52,14 @@ __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
}
va_end (ap);
- /* Pass (*func) to __startcontext in pc. */
- ucp->uc_mcontext.pc = (long) func;
+ /* Start in the trampoline. */
+ ucp->uc_mcontext.pc = (long) __startcontext;
/* Set stack pointer. */
ucp->uc_mcontext.sp = (long) sp;
- /* Set the return address to trampoline. */
- ucp->uc_mcontext.lr = (long) __startcontext;
+ /* Pass FUNC to __startcontext in r31. */
+ ucp->uc_mcontext.gregs[31] = (long) func;
/* Pass ucp->uc_link to __startcontext in r30. */
ucp->uc_mcontext.gregs[30] = (long) ucp->uc_link;
diff --git a/sysdeps/unix/sysv/linux/tile/setcontext.S b/sysdeps/unix/sysv/linux/tile/setcontext.S
index ee9edbe..02d6a15 100644
--- a/sysdeps/unix/sysv/linux/tile/setcontext.S
+++ b/sysdeps/unix/sysv/linux/tile/setcontext.S
@@ -190,7 +190,9 @@ END (__setcontext)
weak_alias (__setcontext, setcontext)
ENTRY (__startcontext)
+ cfi_undefined (lr)
FEEDBACK_ENTER(__startcontext)
+ jalr r31
BEQZ r30, 1f
{
move r0, r30