diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-07-10 19:28:45 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-10 19:28:45 +0000 |
commit | a22846267123c31f3717f42d0bce7da2043be0b0 (patch) | |
tree | 1c35e5d5a0c2df50f7ec21f071d63a5b7a66be02 /toolchain/uClibc/patches-0.9.33.2/617-mips_fix_setjmp_ptrsize.patch | |
parent | 752fdaeb911e28d139baf4f04f019cf56e6cb7e9 (diff) | |
download | upstream-a22846267123c31f3717f42d0bce7da2043be0b0.tar.gz upstream-a22846267123c31f3717f42d0bce7da2043be0b0.tar.bz2 upstream-a22846267123c31f3717f42d0bce7da2043be0b0.zip |
uClibc: add a whole bunch of mips64 related fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41570 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/uClibc/patches-0.9.33.2/617-mips_fix_setjmp_ptrsize.patch')
-rw-r--r-- | toolchain/uClibc/patches-0.9.33.2/617-mips_fix_setjmp_ptrsize.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches-0.9.33.2/617-mips_fix_setjmp_ptrsize.patch b/toolchain/uClibc/patches-0.9.33.2/617-mips_fix_setjmp_ptrsize.patch new file mode 100644 index 0000000000..628d4b02d5 --- /dev/null +++ b/toolchain/uClibc/patches-0.9.33.2/617-mips_fix_setjmp_ptrsize.patch @@ -0,0 +1,58 @@ +--- a/libc/sysdeps/linux/mips/bits/setjmp.h ++++ b/libc/sysdeps/linux/mips/bits/setjmp.h +@@ -27,18 +27,18 @@ + #include <sgidefs.h> + + #if _MIPS_SIM == _MIPS_SIM_ABI32 +-#define ptrsize void * ++#define __setjmp_ptr void * + #else +-#define ptrsize long long ++#define __setjmp_ptr long long + #endif + + typedef struct + { + /* Program counter. */ +- ptrsize __pc; ++ __setjmp_ptr __pc; + + /* Stack pointer. */ +- ptrsize __sp; ++ __setjmp_ptr __sp; + + /* Callee-saved registers s0 through s7. */ + #if _MIPS_SIM == _MIPS_SIM_ABI32 +@@ -48,10 +48,10 @@ typedef struct + #endif + + /* The frame pointer. */ +- ptrsize __fp; ++ __setjmp_ptr __fp; + + /* The global pointer. */ +- ptrsize __gp; ++ __setjmp_ptr __gp; + + /* Floating point status register. */ + int __fpc_csr; +--- a/libc/sysdeps/linux/mips/setjmp_aux.c ++++ b/libc/sysdeps/linux/mips/setjmp_aux.c +@@ -65,14 +65,14 @@ __sigsetjmp_aux (jmp_buf env, int savema + #endif + + /* .. and the stack pointer; */ +- env[0].__jmpbuf[0].__sp = (ptrsize) sp; ++ env[0].__jmpbuf[0].__sp = (__setjmp_ptr) sp; + + /* .. and the FP; it'll be in s8. */ +- env[0].__jmpbuf[0].__fp = (ptrsize) fp; ++ env[0].__jmpbuf[0].__fp = (__setjmp_ptr) fp; + + /* .. and the GP; */ + #if _MIPS_SIM == _MIPS_SIM_ABI64 +- env[0].__jmpbuf[0].__gp = (ptrsize) gp; ++ env[0].__jmpbuf[0].__gp = (__setjmp_ptr) gp; + #else + __asm__ __volatile__ ("sw $gp, %0" : : "m" (env[0].__jmpbuf[0].__gp)); + #endif |