Merge GDB 7.5.1

gdb/gdb_vecs.h

Index: gdb/gdb_vecs.h
diff --git a/sim/igen/gen-model.c b/gdb/gdb_vecs.h
similarity index 52%
copy from sim/igen/gen-model.c
copy to gdb/gdb_vecs.h
index b7e4df4dff63e89fe29d9c8c6780a77f0d43706a..d6de54a92665f0df0189cd725c97945d3196ee1e 100644
--- a/sim/igen/gen-model.c
+++ b/gdb/gdb_vecs.h
@@ -1,8 +1,6 @@
-/* The IGEN simulator generator for GDB, the GNU Debugger.
+/* Some commonly-used VEC types.
 
-   Copyright 2002, 2007-2012 Free Software Foundation, Inc.
-
-   Contributed by Andrew Cagney.
+   Copyright (C) 2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,31 +18,30 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "misc.h"
-#include "lf.h"
-#include "table.h"
+#ifndef GDB_VECS_H
+#define GDB_VECS_H
+
+#include "vec.h"
+
+struct probe;
+
+DEF_VEC_P (char_ptr);
 
-#include "filter.h"
+DEF_VEC_P (const_char_ptr);
 
-#include "ld-decode.h"
-#include "ld-insn.h"
+/* From utils.c: */
 
-#include "gen-model.h"
+extern void free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec);
 
-#ifndef NULL
-#define NULL 0
-#endif
+extern struct cleanup *
+  make_cleanup_free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec);
 
+extern void dirnames_to_char_ptr_vec_append (VEC (char_ptr) **vecp,
+					     const char *dirnames);
 
-void
-gen_model_h (lf *file, insn_table *table)
-{
-  lf_print__this_file_is_empty (file, "suffering bit rot");
-}
+extern VEC (char_ptr) *dirnames_to_char_ptr_vec (const char *dirnames);
 
+typedef struct probe *probe_p;
+DEF_VEC_P (probe_p);
 
-void
-gen_model_c (lf *file, insn_table *table)
-{
-  lf_print__this_file_is_empty (file, "suffering bit rot");
-}
+#endif /* GDB_VECS_H */