1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* addr2line.c: use USE_ELF instead of __ELF__ because Solaris

Browse Source 
doesn't define it. USE_ELF is already provided by configure.
  patched by Naohisa Goto. [ruby-dev:44066] [Bug #4998]

* addr2line.h: ditto.

* vm_dump.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-07-08 12:23:10 +00:00
parent 29e497d231
commit e33183acca
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Fri Jul 8 21:20:39 2011 NARUSE, Yui <naruse@ruby-lang.org>
* addr2line.c: use USE_ELF instead of __ELF__ because Solaris
doesn't define it. USE_ELF is already provided by configure.
patched by Naohisa Goto. [ruby-dev:44066] [Bug #4998]
* addr2line.h: ditto.
* vm_dump.c: ditto.
Fri Jul 8 16:40:38 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jul 8 16:40:38 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/json/parser/parser.rl (convert_encoding): should not modify * ext/json/parser/parser.rl (convert_encoding): should not modify

4
addr2line.c
View File

@ -14,7 +14,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#ifdef __ELF__ #ifdef USE_ELF
#ifdef __OpenBSD__ #ifdef __OpenBSD__
#include <elf_abi.h> #include <elf_abi.h>
@ -605,6 +605,6 @@ rb_dump_backtrace_with_lines(int num_traces, void **trace, char **syms)
free(lines); free(lines);
} }
#else /* defined(__ELF__) */ #else /* defined(USE_ELF) */
#error not supported #error not supported
#endif #endif

4
addr2line.h
View File

@ -11,11 +11,11 @@
#ifndef RUBY_ADDR2LINE_H #ifndef RUBY_ADDR2LINE_H
#define RUBY_ADDR2LINE_H #define RUBY_ADDR2LINE_H
#ifdef __ELF__ #ifdef USE_ELF
void void
rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms); rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms);
#endif /* __ELF__ */ #endif /* USE_ELF */
#endif /* RUBY_ADDR2LINE_H */ #endif /* RUBY_ADDR2LINE_H */

2
vm_dump.c
View File

@ -797,7 +797,7 @@ rb_vm_bugreport(void)
char **syms = backtrace_symbols(trace, n); char **syms = backtrace_symbols(trace, n);
if (syms) { if (syms) {
#ifdef __ELF__ #ifdef USE_ELF
rb_dump_backtrace_with_lines(n, trace, syms); rb_dump_backtrace_with_lines(n, trace, syms);
#else #else
int i; int i;