aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYao Qi <yao@codesourcery.com>2014-07-01 08:53:41 +0800
committerYao Qi <yao@codesourcery.com>2014-08-13 17:42:57 +0800
commit65c749e7c049f9bf944c5fbe9e727b7a8b4ccc7c (patch)
tree874a7347a677d4129f43d379e4a73a967c86a2d4
parente20e2464f8ae8803869d788b187cffc522c26155 (diff)
downloadgdb-65c749e7c049f9bf944c5fbe9e727b7a8b4ccc7c.zip
gdb-65c749e7c049f9bf944c5fbe9e727b7a8b4ccc7c.tar.gz
gdb-65c749e7c049f9bf944c5fbe9e727b7a8b4ccc7c.tar.bz2
Fix build/17104
This patch is to fix the build error when GDB is configured as: CFLAGS=-Wall ./configure --with-babeltrace; make This patch adds one line of code in configure test to use local variable 'pos'. Note that we append -Werror to CFLAGS to catch the warning related to assignment to scope. See more in this thread https://sourceware.org/ml/gdb-patches/2014-08/msg00045.html 2014-08-13 Yao Qi <yao@codesourcery.com> PR build/17104 * configure.ac: Use local variable 'pos'. * configure: Regenerated.
-rw-r--r--gdb/ChangeLog6
-rwxr-xr-xgdb/configure1
-rw-r--r--gdb/configure.ac1
3 files changed, 8 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5f96259..6a11901 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-13 Yao Qi <yao@codesourcery.com>
+
+ PR build/17104
+ * configure.ac: Use local variable 'pos'.
+ * configure: Regenerated.
+
2014-08-11 Doug Evans <dje@google.com>
* solib.c (solib_read_symbols): Delete "Loaded symbols for ..."
diff --git a/gdb/configure b/gdb/configure
index 809326a..874922d 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -15344,6 +15344,7 @@ struct bt_iter_pos *pos = bt_iter_get_pos (bt_ctf_get_iter (NULL));
struct bt_ctf_event *event = NULL;
const struct bt_definition *scope;
+ bt_iter_set_pos (bt_ctf_get_iter (NULL), pos);
scope = bt_ctf_get_top_level_scope (event,
BT_STREAM_EVENT_HEADER);
bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 70d0964..61919b4 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2437,6 +2437,7 @@ else
struct bt_ctf_event *event = NULL;
const struct bt_definition *scope;
+ bt_iter_set_pos (bt_ctf_get_iter (NULL), pos);
scope = bt_ctf_get_top_level_scope (event,
BT_STREAM_EVENT_HEADER);
bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));