Hi Waldemar,
these two patches fix tst-mqueue* tests that are currently failing on xtensa.
Max Filippov (2): xtensa: add ret_ERRVAL definition xtensa: fix stack frame size for NPTL
libc/sysdeps/linux/xtensa/sysdep.h | 5 +++++ libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
ret_ERRVAL is used by mq_timedsend and mq_timedreceive, it needs to be defined to retw, otherwise error return from those functions segfaults.
This fixes the following testsuite failures:
.... tst-mqueue1 FAIL tst-mqueue1 got 1 expected 0 Didn't expect signal from child: got `Segmentation fault' .... tst-mqueue2 FAIL tst-mqueue2 got 1 expected 0 Didn't expect signal from child: got `Segmentation fault' .... tst-mqueue3 FAIL tst-mqueue3 got 1 expected 0 Didn't expect signal from child: got `Segmentation fault' .... tst-mqueue4 FAIL tst-mqueue4 got 1 expected 0 Didn't expect signal from child: got `Segmentation fault' .... tst-mqueue5 FAIL tst-mqueue5 got 1 expected 0 Didn't expect signal from child: got `Segmentation fault' .... tst-mqueue6 FAIL tst-mqueue6 got 1 expected 0 Didn't expect signal from child: got `Segmentation fault'
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- libc/sysdeps/linux/xtensa/sysdep.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/libc/sysdeps/linux/xtensa/sysdep.h b/libc/sysdeps/linux/xtensa/sysdep.h index cab4a2f..53bfe7e 100644 --- a/libc/sysdeps/linux/xtensa/sysdep.h +++ b/libc/sysdeps/linux/xtensa/sysdep.h @@ -130,6 +130,9 @@ #define PSEUDO_END_ERRVAL(name) \ END (name)
+#undef ret_ERRVAL +#define ret_ERRVAL retw + #if defined _LIBC_REENTRANT # if defined USE___THREAD # ifndef NOT_IN_libc
Cancellable syscalls use call8 to call functions that enable/disable cancellation, thus they cannot use the default FRAMESIZE. Redefine FRAMESIZE for such syscalls.
This fixes the following testsuite failure:
.... tst-mqueue8 FAIL tst-mqueue8 got 1 expected 0 going to cancel mq_receive in-time in-time mq_receive cancellation succeeded going to cancel mq_receive early Didn't expect signal from child: got `Segmentation fault'
Signed-off-by: Max Filippov jcmvbkbc@gmail.com --- libc/sysdeps/linux/xtensa/sysdep.h | 2 ++ libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/libc/sysdeps/linux/xtensa/sysdep.h b/libc/sysdeps/linux/xtensa/sysdep.h index 53bfe7e..4873a41 100644 --- a/libc/sysdeps/linux/xtensa/sysdep.h +++ b/libc/sysdeps/linux/xtensa/sysdep.h @@ -72,7 +72,9 @@ #define JUMPTARGET(name) name #endif
+#ifndef FRAMESIZE #define FRAMESIZE 16 +#endif #define CALL_MCOUNT /* Do nothing. */
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h index 6bb2aeb..f82957d 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h @@ -24,7 +24,15 @@ #endif
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt -// FIXME: ENTRY includes an entry instruction, here we'd want entry sp, 48! + +/* CENABLE/CDISABLE in PSEUDO below use call8, stack frame size must be + * at least 32. + */ +#if FRAMESIZE < 32 +#undef FRAMESIZE +#define FRAMESIZE 32 +#endif + # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ .text; \
Hi Max, Max Filippov wrote,
Hi Waldemar,
these two patches fix tst-mqueue* tests that are currently failing on xtensa.
Thank you very much. Patches applied and pushed.
best regards Waldemar
Max Filippov (2): xtensa: add ret_ERRVAL definition xtensa: fix stack frame size for NPTL
libc/sysdeps/linux/xtensa/sysdep.h | 5 +++++ libpthread/nptl/sysdeps/unix/sysv/linux/xtensa/sysdep-cancel.h | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
-- 1.8.1.4
devel mailing list devel@uclibc-ng.org http://uclibc-ng.org/cgi-bin/mailman/listinfo/devel
-
Max Filippov -
Waldemar Brodkorb