Commit f588eb27 by Ian Lance Taylor Committed by Ian Lance Taylor

re PR bootstrap/54609 (libbacktrace breaks bootstrap on darwin)

	PR bootstrap/54609
	* unknown.c (unknown_fileline): Add state parameter, remove
	fileline_data parameter, name error_callback parameter.
	(backtrace_initialize): Add state parameter.

From-SVN: r191402
parent 869fefb7
2012-09-17 Ian Lance Taylor <iant@google.com> 2012-09-17 Ian Lance Taylor <iant@google.com>
PR bootstrap/54609
* unknown.c (unknown_fileline): Add state parameter, remove
fileline_data parameter, name error_callback parameter.
(backtrace_initialize): Add state parameter.
2012-09-17 Ian Lance Taylor <iant@google.com>
* Initial implementation. * Initial implementation.
...@@ -40,9 +40,9 @@ POSSIBILITY OF SUCH DAMAGE. */ ...@@ -40,9 +40,9 @@ POSSIBILITY OF SUCH DAMAGE. */
/* A trivial routine that always fails to find fileline data. */ /* A trivial routine that always fails to find fileline data. */
static int static int
unknown_fileline (void *fileline_data ATTRIBUTE_UNUSED, unknown_fileline (struct backtrace_state *state ATTRIBUTE_UNUSED,
uintptr_t pc, backtrace_full_callback callback, uintptr_t pc, backtrace_full_callback callback,
backtrace_error_callback ATTRIBUTE_UNUSED, backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
void *data) void *data)
{ {
...@@ -53,12 +53,12 @@ unknown_fileline (void *fileline_data ATTRIBUTE_UNUSED, ...@@ -53,12 +53,12 @@ unknown_fileline (void *fileline_data ATTRIBUTE_UNUSED,
debug info. */ debug info. */
int int
backtrace_initialize (int descriptor ATTRIBUTE_UNUSED, backtrace_initialize (struct backtrace_state *state ATTRIBUTE_UNUSED,
int descriptor ATTRIBUTE_UNUSED,
backtrace_error_callback error_callback ATTRIBUTE_UNUSED, backtrace_error_callback error_callback ATTRIBUTE_UNUSED,
void *data ATTRIBUTE_UNUSED, fileline *fileline_fn, void *data ATTRIBUTE_UNUSED, fileline *fileline_fn)
void **fileline_data)
{ {
state->fileline_data = NULL;
*fileline_fn = unknown_fileline; *fileline_fn = unknown_fileline;
*fileline_data = NULL;
return 1; return 1;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment