From: Simon Marchi <simon.marchi@ericsson.com>
Date: Mon, 16 Oct 2017 02:13:22 +0000 (-0400)
Subject: Fix GDB build without expat
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8676616596351876612aa84be798537625348086;p=binutils-gdb.git

Fix GDB build without expat

An earlier patch of mine changed parse_traceframe_info to make it return
a unique_ptr.  I forgot to update the version of the function used in an
expat-less build, this patch fixes it.

gdb/ChangeLog:

	* tracepoint.c (parse_traceframe_info): Return a unique_ptr
	(the !HAVE_LIBEXPAT version).
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 25ae470bb93..4ad642a7816 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-15  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* tracepoint.c (parse_traceframe_info): Return a unique_ptr
+	(the !HAVE_LIBEXPAT version).
+
 2017-10-14  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* nat/linux-osdata.c (struct pid_pgid_entry) <operator<>: Make
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 9dd8d8736ee..9c073157b91 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -3958,7 +3958,7 @@ sdata_make_value (struct gdbarch *gdbarch, struct internalvar *var,
 
 #if !defined(HAVE_LIBEXPAT)
 
-struct traceframe_info *
+struct std::unique_ptr<traceframe_info>
 parse_traceframe_info (const char *tframe_info)
 {
   static int have_warned;