Merge GDB 7.5.1

gdb/expprint.c

Index: gdb/expprint.c
diff --git a/gdb/expprint.c b/gdb/expprint.c
index d9d9b8fc873d541ca07d94c69abd1fcb46d2df23..6915d43f03e42ae1967e54246135762d8a9072a2 100644
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -136,8 +136,6 @@ print_subexp_standard (struct expression *exp, int *pos,
 
     case OP_VAR_ENTRY_VALUE:
       {
-	struct block *b;
-
 	(*pos) += 2;
 	fprintf_filtered (stream, "%s@entry",
 			  SYMBOL_PRINT_NAME (exp->elts[pc + 1].symbol));
@@ -647,12 +645,11 @@ op_string (enum exp_opcode op)
 /* Support for dumping the raw data from expressions in a human readable
    form.  */
 
-static char *op_name (struct expression *, enum exp_opcode);
 static int dump_subexp_body (struct expression *exp, struct ui_file *, int);
 
 /* Name for OPCODE, when it appears in expression EXP.  */
 
-static char *
+char *
 op_name (struct expression *exp, enum exp_opcode opcode)
 {
   return exp->language_defn->la_exp_desc->op_name (opcode);
@@ -975,7 +972,6 @@ dump_subexp_body_standard (struct expression *exp,
       break;
     case TYPE_INSTANCE:
       {
-	char *elem_name;
 	LONGEST len;
 
 	len = exp->elts[elt++].longconst;