Merge GDB 7.5.1

gdb/opencl-lang.c

 /* OpenCL language support for GDB, the GNU debugger.
    Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
    Contributed by Ken Werner <ken.werner@de.ibm.com>.
 
    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
@@ skipping 50 matching lines @@
   opencl_primitive_type_size_t,
   opencl_primitive_type_ptrdiff_t,
   opencl_primitive_type_intptr_t,
   opencl_primitive_type_uintptr_t,
   opencl_primitive_type_void,
   nr_opencl_primitive_types
 };
 
 static struct gdbarch_data *opencl_type_data;
 
-struct type **
+static struct type **
 builtin_opencl_type (struct gdbarch *gdbarch)
 {
   return gdbarch_data (gdbarch, opencl_type_data);
 }
 
 /* Returns the corresponding OpenCL vector type from the given type code,
    the length of the element type, the unsigned flag and the amount of
    elements (N).  */
 
 static struct type *
@@ skipping 872 matching lines @@
                                        "structure");
           }
       }
     default:
       break;
     }
 
   return evaluate_subexp_c (expect_type, exp, pos, noside);
 }
 
-void
+static void
 opencl_language_arch_info (struct gdbarch *gdbarch,
                            struct language_arch_info *lai)
 {
   struct type **types = builtin_opencl_type (gdbarch);
 
   /* Copy primitive types vector from gdbarch.  */
   lai->primitive_type_vector = types;
 
   /* Type of elements of strings.  */
   lai->string_char_type = types [opencl_primitive_type_char];
@@ skipping 26 matching lines @@
   c_parse,
   c_error,
   null_post_parser,
   c_printchar,                  /* Print a character constant */
   c_printstr,                   /* Function to print string constant */
   c_emit_char,                  /* Print a single char */
   c_print_type,                 /* Print a type using appropriate syntax */
   c_print_typedef,              /* Print a typedef using appropriate syntax */
   c_val_print,                  /* Print a value using appropriate syntax */
   c_value_print,                /* Print a top-level value */
+  default_read_var_value,       /* la_read_var_value */
   NULL,                         /* Language specific skip_trampoline */
   NULL,                         /* name_of_this */
   basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
   basic_lookup_transparent_type,/* lookup_transparent_type */
   NULL,                         /* Language specific symbol demangler */
   NULL,                         /* Language specific
                                    class_name_from_physname */
   c_op_print_tab,               /* expression operators for printing */
   1,                            /* c-style arrays */
   0,                            /* String lower bound */
   default_word_break_characters,
   default_make_symbol_completion_list,
   opencl_language_arch_info,
   default_print_array_index,
   default_pass_by_reference,
   c_get_string,
-  strcmp_iw_ordered,
+  NULL,                         /* la_get_symbol_name_cmp */
   iterate_over_symbols,
   LANG_MAGIC
 };
 
 static void *
 build_opencl_types (struct gdbarch *gdbarch)
 {
   struct type **types
     = GDBARCH_OBSTACK_CALLOC (gdbarch, nr_opencl_primitive_types + 1,
                               struct type *);
@@ skipping 71 matching lines @@
   types[opencl_primitive_type_intptr_t]
     = arch_integer_type (gdbarch, gdbarch_ptr_bit (gdbarch), 0, "intptr_t");
   types[opencl_primitive_type_uintptr_t]
     = arch_integer_type (gdbarch, gdbarch_ptr_bit (gdbarch), 1, "uintptr_t");
   types[opencl_primitive_type_void]
     = arch_type (gdbarch, TYPE_CODE_VOID, 1, "void");
 
   return types;
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_opencl_language;
+
 void
 _initialize_opencl_language (void)
 {
   opencl_type_data = gdbarch_data_register_post_init (build_opencl_types);
   add_language (&opencl_language_defn);
 }