toolchain/uClibc/patches-0.9.33.2/617-mips_fix_setjmp_ptrsize.patch

   1 --- a/libc/sysdeps/linux/mips/bits/setjmp.h
   2 +++ b/libc/sysdeps/linux/mips/bits/setjmp.h
   3 @@ -27,18 +27,18 @@
   4  #include <sgidefs.h>
   5
   6  #if _MIPS_SIM == _MIPS_SIM_ABI32
   7 -#define ptrsize void *
   8 +#define __setjmp_ptr void *
   9  #else
  10 -#define ptrsize long long
  11 +#define __setjmp_ptr long long
  12  #endif
  13
  14  typedef struct
  15    {
  16      /* Program counter.  */
  17 -    ptrsize __pc;
  18 +    __setjmp_ptr __pc;
  19
  20      /* Stack pointer.  */
  21 -    ptrsize __sp;
  22 +    __setjmp_ptr __sp;
  23
  24      /* Callee-saved registers s0 through s7.  */
  25  #if _MIPS_SIM == _MIPS_SIM_ABI32
  26 @@ -48,10 +48,10 @@ typedef struct
  27  #endif
  28
  29      /* The frame pointer.  */
  30 -    ptrsize __fp;
  31 +    __setjmp_ptr __fp;
  32
  33      /* The global pointer.  */
  34 -    ptrsize __gp;
  35 +    __setjmp_ptr __gp;
  36
  37      /* Floating point status register.  */
  38      int __fpc_csr;
  39 --- a/libc/sysdeps/linux/mips/setjmp_aux.c
  40 +++ b/libc/sysdeps/linux/mips/setjmp_aux.c
  41 @@ -65,14 +65,14 @@ __sigsetjmp_aux (jmp_buf env, int savema
  42  #endif
  43
  44    /* .. and the stack pointer;  */
  45 -  env[0].__jmpbuf[0].__sp = (ptrsize) sp;
  46 +  env[0].__jmpbuf[0].__sp = (__setjmp_ptr) sp;
  47
  48    /* .. and the FP; it'll be in s8. */
  49 -  env[0].__jmpbuf[0].__fp = (ptrsize) fp;
  50 +  env[0].__jmpbuf[0].__fp = (__setjmp_ptr) fp;
  51
  52    /* .. and the GP; */
  53  #if _MIPS_SIM == _MIPS_SIM_ABI64
  54 -  env[0].__jmpbuf[0].__gp = (ptrsize) gp;
  55 +  env[0].__jmpbuf[0].__gp = (__setjmp_ptr) gp;
  56  #else
  57    __asm__ __volatile__ ("sw $gp, %0" : : "m" (env[0].__jmpbuf[0].__gp));
  58  #endif