Add PowerPC64 ld --tls-get-addr-optimize.

[deliverable/binutils-gdb.git] / gdb / c-exp.y

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 59cecb5f3fffedb5c1dfe93b765a14794c5c5840..351505e4fff9982a9d5f956593e389e8472dd631 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -878,7 +878,7 @@ exp :       string_exp
                                  if (type != C_STRING
                                      && type != $1.tokens[i].type)
                                    error (_("Undefined string concatenation."));
-                                 type = $1.tokens[i].type;
+                                 type = (enum c_string_type) $1.tokens[i].type;
                                  break;
                                default:
                                  /* internal error */
@@ -1072,10 +1072,7 @@ variable:        name_not_typename
                                }
 
                              write_exp_elt_opcode (pstate, OP_VAR_VALUE);
-                             /* We want to use the selected frame, not
-                                another more inner frame which happens to
-                                be in the same block.  */
-                             write_exp_elt_block (pstate, NULL);
+                             write_exp_elt_block (pstate, sym.block);
                              write_exp_elt_sym (pstate, sym.symbol);
                              write_exp_elt_opcode (pstate, OP_VAR_VALUE);
                            }