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 0ff859914de89f1960979c8669f7b2ffb6bdb743..cb64b18eb846116cd6d6e53df452a9ac596a2c64 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-04  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * NEWS (Changes in GDB-4.0): Move Intel MPX and Intel AVX-512 items ...

diff --git a/gdb/configure b/gdb/configure
index 958fad93ab9d07ed4a7c364f4a99fb9bdf111e8f..74e16cdaee71efe2a6b5c15e5549c5f861f11f39 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 e44955eb1df1fc38e67a36f7ced2be3ee1d358b8..c0279f2d414394542f59b646644eaaa6c5fff034 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"));