Merge GDB 7.5.1

gdb/jit-reader.in

 /* JIT declarations for GDB, the GNU Debugger.
 
    Copyright (C) 2011-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 18 matching lines @@
 #define GDB_READER_INTERFACE_VERSION 1
 
 /* Readers must be released under a GPL compatible license.  To
    declare that the reader is indeed released under a GPL compatible
    license, invoke the macro GDB_DECLARE_GPL_COMPATIBLE in a source
    file.  */
 
 #ifdef __cplusplus
 #define GDB_DECLARE_GPL_COMPATIBLE_READER       \
   extern "C" {                                  \
+  extern int plugin_is_GPL_compatible (void);   \
   extern int plugin_is_GPL_compatible (void)    \
   {                                             \
     return 0;                                   \
   }                                             \
   }
 
 #else
 
-#define GDB_DECLARE_GPL_COMPATIBLE_READER
+#define GDB_DECLARE_GPL_COMPATIBLE_READER       \
+  extern int plugin_is_GPL_compatible (void);   \
   extern int plugin_is_GPL_compatible (void)    \
   {                                             \
     return 0;                                   \
   }
 
 #endif
 
 /* Represents an address on the target system.  */
 
 typedef @TARGET_PTR@ GDB_CORE_ADDR;
@@ skipping 277 matching lines @@
   gdb_unwind_frame *unwind;
   gdb_get_frame_id *get_frame_id;
   gdb_destroy_reader *destroy;
 };
 
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
 
 #endif