aboutsummaryrefslogtreecommitdiff
path: root/libbacktrace
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@google.com>2012-09-17 21:14:51 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2012-09-17 21:14:51 +0000
commitc5812e0b33af62b9b1f7646453282545e212b065 (patch)
tree57e70352bd46fc8c177670cb06106cbf7c9b4ccf /libbacktrace
parente8f4008a9e158acbe96026e1ea9f2da7f3c8a354 (diff)
downloadgcc-c5812e0b33af62b9b1f7646453282545e212b065.zip
gcc-c5812e0b33af62b9b1f7646453282545e212b065.tar.gz
gcc-c5812e0b33af62b9b1f7646453282545e212b065.tar.bz2
re PR bootstrap/54611 (Bootstrap failure: conflicting types for 'backtrace_simple')
PR bootstrap/54611 * nounwind.c (backtrace_full): Rename from backtrace. Add state parameter. From-SVN: r191408
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/ChangeLog6
-rw-r--r--libbacktrace/nounwind.c7
2 files changed, 10 insertions, 3 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index a420500..ec3e1b7 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-17 Ian Lance Taylor <iant@google.com>
+
+ PR bootstrap/54611
+ * nounwind.c (backtrace_full): Rename from backtrace. Add state
+ parameter.
+
2012-09-17 Gerald Pfeifer <gerald@pfeifer.com>
PR bootstrap/54611
diff --git a/libbacktrace/nounwind.c b/libbacktrace/nounwind.c
index 71bd5c4..bf7635c 100644
--- a/libbacktrace/nounwind.c
+++ b/libbacktrace/nounwind.c
@@ -42,9 +42,10 @@ POSSIBILITY OF SUCH DAMAGE. */
available. */
int
-backtrace (int skip ATTRIBUTE_UNUSED,
- backtrace_full_callback callback ATTRIBUTE_UNUSED,
- backtrace_error_callback error_callback, void *data)
+backtrace_full (struct backtrace_state *state ATTRIBUTE_UNUSED,
+ int skip ATTRIBUTE_UNUSED,
+ backtrace_full_callback callback ATTRIBUTE_UNUSED,
+ backtrace_error_callback error_callback, void *data)
{
error_callback (data,
"no stack trace because unwind library not available",