diff options
| author | Ian Lance Taylor <iant@google.com> | 2012-09-17 17:43:26 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-09-17 17:43:26 +0000 |
| commit | f588eb27dd5ec50e54b282096211228dead9d4ba (patch) | |
| tree | 1f6d4c83174476f69b57d4ce3b3d17b1fc4e11b5 /libbacktrace | |
| parent | 869fefb7c4a6736e7e78f02f7d8b62d371872ba3 (diff) | |
| download | gcc-f588eb27dd5ec50e54b282096211228dead9d4ba.zip gcc-f588eb27dd5ec50e54b282096211228dead9d4ba.tar.gz gcc-f588eb27dd5ec50e54b282096211228dead9d4ba.tar.bz2 | |
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
Diffstat (limited to 'libbacktrace')
| -rw-r--r-- | libbacktrace/ChangeLog | 7 | ||||
| -rw-r--r-- | libbacktrace/unknown.c | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index e8142d2..e6efd6b 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,10 @@ 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. diff --git a/libbacktrace/unknown.c b/libbacktrace/unknown.c index 4ff10b6..fab5867 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; } |