Merge GDB 7.5.1

gdb/jv-exp.y

 /* YACC parser for Java expressions, for GDB.
    Copyright (C) 1997-2000, 2006-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
@@ skipping 80 matching lines @@
 #define yyrule  java_rule               /* With YYDEBUG defined */
 #define yylhs   java_yylhs
 #define yylen   java_yylen
 #define yydefred java_yydefred
 #define yydgoto java_yydgoto
 #define yysindex java_yysindex
 #define yyrindex java_yyrindex
 #define yygindex java_yygindex
 #define yytable  java_yytable
 #define yycheck  java_yycheck
+#define yyss    java_yyss
+#define yysslim java_yysslim
+#define yyssp   java_yyssp
+#define yystacksize java_yystacksize
+#define yyvs    java_yyvs
+#define yyvsp   java_yyvsp
 
 #ifndef YYDEBUG
 #define YYDEBUG 1               /* Default to yydebug support */
 #endif
 
 #define YYFPRINTF parser_fprintf
 
 int yyparse (void);
 
 static int yylex (void);
@@ skipping 1329 matching lines @@
   {
     int i;
 
     for (i = expout_ptr - 1; i >= pos; i--)
       expout->elts[i + newlen] = expout->elts[i];
   }
   
   memcpy (expout->elts + pos, new->elts, EXP_ELEM_TO_BYTES (newlen));
   expout_ptr += newlen;
 }