* [PATCH] Fix build on ia64
@ 2020-02-04 12:41 John Paul Adrian Glaubitz
0 siblings, 0 replies; only message in thread
From: John Paul Adrian Glaubitz @ 2020-02-04 12:41 UTC (permalink / raw)
To: guile-devel; +Cc: wingo, John Paul Adrian Glaubitz
* libguile/continuations.c (capture_auxiliary_stack): Fix
logic in preprocessor code when checking for ia64 host;
fix dereferencing of ctx variable.
* libguile/threads.h (struct scm_thread): Add missing member
SCM_STACKITEM *auxiliary_stack_base.
---
libguile/continuations.c | 6 +++---
libguile/threads.h | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 67a47d38c..b8b6e1dca 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -143,7 +143,7 @@ static void
capture_auxiliary_stack (scm_thread *thread, scm_t_contregs *continuation)
{
#if SCM_HAVE_AUXILIARY_STACK
-# if !(defined __ia64 or defined __ia64__)
+# if !defined __ia64 || !defined __ia64__
# error missing auxiliary stack implementation for architecture
# endif
char *top;
@@ -155,9 +155,9 @@ capture_auxiliary_stack (scm_thread *thread, scm_t_contregs *continuation)
#if defined __hpux
__uc_get_ar_bsp (ctx, (uint64_t *) &top);
#elif defined linux
- top = (char *) ctx->uc_mcontext.sc_ar_bsp;
+ top = (char *) ctx.uc_mcontext.sc_ar_bsp;
#elif defined __FreeBSD__
- top = (char *)(ctx->uc_mcontext.mc_special.bspstore
+ top = (char *)(ctx.uc_mcontext.mc_special.bspstore
+ ctx->uc_mcontext.mc_special.ndirty);
#else
#error missing auxiliary stack implementation for ia64 on this OS
diff --git a/libguile/threads.h b/libguile/threads.h
index 337dc83a9..a5de6c7b2 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -118,6 +118,9 @@ struct scm_thread {
/* Stack base. Used when checking for C stack overflow. */
SCM_STACKITEM *base;
+ /* Auxiliary stack base. */
+ SCM_STACKITEM *auxiliary_stack_base;
+
/* JIT state; NULL until this thread needs to JIT-compile something. */
struct scm_jit_state *jit_state;
};
--
2.25.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-02-04 12:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-04 12:41 [PATCH] Fix build on ia64 John Paul Adrian Glaubitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).