From d619336503fc87288cb2e34c309e7002b453123b Mon Sep 17 00:00:00 2001 From: whitequark Date: Thu, 6 Oct 2016 15:44:55 +0000 Subject: [PATCH] test: update libartiq_support for changed personality ABI. --- artiq/test/libartiq_support/artiq_terminate.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/artiq/test/libartiq_support/artiq_terminate.c b/artiq/test/libartiq_support/artiq_terminate.c index 5b1315131..577048149 100644 --- a/artiq/test/libartiq_support/artiq_terminate.c +++ b/artiq/test/libartiq_support/artiq_terminate.c @@ -8,7 +8,7 @@ #include void __artiq_terminate(struct artiq_exception *exn, - struct artiq_backtrace_item *backtrace, + uintptr_t *backtrace, size_t backtrace_size) { printf("Uncaught %s: %s (%"PRIi64", %"PRIi64", %"PRIi64")\n" "at %s:%"PRIi32":%"PRIi32"\n", @@ -17,12 +17,7 @@ void __artiq_terminate(struct artiq_exception *exn, exn->file, exn->line, exn->column + 1); for(size_t i = 0; i < backtrace_size; i++) { - Dl_info info; - if(dladdr((void*) backtrace[i].function, &info) && info.dli_sname) { - printf("at %s+%p\n", info.dli_sname, (void*)backtrace[i].offset); - } else { - printf("at %p+%p\n", (void*)backtrace[i].function, (void*)backtrace[i].offset); - } + printf("at %p\n", backtrace[i]); } exit(1);