From: Ian Lance Taylor <iant@google.com>
Date: Mon, 17 Sep 2012 21:14:51 +0000 (+0000)
Subject: re PR bootstrap/54611 (Bootstrap failure:  conflicting types for 'backtrace_simple')
X-Git-Tag: misc/gccgo-go1_1_2~801
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5812e0b33af62b9b1f7646453282545e212b065;p=thirdparty%2Fgcc.git

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
---

diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index a420500e64ff..ec3e1b75e8b2 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 71bd5c49acf1..bf7635ce0e7d 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",