diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2003-03-20 10:27:55 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2003-03-20 10:27:55 +0000 |
| commit | 53fcb885017b3c01e960c0ad68616dbad61f9192 (patch) | |
| tree | 40aad834f2f55e947a3ed9d23d56faab3b9278d0 /sysdeps/mips/mips64 | |
| parent | 7793bf7fd7409efaf9cdc8475404409d87c2c537 (diff) | |
| download | glibc-53fcb885017b3c01e960c0ad68616dbad61f9192.tar glibc-53fcb885017b3c01e960c0ad68616dbad61f9192.tar.gz glibc-53fcb885017b3c01e960c0ad68616dbad61f9192.tar.bz2 glibc-53fcb885017b3c01e960c0ad68616dbad61f9192.zip | |
* sysdeps/mips/bits/setjmp.h: Store all N32 and N64 registers, including pc, gp, sp and fp, as long long. * sysdeps/mips/mips64/setjmp.S: Pass gp to __sigsetjmp_aux. * sysdeps/mips/mips64/setjmp_aux.c: Adjust type of arguments. Add gp argument, and set gp in the jmpbuf to it. * sysdeps/mips/setjmp_aux.c: Revert to o32-only.
2003-03-20 Alexandre Oliva <aoliva@redhat.com>
* sysdeps/mips/bits/setjmp.h: Store all N32 and N64 registers,
including pc, gp, sp and fp, as long long.
* sysdeps/mips/mips64/setjmp.S: Pass gp to __sigsetjmp_aux.
* sysdeps/mips/mips64/setjmp_aux.c: Adjust type of arguments.
Add gp argument, and set gp in the jmpbuf to it.
* sysdeps/mips/setjmp_aux.c: Revert to o32-only.
Diffstat (limited to 'sysdeps/mips/mips64')
| -rw-r--r-- | sysdeps/mips/mips64/setjmp.S | 3 | ||||
| -rw-r--r-- | sysdeps/mips/mips64/setjmp_aux.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sysdeps/mips/mips64/setjmp.S b/sysdeps/mips/mips64/setjmp.S index 3d2bf20e7c..d566921a87 100644 --- a/sysdeps/mips/mips64/setjmp.S +++ b/sysdeps/mips/mips64/setjmp.S @@ -37,5 +37,8 @@ ENTRY (__sigsetjmp) nop #endif RESTORE_GP64 +#if _MIPS_SIM != _MIPS_SIM_ABI32 + move a4, gp +#endif jr t9 .end __sigsetjmp diff --git a/sysdeps/mips/mips64/setjmp_aux.c b/sysdeps/mips/mips64/setjmp_aux.c index 6d1c9390bb..db75a21a30 100644 --- a/sysdeps/mips/mips64/setjmp_aux.c +++ b/sysdeps/mips/mips64/setjmp_aux.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Brendan Kehoe (brendan@zen.org). @@ -25,7 +25,8 @@ access them in C. */ int -__sigsetjmp_aux (jmp_buf env, int savemask, int sp, int fp) +__sigsetjmp_aux (jmp_buf env, int savemask, long long sp, long long fp, + long long gp) { /* Store the floating point callee-saved registers... */ asm volatile ("s.d $f24, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[0])); @@ -47,7 +48,7 @@ __sigsetjmp_aux (jmp_buf env, int savemask, int sp, int fp) env[0].__jmpbuf[0].__fp = fp; /* .. and the GP; */ - asm volatile ("sd $gp, %0" : : "m" (env[0].__jmpbuf[0].__gp)); + env[0].__jmpbuf[0].__gp = gp; /* .. and the callee-saved registers; */ asm volatile ("sd $16, %0" : : "m" (env[0].__jmpbuf[0].__regs[0])); |