diff options
author | Jim Wilson <jimw@sifive.com> | 2019-01-13 15:48:09 -0800 |
---|---|---|
committer | Aurelien Jarno <aurelien@aurel32.net> | 2019-02-19 06:38:23 +0100 |
commit | 384113d1c0ec1b89c38c6e4c1967f827d7f6f1c8 (patch) | |
tree | b9d59c9b500c47a3af2739e691b32fa83f81302c /elf | |
parent | e8c13d5f7a6cd34bc2ac51a0c89fcbbfd2e5c043 (diff) | |
download | glibc-384113d1c0ec1b89c38c6e4c1967f827d7f6f1c8.tar.gz glibc-384113d1c0ec1b89c38c6e4c1967f827d7f6f1c8.tar.xz glibc-384113d1c0ec1b89c38c6e4c1967f827d7f6f1c8.zip |
RISC-V: Fix elfutils testsuite unwind failures.
The clone.S patch fixes 2 elfutils testsuite unwind failures, where the backtrace gets stuck repeating __thread_start until we hit the backtrace limit. This was confirmed by building and installing a patched glibc and then building elfutils and running its testsuite. Unfortunately, the testcase isn't working as expected and I don't know why. The testcase passes even when my clone.S patch is not installed. The testcase looks logically similarly to the elfutils testcases that are failing. Maybe there is a subtle difference in how the glibc unwinding works versus the elfutils unwinding? I don't have good gdb pthread support yet, so I haven't found a way to debug this. Anyways, I don't know if the testcase is useful or not. If the testcase isn't useful then maybe the clone.S patch is OK without a testcase? Jim [BZ #24040] * elf/Makefile (CFLAGS-tst-unwind-main.c): Add -DUSE_PTHREADS=0. * elf/tst-unwind-main.c: If USE_PTHEADS, include pthread.h and error.h (func): New. (main): If USE_PTHREADS, call pthread_create to run func. Otherwise call func directly. * nptl/Makefile (tests): Add tst-unwind-thread. (CFLAGS-tst-unwind-thread.c): Define. * nptl/tst-unwind-thread.c: New file. * sysdeps/unix/sysv/linux/riscv/clone.S (__thread_start): Mark ra as undefined. (cherry picked from commit 85bd1ddbdfdfd13cfd06f7c367519b6ed3360843)
Diffstat (limited to 'elf')
-rw-r--r-- | elf/Makefile | 2 | ||||
-rw-r--r-- | elf/tst-unwind-main.c | 28 |
2 files changed, 26 insertions, 4 deletions
diff --git a/elf/Makefile b/elf/Makefile index 43f625af05..6027926bd1 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1486,4 +1486,4 @@ $(objpfx)tst-libc_dlvsym-static.out: $(objpfx)tst-libc_dlvsym-dso.so $(objpfx)tst-big-note: $(objpfx)tst-big-note-lib.so -CFLAGS-tst-unwind-main.c += -funwind-tables +CFLAGS-tst-unwind-main.c += -funwind-tables -DUSE_PTHREADS=0 diff --git a/elf/tst-unwind-main.c b/elf/tst-unwind-main.c index d1236032d7..7c20f04743 100644 --- a/elf/tst-unwind-main.c +++ b/elf/tst-unwind-main.c @@ -20,19 +20,41 @@ #include <unistd.h> #include <support/test-driver.h> +#if USE_PTHREADS +# include <pthread.h> +# include <error.h> +#endif + static _Unwind_Reason_Code callback (struct _Unwind_Context *ctx, void *arg) { return _URC_NO_REASON; } -int -main (void) +static void * +func (void *a) { /* Arrange for this test to be killed if _Unwind_Backtrace runs into an endless loop. We cannot use the test driver because the complete call chain needs to be compiled with -funwind-tables so that - _Unwind_Backtrace is able to reach _start. */ + _Unwind_Backtrace is able to reach the start routine. */ alarm (DEFAULT_TIMEOUT); _Unwind_Backtrace (callback, 0); + return a; +} + +int +main (void) +{ +#if USE_PTHREADS + pthread_t thr; + int rc = pthread_create (&thr, NULL, &func, NULL); + if (rc) + error (1, rc, "pthread_create"); + rc = pthread_join (thr, NULL); + if (rc) + error (1, rc, "pthread_join"); +#else + func (NULL); +#endif } |