From a1aeefaf093cd6ec966881f062097c2671c5bf44 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 27 Oct 2015 07:13:39 +0000 Subject: * vm_dump.c (rb_print_backtrace): our addr2line doesn't work on sparc. http://rubyci.s3.amazonaws.com/unstable11s/ruby-trunk/log/20151027T043311Z.log.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm_dump.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b773c88ce0..bf3c23f58e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 27 16:12:37 2015 NARUSE, Yui + + * vm_dump.c (rb_print_backtrace): our addr2line doesn't work on sparc. + http://rubyci.s3.amazonaws.com/unstable11s/ruby-trunk/log/20151027T043311Z.log.html.gz + Tue Oct 27 12:00:33 2015 Nobuyoshi Nakada * lib/logger.rb (Logger::Period#next_rotate_time): get rid of diff --git a/vm_dump.c b/vm_dump.c index 1f9c5baa49..df0d2413c9 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -686,7 +686,7 @@ rb_print_backtrace(void) #define MAX_NATIVE_TRACE 1024 static void *trace[MAX_NATIVE_TRACE]; int n = (int)backtrace(trace, MAX_NATIVE_TRACE); -#if defined(USE_ELF) && defined(HAVE_DLADDR) +#if defined(USE_ELF) && defined(HAVE_DLADDR) && !defined(__sparc) rb_dump_backtrace_with_lines(n, trace); #else char **syms = backtrace_symbols(trace, n); -- cgit v1.2.3