diff --git a/ChangeLog b/ChangeLog
index 49844d4d3f..cf283ab3ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* ext/json/parser/parser.rl (convert_encoding): should not modify
diff --git a/addr2line.c b/addr2line.c
index 71ebf0365f..219d1d4b47 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#ifdef __ELF__
+#ifdef USE_ELF
 
 #ifdef __OpenBSD__
 #include <elf_abi.h>
@@ -605,6 +605,6 @@ rb_dump_backtrace_with_lines(int num_traces, void **trace, char **syms)
     free(lines);
 }
 
-#else /* defined(__ELF__) */
+#else /* defined(USE_ELF) */
 #error not supported
 #endif
diff --git a/addr2line.h b/addr2line.h
index cbb18e5a9f..3782d89e07 100644
--- a/addr2line.h
+++ b/addr2line.h
@@ -11,11 +11,11 @@
 #ifndef RUBY_ADDR2LINE_H
 #define RUBY_ADDR2LINE_H
 
-#ifdef __ELF__
+#ifdef USE_ELF
 
 void
 rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms);
 
-#endif /* __ELF__ */
+#endif /* USE_ELF */
 
 #endif /* RUBY_ADDR2LINE_H */
diff --git a/vm_dump.c b/vm_dump.c
index 23143dc72e..8667a7a500 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -797,7 +797,7 @@ rb_vm_bugreport(void)
 	char **syms = backtrace_symbols(trace, n);
 
 	if (syms) {
-#ifdef __ELF__
+#ifdef USE_ELF
 	    rb_dump_backtrace_with_lines(n, trace, syms);
 #else
 	    int i;