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 a420500e64ff4e32ef969860c76ef8db633a7a16..ec3e1b75e8b20cda9af99c0477b76af4836db3b6 100644 (file)
--- 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 71bd5c49acf1e00c926a9ae7be1bc4c21815b610..bf7635ce0e7dad178b8441818ef25539dedda88b 100644 (file)
--- 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",