From 9a4c8a3f2c753f4cee4bcbe23d28e23bbdb99e40 Mon Sep 17 00:00:00 2001 From: Alexander Gordeev Date: Thu, 7 Oct 2010 18:54:24 +0400 Subject: mips: fix errno setting after syscall If there was an error during syscall then after it's completion a3 register holds a non-zero value and v0 holds an actual error code which should be saved in errno. This can be achieved by calling __syscall_error with the value from v0 as a parameter. So this value should be stored in a0, but the appropriate assembly instructions are missing. Fixed this now by adding "move a0, v0". I think it was once fixed by 58c5f8ba4cdf62342d05a546d15404cbbb3c4e07 but then something went wrong. Again... Signed-off-by: Alexander Gordeev Signed-off-by: Bernhard Reutner-Fischer --- libpthread/nptl/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/mips') diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h index 1cf625f4e..c2cd14fe9 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h @@ -26,12 +26,12 @@ # ifdef __PIC__ # define PSEUDO_CPLOAD .cpload t9; -# define PSEUDO_ERRJMP la t9, __syscall_error; jr t9; +# define PSEUDO_ERRJMP move a0, v0; la t9, __syscall_error; jr t9; # define PSEUDO_SAVEGP sw gp, 32(sp); cfi_rel_offset (gp, 32); # define PSEUDO_LOADGP lw gp, 32(sp); # else # define PSEUDO_CPLOAD -# define PSEUDO_ERRJMP j __syscall_error; +# define PSEUDO_ERRJMP move a0, v0; j __syscall_error; # define PSEUDO_SAVEGP # define PSEUDO_LOADGP # endif -- cgit v1.2.3 From c452a58e65a2600ab1e9a7be2e5a6e4cae0e8b2a Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 11 Nov 2010 15:54:19 +0000 Subject: ntpl: fix static linking by not leaking SSP_ALL_CFLAGS The SSP_ALL_CFLAGS in nptl arch CFLAGS leaks out and forces things like dl-support.c, brk.c, sbrk.c memcpy, etc to be built with -fstack-protector-all. This is bad when linking statically since initializing TLS will call those functions before SSP is initialized. The libpthread itself will still be built with -fstack-protector-all due to CFLAGS-nptl has SSP_ALL_CFLAGS in libpthread/nptl/Makefile.in Thanks to Timo Teras for helping with this. Signed-off-by: Natanael Copa Signed-off-by: Bernhard Reutner-Fischer --- libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch | 1 - 1 file changed, 1 deletion(-) (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/mips') diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch index 2ff309576..84fe17e8e 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch @@ -12,7 +12,6 @@ libc_linux_arch_CSRC = fork.c libc_linux_arch_SSRC = clone.S vfork.S ASFLAGS += -DUSE___THREAD -CFLAGS += $(SSP_ALL_CFLAGS) CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) -- cgit v1.2.3