[PATCH, v2] Fix build on ia64

[PATCH, v2] Fix build on ia64

[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       | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

 v2:
 - Make declaration of SCM_STACKITEM *auxiliary_stack_base
   conditional, i.e. only for SCM_HAVE_AUXILIARY_STACK.

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..e6a60e96b 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -118,6 +118,11 @@ struct scm_thread {
   /* Stack base.  Used when checking for C stack overflow.  */
   SCM_STACKITEM *base;
 
+#if SCM_HAVE_AUXILIARY_STACK
+  /* Auxiliary stack base. */
+  SCM_STACKITEM *auxiliary_stack_base;
+#endif
+
   /* JIT state; NULL until this thread needs to JIT-compile something.  */
   struct scm_jit_state *jit_state;
 };
-- 
2.25.0

Re: [PATCH, v2] Fix build on ia64

[Ludovic Courtès]

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> skribis:

>   * 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.

Applied, thanks!  (I don’t have IA64 hardware to test it but it looks
good to me and I trust it works for you on actual hardware.)

BTW, these were simple changes and thus not requiring copyright
assignment, but I would encourage you to assign copyright to the FSF for
future changes if you plan to keep contributing (which would be great!).
We can discuss the implications and paperwork off-list if you want.

Thank you!

Ludo’.

Re: [PATCH, v2] Fix build on ia64

[John Paul Adrian Glaubitz]

Hi Ludo!

On 2/8/20 3:10 PM, Ludovic Courtès wrote:
> John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> skribis:
> 
>>   * 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.
> 
> Applied, thanks!  (I don’t have IA64 hardware to test it but it looks
> good to me and I trust it works for you on actual hardware.)

Thanks. Yes, both patches were tested on actual hardware running Debian
unstable. We are still maintaining unofficial Debian ports for both
architectures.

> BTW, these were simple changes and thus not requiring copyright
> assignment, but I would encourage you to assign copyright to the FSF for
> future changes if you plan to keep contributing (which would be great!).
> We can discuss the implications and paperwork off-list if you want.

I have actually signed the copyright assignment for the FSF already, but
only for gdb/binutils. I asked back then whether it would be possible to
sign the copyright assignment for all GNU projects but that was rejected.

I'll sign the CA next week for Guile.

Thanks,
Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Re: [PATCH, v2] Fix build on ia64

[Ludovic Courtès]

Hi,

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> skribis:

> I have actually signed the copyright assignment for the FSF already, but
> only for gdb/binutils. I asked back then whether it would be possible to
> sign the copyright assignment for all GNU projects but that was rejected.

Yeah, that’s not possible.

> I'll sign the CA next week for Guile.

Awesome, thank you!

Ludo’.

Re: [PATCH, v2] Fix build on ia64

[Stefan Monnier]

>> I have actually signed the copyright assignment for the FSF already, but
>> only for gdb/binutils. I asked back then whether it would be possible to
>> sign the copyright assignment for all GNU projects but that was rejected.
> Yeah, that’s not possible.

Companies can do that for their employers's contributions, but
apparently individuals can't do it.  Not sure why that is.


        Stefan

Re: [PATCH, v2] Fix build on ia64

[John Paul Adrian Glaubitz]

On 2/9/20 2:32 PM, Ludovic Courtès wrote:
>> I have actually signed the copyright assignment for the FSF already, but
>> only for gdb/binutils. I asked back then whether it would be possible to
>> sign the copyright assignment for all GNU projects but that was rejected.
> 
> Yeah, that’s not possible.
> 
>> I'll sign the CA next week for Guile.
> 
> Awesome, thank you!

I have signed the copyright assignment and sent it to the appropriate
mail address at the FSF.

Thanks,
Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Re: [PATCH, v2] Fix build on ia64

[Ludovic Courtès]

Hi,

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> skribis:

> On 2/9/20 2:32 PM, Ludovic Courtès wrote:
>>> I have actually signed the copyright assignment for the FSF already, but
>>> only for gdb/binutils. I asked back then whether it would be possible to
>>> sign the copyright assignment for all GNU projects but that was rejected.
>> 
>> Yeah, that’s not possible.
>> 
>>> I'll sign the CA next week for Guile.
>> 
>> Awesome, thank you!
>
> I have signed the copyright assignment and sent it to the appropriate
> mail address at the FSF.

I see we just received the confirmation from the copyright clerk.  Thank you!

Ludo’.