gdb

	PR symtab/8399:
	* dwarf2loc.c (locexpr_describe_location_piece): Don't call error
	for unrecognized frame base expression.
gdb/testsuite
	PR symtab/8399:
	* gdb.threads/tls.exp: Remove kfail.  Update expected output.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f6dd013db64bd3f3d0c36e0ec93048c2203ddb21..b6ff84a96d05596defe99f17cc8dfb41a2773175 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-14  Tom Tromey  <tromey@redhat.com>
+
+       PR symtab/8399:
+       * dwarf2loc.c (locexpr_describe_location_piece): Don't call error
+       for unrecognized frame base expression.
+
 2010-09-14  Tom Tromey  <tromey@redhat.com>
 
        PR exp/11803:

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 909dba1d66d902c4c1093cb0796ac60d15027317..b2aecf253396caee15184bc0d3509230dc5b1d35 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -1940,7 +1940,7 @@ locexpr_describe_location_piece (struct symbol *symbol, struct ui_file *stream,
       struct symbol *framefunc;
       int frame_reg = 0;
       LONGEST frame_offset;
-      const gdb_byte *base_data, *new_data;
+      const gdb_byte *base_data, *new_data, *save_data = data;
       size_t base_size;
       LONGEST base_offset = 0;
 
@@ -1984,10 +1984,7 @@ locexpr_describe_location_piece (struct symbol *symbol, struct ui_file *stream,
        {
          /* We don't know what to do with the frame base expression,
             so we can't trace this variable; give up.  */
-         error (_("Cannot describe location of symbol \"%s\"; "
-                  "DWARF 2 encoding not handled, "
-                  "first opcode in base data is 0x%x."),
-                SYMBOL_PRINT_NAME (symbol), base_data[0]);
+         return save_data;
        }
 
       regno = gdbarch_dwarf2_reg_to_regnum (gdbarch, frame_reg);

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3e5533bb2577b5b9c7e3674c5314a6907a25dfbe..dad5befe6050278d64edca907348971f2e2c6ce8 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-14  Tom Tromey  <tromey@redhat.com>
+
+       PR symtab/8399:
+       * gdb.threads/tls.exp: Remove kfail.  Update expected output.
+
 2010-09-14  Tom Tromey  <tromey@redhat.com>
 
        PR exp/11803:

diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
index 343b98586fe9eef5fab165e5034273f8d6f60304..eb76f1a95d7462561b4da75568286212d2a1d2aa 100644 (file)
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ b/gdb/testsuite/gdb.threads/tls.exp
@@ -284,8 +284,8 @@ runto spin
 gdb_test "info address a_global" \
        ".*a_global.*static storage at address.*" "info address a_global"
 
-setup_kfail "gdb/1294" "*-*-*"
-gdb_test "info address me" ".*me.*is a variable at offset.*" "info address me"
+gdb_test "info address me" ".*me.*is a complex DWARF expression:.*" \
+    "info address me"
 
 
 # Test LOC_UNRESOLVED references resolving for `extern' TLS variables.