This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, master has been updated via bb7d04b2ba168a051d288ee82c24faf68a433ed2 (commit) via f16647aab5a98dcb1d2bc6768709018d15ddfe67 (commit) from 04dbee4b55cb63e3b8075a3c15a6a576d567c4ed (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bb7d04b2ba168a051d288ee82c24faf68a433ed2 Author: mirabilos <tg(a)mirbsd.org> Date: Sat Jul 25 00:37:44 2015 +0200 fix MIPS N32 ABI Big Endian setjmp/longjmp access to the jmp_buf structure occasionally happens asymmetrically: fields defined in pointer size width (64 on N32) can be accessed as 32-bit words, but in that case, a̲l̲l̲ involved code must agree on that… commit f16647aab5a98dcb1d2bc6768709018d15ddfe67 Author: mirabilos <tg(a)mirbsd.org> Date: Fri Jul 24 22:18:07 2015 +0200 integrate old m68k vfork bugfix of pre-µClibc-ng tree ----------------------------------------------------------------------- Summary of changes: libc/sysdeps/linux/m68k/vfork.S | 19 +++++++++++-------- libc/sysdeps/linux/mips/__longjmp.c | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/libc/sysdeps/linux/m68k/vfork.S b/libc/sysdeps/linux/m68k/vfork.S index b2fe033..bde9d5a 100644 --- a/libc/sysdeps/linux/m68k/vfork.S +++ b/libc/sysdeps/linux/m68k/vfork.S @@ -22,20 +22,23 @@ __vfork: movl %sp@+, %a1 /* save the return address for later */ movl IMM __NR_vfork,%d0 trap #0 - movl IMM -4097, %d1 - cmpl %d0, %d1 - bcs fix_errno - jmp %a1@ /* don't return, just jmp directly */ -fix_errno: - negl %d0 + movl %a1, -(%sp) + + cmpil #-4096,%d0 + blss 1f + + neg.l %d0 #ifndef __PIC__ /* needs handling as the other archs */ movl errno, %a0 #else movl errno@GOT(%a5), %a0 #endif movl %d0, %a0@ - movl IMM -1, %d0 - jmp %a1@ /* don't return, just jmp directly */ + move.l #-1, %d0 + +1: + move.l %d0, %a0 + rts .size __vfork,.-__vfork weak_alias(__vfork,vfork) diff --git a/libc/sysdeps/linux/mips/__longjmp.c b/libc/sysdeps/linux/mips/__longjmp.c index 5b59971..aa94f76 100644 --- a/libc/sysdeps/linux/mips/__longjmp.c +++ b/libc/sysdeps/linux/mips/__longjmp.c @@ -101,13 +101,13 @@ void __longjmp (__jmp_buf env, int val_arg) /* Restore the stack pointer and the FP. They have to be restored last and in a single asm as gcc, depending on options used, may use either of them to access env. */ -#if _MIPS_SIM == _MIPS_SIM_ABI64 +#if _MIPS_SIM != _MIPS_SIM_ABI32 __asm__ __volatile__ ("ld $29, %0\n\t" "ld $30, %1\n\t" : : "m" (env[0].__sp), "m" (env[0].__fp)); -#else /* O32 || N32 */ +#else /* O32 */ __asm__ __volatile__ ("lw $29, %0\n\t" "lw $30, %1\n\t" : : "m" (env[0].__sp), "m" (env[0].__fp)); -#endif /* O32 || N32 */ +#endif /* O32 */ /* Give setjmp 1 if given a 0, or what they gave us if non-zero. */ if (val == 0) hooks/post-receive -- uClibc-ng - small C library for embedded systems