From f588eb27dd5ec50e54b282096211228dead9d4ba Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 17 Sep 2012 17:43:26 +0000 Subject: [PATCH] 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 --- libbacktrace/ChangeLog | 7 +++++++ libbacktrace/unknown.c | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index e8142d2749f1..e6efd6b4c808 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,10 @@ +2012-09-17 Ian Lance Taylor + + 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 * Initial implementation. diff --git a/libbacktrace/unknown.c b/libbacktrace/unknown.c index 4ff10b64427c..fab5867d8d2c 100644 --- a/libbacktrace/unknown.c +++ b/libbacktrace/unknown.c @@ -40,9 +40,9 @@ POSSIBILITY OF SUCH DAMAGE. */ /* A trivial routine that always fails to find fileline data. */ static int -unknown_fileline (void *fileline_data ATTRIBUTE_UNUSED, +unknown_fileline (struct backtrace_state *state ATTRIBUTE_UNUSED, uintptr_t pc, backtrace_full_callback callback, - backtrace_error_callback ATTRIBUTE_UNUSED, + backtrace_error_callback error_callback ATTRIBUTE_UNUSED, void *data) { @@ -53,12 +53,12 @@ unknown_fileline (void *fileline_data ATTRIBUTE_UNUSED, debug info. */ 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, - void *data ATTRIBUTE_UNUSED, fileline *fileline_fn, - void **fileline_data) + void *data ATTRIBUTE_UNUSED, fileline *fileline_fn) { + state->fileline_data = NULL; *fileline_fn = unknown_fileline; - *fileline_data = NULL; return 1; } -- 2.47.2