From 585afbbc6a833e91cd2e51b8faeece2248c0cc16 Mon Sep 17 00:00:00 2001
From: kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 21 Dec 2012 17:21:12 +0000
Subject: * vm_dump.c (rb_vm_bugreport): revert r38533. * addr2line.c
 (fill_lines): add ELF sanity check.   [Bug #7597] [ruby-dev:46786]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm_dump.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'vm_dump.c')

diff --git a/vm_dump.c b/vm_dump.c
index 50d3ebfdf5..292280c40f 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -644,15 +644,14 @@ rb_vm_bugreport(void)
 	char **syms = backtrace_symbols(trace, n);
 
 	if (syms) {
-/* commentout temporarily. we have to fix addr2line. see [Bug #7597] */
-/* #ifdef USE_ELF */
-/* 	    rb_dump_backtrace_with_lines(n, trace, syms); */
-/* #else */
+#ifdef USE_ELF
+	    rb_dump_backtrace_with_lines(n, trace, syms);
+#else
 	    int i;
 	    for (i=0; i<n; i++) {
 		fprintf(stderr, "%s\n", syms[i]);
 	    }
-/* #endif */
+#endif
 	    free(syms);
 	}
 #elif defined(_WIN32)
-- 
cgit v1.2.3