Merge GDB 7.5.1

gdb/arm-wince-tdep.c

 /* Target-dependent code for Windows CE running on ARM processors,
    for GDB.
 
    Copyright (C) 2007-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
@@ skipping 26 matching lines @@
 #define ARM_WINCE_JB_ELEMENT_SIZE       INT_REGISTER_SIZE
 #define ARM_WINCE_JB_PC                 10
 
 static CORE_ADDR
 arm_pe_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
 {
   struct gdbarch *gdbarch = get_frame_arch (frame);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   ULONGEST indirect;
   struct minimal_symbol *indsym;
-  char *symname;
+  const char *symname;
   CORE_ADDR next_pc;
 
   /* The format of an ARM DLL trampoline is:
        ldr  ip, [pc]
        ldr  pc, [ip]
        .dw __imp_<func>  */
 
   if (pc == 0
       || read_memory_unsigned_integer (pc + 0, 4, byte_order) != 0xe59fc000
       || read_memory_unsigned_integer (pc + 4, 4, byte_order) != 0xe59cf000)
@@ skipping 19 matching lines @@
   return arm_skip_stub (frame, pc);
 }
 
 /* GCC emits a call to __gccmain in the prologue of main.
 
    The function below examines the code pointed at by PC and checks to
    see if it corresponds to a call to __gccmain.  If so, it returns
    the address of the instruction following that call.  Otherwise, it
    simply returns PC.  */
 
-CORE_ADDR
+static CORE_ADDR
 arm_wince_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   ULONGEST this_instr;
 
   this_instr = read_memory_unsigned_integer (pc, 4, byte_order);
 
   /* bl offset <__gccmain> */
   if ((this_instr & 0xfff00000) == 0xeb000000)
     {
@@ skipping 63 matching lines @@
 
 void
 _initialize_arm_wince_tdep (void)
 {
   gdbarch_register_osabi_sniffer (bfd_arch_arm, bfd_target_coff_flavour,
                                   arm_wince_osabi_sniffer);
 
   gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_WINCE,
                           arm_wince_init_abi);
 }