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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5f962593d052ece6cf2bc6d1ba47528482340a5f..6a1190180251b39e99d35308e5a7dde93c652a03 100644 (file)
--- 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 809326a4939ce17ff59353af176d6e0d57be5617..874922d2c66e289652d9b94fc1015a0e07416754 100755 (executable)
--- 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 70d096452489dff7e1a3fcb83bacac771aeb6fda..61919b4462af770266b414d0022402ea4f078f8d 100644 (file)
--- 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"));