From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-87667-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 31800 invoked by alias); 2 Feb 2012 18:48:44 -0000
Received: (qmail 31780 invoked by uid 22791); 2 Feb 2012 18:48:38 -0000
X-SWARE-Spam-Status: No, hits=-2.3 required=5.0	tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW,TW_CN,T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from mail-yw0-f73.google.com (HELO mail-yw0-f73.google.com) (209.85.213.73)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 02 Feb 2012 18:48:20 +0000
Received: by yhpp61 with SMTP id p61so288690yhp.0        for <gdb-patches@sourceware.org>; Thu, 02 Feb 2012 10:48:19 -0800 (PST)
Received: by 10.236.129.225 with SMTP id h61mr6157484yhi.4.1328208499938;        Thu, 02 Feb 2012 10:48:19 -0800 (PST)
Received: by 10.236.129.225 with SMTP id h61mr6157474yhi.4.1328208499889;        Thu, 02 Feb 2012 10:48:19 -0800 (PST)
Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65])        by gmr-mx.google.com with ESMTPS id g10si1376095yhn.7.2012.02.02.10.48.19        (version=TLSv1/SSLv3 cipher=AES128-SHA);        Thu, 02 Feb 2012 10:48:19 -0800 (PST)
Received: from ruffy2.mtv.corp.google.com (ruffy2.mtv.corp.google.com [172.18.110.129])	by wpzn3.hot.corp.google.com (Postfix) with ESMTP id 92E44100052	for <gdb-patches@sourceware.org>; Thu,  2 Feb 2012 10:48:19 -0800 (PST)
Received: by ruffy2.mtv.corp.google.com (Postfix, from userid 67641)	id 3207D1E25C6; Thu,  2 Feb 2012 10:48:19 -0800 (PST)
To: gdb-patches@sourceware.org
Subject: [patch]: Change char * to const char * of some functions.
Message-Id: <20120202184819.3207D1E25C6@ruffy2.mtv.corp.google.com>
Date: Thu, 02 Feb 2012 18:48:00 -0000
From: dje@google.com (Doug Evans)
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2012-02/txt/msg00039.txt.bz2

Hi.

This is a bit of a large patch but it's entirely mechanical.
It changes the types of some function parameters from char * to const char *,
and char ** to const char **.

This is a standalone patch, so I haven't grouped it with another patch
I'm working on which is to make the types of some name fields in
symtab.h,gdbtypes.h const char *.

I will check this in in a few days if there are no objections.

Build-tested on amd64-linux, with --target=
amd64-linux
alpha-osf
arm-linux
i386-cygwin32
mips64-linux
powerpc-linux
[yeah, I could have chosen a bit more variety instead of foo-linux,
but this catches the relevant target files, and this is only a small
fraction of the entire possible target list anyway]

2012-02-02  Doug Evans  <dje@google.com>

	* blockframe.c (find_pc_partial_function_gnu_ifunc): Change type of
	"name" parameter to const char ** from char **.  All callers updated.
	(find_pc_partial_function): Ditto.
	(cache_pc_function_name): Change type to const char * from char *.
	* symtab.h ((find_pc_partial_function_gnu_ifunc): Update.
	(find_pc_partial_function): Update.
	* alpha-tdep.h (struct gdbarch_tdep, member pc_in_sigtramp): Change
	type of "name" parameter to const char * from char *.
	All uses updated.
	* arch-utils.c (generic_in_solib_return_trampoline): Change
	type of "name" parameter to const char * from char *.
	* arch-utils.h (generic_in_solib_return_trampoline): Update.
	* frv-linux-tdep.c (frv_linux_pc_in_sigtramp): Change
	type of "name" parameter to const char * from char *.
	* gdbarch.sh (in_solib_return_trampoline): Ditto.
	* gdbarch.c: Regenerate.
	* gdbarch.h: Regenerate.
	* hppa-hpux-tdep.c (hppa_hpux_in_solib_return_trampoline): Update.
	* rs6000-tdep.c (rs6000_in_solib_return_trampoline): Update.
	* m32r-linux-tdep.c (m32r_linux_pc_in_sigtramp): Change
	type of "name" parameter to const char * from char *.
	* skip.c (skip_function_pc): Ditto.
	* sparc-sol2-tdep.c (sparc_sol2_pc_in_sigtramp): Ditto.
	* sparc-tdep.h (sparc_sol2_pc_in_sigtramp): Update.
	* sparc64fbsd-tdep.c (sparc64fbsd_pc_in_sigtramp): Ditto.
	* sparc64nbsd-tdep.c (sparc64nbsd_pc_in_sigtramp): Ditto.
	* sparc64obsd-tdep.c (sparc64obsd_pc_in_sigtramp): Ditto.
	* sparcnbsd-tdep.c (sparc32nbsd_pc_in_sigtramp): Ditto.
	* sparcobsd-tdep.c (sparc32obsd_pc_in_sigtramp): Ditto.
	* nbsd-tdep.c (nbsd_pc_in_sigtramp): Similary for "func_name".
	* nbsd-tdep.h (nbsd_pc_in_sigtramp): Update.

Index: alpha-linux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alpha-linux-tdep.c,v
retrieving revision 1.33
diff -u -p -r1.33 alpha-linux-tdep.c
--- alpha-linux-tdep.c	4 Jan 2012 08:16:55 -0000	1.33
+++ alpha-linux-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -92,7 +92,7 @@ alpha_linux_sigtramp_offset (struct gdba
 
 static int
 alpha_linux_pc_in_sigtramp (struct gdbarch *gdbarch,
-			    CORE_ADDR pc, char *func_name)
+			    CORE_ADDR pc, const char *func_name)
 {
   return alpha_linux_sigtramp_offset (gdbarch, pc) >= 0;
 }
Index: alpha-mdebug-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alpha-mdebug-tdep.c,v
retrieving revision 1.30
diff -u -p -r1.30 alpha-mdebug-tdep.c
--- alpha-mdebug-tdep.c	4 Jan 2012 08:16:55 -0000	1.30
+++ alpha-mdebug-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -96,7 +96,7 @@ find_proc_desc (CORE_ADDR pc)
   struct block *b = block_for_pc (pc);
   struct mdebug_extra_func_info *proc_desc = NULL;
   struct symbol *sym = NULL;
-  char *sh_name = NULL;
+  const char *sh_name = NULL;
 
   if (b)
     {
Index: alpha-osf1-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alpha-osf1-tdep.c,v
retrieving revision 1.31
diff -u -p -r1.31 alpha-osf1-tdep.c
--- alpha-osf1-tdep.c	4 Jan 2012 08:16:55 -0000	1.31
+++ alpha-osf1-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -28,7 +28,7 @@
 
 static int
 alpha_osf1_pc_in_sigtramp (struct gdbarch *gdbarch,
-			   CORE_ADDR pc, char *func_name)
+			   CORE_ADDR pc, const char *func_name)
 {
   return (func_name != NULL && strcmp ("__sigtramp", func_name) == 0);
 }
Index: alpha-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alpha-tdep.c,v
retrieving revision 1.208
diff -u -p -r1.208 alpha-tdep.c
--- alpha-tdep.c	4 Jan 2012 08:16:56 -0000	1.208
+++ alpha-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -999,7 +999,7 @@ alpha_sigtramp_frame_sniffer (const stru
 {
   struct gdbarch *gdbarch = get_frame_arch (this_frame);
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   /* NOTE: cagney/2004-04-30: Do not copy/clone this code.  Instead
      look at tramp-frame.h and other simplier per-architecture
Index: alpha-tdep.h
===================================================================
RCS file: /cvs/src/src/gdb/alpha-tdep.h,v
retrieving revision 1.40
diff -u -p -r1.40 alpha-tdep.h
--- alpha-tdep.h	4 Jan 2012 08:16:56 -0000	1.40
+++ alpha-tdep.h	2 Feb 2012 18:19:26 -0000
@@ -86,7 +86,8 @@ struct gdbarch_tdep
   /* NOTE: cagney/2004-04-30: Do not copy/clone this code.  Instead
      look at tramp-frame.h and other simplier per-architecture
      sigtramp unwinders.  */
-  int (*pc_in_sigtramp) (struct gdbarch *gdbarch, CORE_ADDR pc, char *name);
+  int (*pc_in_sigtramp) (struct gdbarch *gdbarch, CORE_ADDR pc,
+			 const char *name);
 
   /* If TYPE will be returned in memory, return true.  */
   int (*return_in_memory) (struct type *type);
Index: alphafbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alphafbsd-tdep.c,v
retrieving revision 1.26
diff -u -p -r1.26 alphafbsd-tdep.c
--- alphafbsd-tdep.c	4 Jan 2012 08:16:56 -0000	1.26
+++ alphafbsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -65,7 +65,7 @@ CORE_ADDR alphafbsd_sigtramp_end = 0x11f
 
 static int
 alphafbsd_pc_in_sigtramp (struct gdbarch *gdbarch,
-			  CORE_ADDR pc, char *func_name)
+			  CORE_ADDR pc, const char *func_name)
 {
   return (pc >= alphafbsd_sigtramp_start && pc < alphafbsd_sigtramp_end);
 }
Index: alphanbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alphanbsd-tdep.c,v
retrieving revision 1.44
diff -u -p -r1.44 alphanbsd-tdep.c
--- alphanbsd-tdep.c	4 Jan 2012 08:16:56 -0000	1.44
+++ alphanbsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -241,7 +241,7 @@ alphanbsd_sigtramp_offset (struct gdbarc
 
 static int
 alphanbsd_pc_in_sigtramp (struct gdbarch *gdbarch,
-		 	  CORE_ADDR pc, char *func_name)
+		 	  CORE_ADDR pc, const char *func_name)
 {
   return (nbsd_pc_in_sigtramp (pc, func_name)
 	  || alphanbsd_sigtramp_offset (gdbarch, pc) >= 0);
Index: alphaobsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alphaobsd-tdep.c,v
retrieving revision 1.11
diff -u -p -r1.11 alphaobsd-tdep.c
--- alphaobsd-tdep.c	4 Jan 2012 08:16:56 -0000	1.11
+++ alphaobsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -47,7 +47,7 @@ alphaobsd_sigtramp_offset (struct gdbarc
 
 static int
 alphaobsd_pc_in_sigtramp (struct gdbarch *gdbarch,
-			  CORE_ADDR pc, char *name)
+			  CORE_ADDR pc, const char *name)
 {
   CORE_ADDR start_pc = (pc & ~(alphaobsd_page_size - 1));
   unsigned insn;
Index: amd64-linux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/amd64-linux-tdep.c,v
retrieving revision 1.44
diff -u -p -r1.44 amd64-linux-tdep.c
--- amd64-linux-tdep.c	4 Jan 2012 08:16:56 -0000	1.44
+++ amd64-linux-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -156,7 +156,7 @@ static int
 amd64_linux_sigtramp_p (struct frame_info *this_frame)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
 
Index: amd64-sol2-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/amd64-sol2-tdep.c,v
retrieving revision 1.15
diff -u -p -r1.15 amd64-sol2-tdep.c
--- amd64-sol2-tdep.c	4 Jan 2012 08:16:56 -0000	1.15
+++ amd64-sol2-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -71,7 +71,7 @@ static int
 amd64_sol2_sigtramp_p (struct frame_info *this_frame)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   return (name && (strcmp ("sigacthandler", name) == 0
Index: amd64nbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/amd64nbsd-tdep.c,v
retrieving revision 1.20
diff -u -p -r1.20 amd64nbsd-tdep.c
--- amd64nbsd-tdep.c	4 Jan 2012 08:16:56 -0000	1.20
+++ amd64nbsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -39,7 +39,7 @@ static int
 amd64nbsd_sigtramp_p (struct frame_info *this_frame)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   return nbsd_pc_in_sigtramp (pc, name);
Index: amd64obsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/amd64obsd-tdep.c,v
retrieving revision 1.37
diff -u -p -r1.37 amd64obsd-tdep.c
--- amd64obsd-tdep.c	4 Jan 2012 08:16:56 -0000	1.37
+++ amd64obsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -101,7 +101,7 @@ amd64obsd_sigtramp_p (struct frame_info 
   };
   size_t buflen = (sizeof sigreturn) + 1;
   gdb_byte *buf;
-  char *name;
+  const char *name;
 
   /* If the function has a valid symbol name, it isn't a
      trampoline.  */
@@ -360,7 +360,7 @@ amd64obsd_trapframe_cache (struct frame_
   struct trad_frame_cache *cache;
   CORE_ADDR func, sp, addr;
   ULONGEST cs;
-  char *name;
+  const char *name;
   int i;
 
   if (*this_cache)
@@ -425,7 +425,7 @@ amd64obsd_trapframe_sniffer (const struc
 			     void **this_prologue_cache)
 {
   ULONGEST cs;
-  char *name;
+  const char *name;
 
   /* Check Current Privilege Level and bail out if we're not executing
      in kernel space.  */
Index: arch-utils.c
===================================================================
RCS file: /cvs/src/src/gdb/arch-utils.c,v
retrieving revision 1.197
diff -u -p -r1.197 arch-utils.c
--- arch-utils.c	28 Jan 2012 18:08:16 -0000	1.197
+++ arch-utils.c	2 Feb 2012 18:19:26 -0000
@@ -120,7 +120,7 @@ generic_skip_solib_resolver (struct gdba
 
 int
 generic_in_solib_return_trampoline (struct gdbarch *gdbarch,
-				    CORE_ADDR pc, char *name)
+				    CORE_ADDR pc, const char *name)
 {
   return 0;
 }
Index: arch-utils.h
===================================================================
RCS file: /cvs/src/src/gdb/arch-utils.h,v
retrieving revision 1.115
diff -u -p -r1.115 arch-utils.h
--- arch-utils.h	4 Jan 2012 08:16:56 -0000	1.115
+++ arch-utils.h	2 Feb 2012 18:19:26 -0000
@@ -99,7 +99,7 @@ extern CORE_ADDR generic_skip_solib_reso
 					      CORE_ADDR pc);
 
 extern int generic_in_solib_return_trampoline (struct gdbarch *gdbarch,
-					       CORE_ADDR pc, char *name);
+					       CORE_ADDR pc, const char *name);
 
 extern int generic_in_function_epilogue_p (struct gdbarch *gdbarch,
 					   CORE_ADDR pc);
Index: arm-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/arm-tdep.c,v
retrieving revision 1.357
diff -u -p -r1.357 arm-tdep.c
--- arm-tdep.c	28 Jan 2012 18:08:16 -0000	1.357
+++ arm-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -9101,7 +9101,7 @@ arm_get_longjmp_target (struct frame_inf
 CORE_ADDR
 arm_skip_stub (struct frame_info *frame, CORE_ADDR pc)
 {
-  char *name;
+  const char *name;
   int namelen;
   CORE_ADDR start_addr;
 
Index: blockframe.c
===================================================================
RCS file: /cvs/src/src/gdb/blockframe.c,v
retrieving revision 1.136
diff -u -p -r1.136 blockframe.c
--- blockframe.c	11 Jan 2012 10:34:20 -0000	1.136
+++ blockframe.c	2 Feb 2012 18:19:26 -0000
@@ -159,7 +159,7 @@ find_pc_function (CORE_ADDR pc)
 
 static CORE_ADDR cache_pc_function_low = 0;
 static CORE_ADDR cache_pc_function_high = 0;
-static char *cache_pc_function_name = 0;
+static const char *cache_pc_function_name = 0;
 static struct obj_section *cache_pc_function_section = NULL;
 static int cache_pc_function_is_gnu_ifunc = 0;
 
@@ -190,7 +190,7 @@ clear_pc_function_cache (void)
 /* Backward compatibility, no section argument.  */
 
 int
-find_pc_partial_function_gnu_ifunc (CORE_ADDR pc, char **name,
+find_pc_partial_function_gnu_ifunc (CORE_ADDR pc, const char **name,
 				    CORE_ADDR *address, CORE_ADDR *endaddr,
 				    int *is_gnu_ifunc_p)
 {
@@ -346,7 +346,7 @@ find_pc_partial_function_gnu_ifunc (CORE
    is omitted here for backward API compatibility.  */
 
 int
-find_pc_partial_function (CORE_ADDR pc, char **name, CORE_ADDR *address,
+find_pc_partial_function (CORE_ADDR pc, const char **name, CORE_ADDR *address,
 			  CORE_ADDR *endaddr)
 {
   return find_pc_partial_function_gnu_ifunc (pc, name, address, endaddr, NULL);
Index: breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.649
diff -u -p -r1.649 breakpoint.c
--- breakpoint.c	28 Jan 2012 18:08:17 -0000	1.649
+++ breakpoint.c	2 Feb 2012 18:19:26 -0000
@@ -5874,8 +5874,9 @@ set_breakpoint_location_function (struct
       || is_tracepoint (loc->owner))
     {
       int is_gnu_ifunc;
+      const char *function_name;
 
-      find_pc_partial_function_gnu_ifunc (loc->address, &loc->function_name,
+      find_pc_partial_function_gnu_ifunc (loc->address, &function_name,
 					  NULL, NULL, &is_gnu_ifunc);
 
       if (is_gnu_ifunc && !explicit_loc)
@@ -5883,7 +5884,7 @@ set_breakpoint_location_function (struct
 	  struct breakpoint *b = loc->owner;
 
 	  gdb_assert (loc->pspace == current_program_space);
-	  if (gnu_ifunc_resolve_name (loc->function_name,
+	  if (gnu_ifunc_resolve_name (function_name,
 				      &loc->requested_address))
 	    {
 	      /* Recalculate ADDRESS based on new REQUESTED_ADDRESS.  */
@@ -5900,8 +5901,8 @@ set_breakpoint_location_function (struct
 	    }
 	}
 
-      if (loc->function_name)
-	loc->function_name = xstrdup (loc->function_name);
+      if (function_name)
+	loc->function_name = xstrdup (function_name);
     }
 }
 
Index: elfread.c
===================================================================
RCS file: /cvs/src/src/gdb/elfread.c,v
retrieving revision 1.123
diff -u -p -r1.123 elfread.c
--- elfread.c	4 Jan 2012 08:17:01 -0000	1.123
+++ elfread.c	2 Feb 2012 18:19:26 -0000
@@ -920,7 +920,7 @@ elf_gnu_ifunc_resolve_name (const char *
 static CORE_ADDR
 elf_gnu_ifunc_resolve_addr (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
-  char *name_at_pc;
+  const char *name_at_pc;
   CORE_ADDR start_at_pc, address;
   struct type *func_func_type = builtin_type (gdbarch)->builtin_func_func;
   struct value *function, *address_val;
Index: frv-linux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/frv-linux-tdep.c,v
retrieving revision 1.24
diff -u -p -r1.24 frv-linux-tdep.c
--- frv-linux-tdep.c	4 Jan 2012 08:17:02 -0000	1.24
+++ frv-linux-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -42,7 +42,8 @@ enum {
 };
 
 static int
-frv_linux_pc_in_sigtramp (struct gdbarch *gdbarch, CORE_ADDR pc, char *name)
+frv_linux_pc_in_sigtramp (struct gdbarch *gdbarch, CORE_ADDR pc,
+			  const char *name)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   char buf[frv_instr_size];
@@ -323,7 +324,7 @@ frv_linux_sigtramp_frame_sniffer (const 
 {
   struct gdbarch *gdbarch = get_frame_arch (this_frame);
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (frv_linux_pc_in_sigtramp (gdbarch, pc, name))
Index: gdbarch.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbarch.c,v
retrieving revision 1.483
diff -u -p -r1.483 gdbarch.c
--- gdbarch.c	20 Jan 2012 09:59:14 -0000	1.483
+++ gdbarch.c	2 Feb 2012 18:19:26 -0000
@@ -3008,7 +3008,7 @@ set_gdbarch_skip_solib_resolver (struct 
 }
 
 int
-gdbarch_in_solib_return_trampoline (struct gdbarch *gdbarch, CORE_ADDR pc, char *name)
+gdbarch_in_solib_return_trampoline (struct gdbarch *gdbarch, CORE_ADDR pc, const char *name)
 {
   gdb_assert (gdbarch != NULL);
   gdb_assert (gdbarch->in_solib_return_trampoline != NULL);
Index: gdbarch.h
===================================================================
RCS file: /cvs/src/src/gdb/gdbarch.h,v
retrieving revision 1.432
diff -u -p -r1.432 gdbarch.h
--- gdbarch.h	20 Jan 2012 09:59:14 -0000	1.432
+++ gdbarch.h	2 Feb 2012 18:19:26 -0000
@@ -631,8 +631,8 @@ extern void set_gdbarch_skip_solib_resol
 
 /* Some systems also have trampoline code for returning from shared libs. */
 
-typedef int (gdbarch_in_solib_return_trampoline_ftype) (struct gdbarch *gdbarch, CORE_ADDR pc, char *name);
-extern int gdbarch_in_solib_return_trampoline (struct gdbarch *gdbarch, CORE_ADDR pc, char *name);
+typedef int (gdbarch_in_solib_return_trampoline_ftype) (struct gdbarch *gdbarch, CORE_ADDR pc, const char *name);
+extern int gdbarch_in_solib_return_trampoline (struct gdbarch *gdbarch, CORE_ADDR pc, const char *name);
 extern void set_gdbarch_in_solib_return_trampoline (struct gdbarch *gdbarch, gdbarch_in_solib_return_trampoline_ftype *in_solib_return_trampoline);
 
 /* A target might have problems with watchpoints as soon as the stack
Index: gdbarch.sh
===================================================================
RCS file: /cvs/src/src/gdb/gdbarch.sh,v
retrieving revision 1.531
diff -u -p -r1.531 gdbarch.sh
--- gdbarch.sh	20 Jan 2012 09:59:15 -0000	1.531
+++ gdbarch.sh	2 Feb 2012 18:19:26 -0000
@@ -600,7 +600,7 @@ f:CORE_ADDR:skip_trampoline_code:struct 
 # a step-resume breakpoint to get us past the dynamic linker.
 m:CORE_ADDR:skip_solib_resolver:CORE_ADDR pc:pc::generic_skip_solib_resolver::0
 # Some systems also have trampoline code for returning from shared libs.
-m:int:in_solib_return_trampoline:CORE_ADDR pc, char *name:pc, name::generic_in_solib_return_trampoline::0
+m:int:in_solib_return_trampoline:CORE_ADDR pc, const char *name:pc, name::generic_in_solib_return_trampoline::0
 
 # A target might have problems with watchpoints as soon as the stack
 # frame of the current function has been destroyed.  This mostly happens
Index: hppa-hpux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/hppa-hpux-tdep.c,v
retrieving revision 1.83
diff -u -p -r1.83 hppa-hpux-tdep.c
--- hppa-hpux-tdep.c	4 Jan 2012 08:17:03 -0000	1.83
+++ hppa-hpux-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -230,7 +230,7 @@ hppa64_hpux_in_solib_call_trampoline (st
 
 static int
 hppa_hpux_in_solib_return_trampoline (struct gdbarch *gdbarch,
-				      CORE_ADDR pc, char *name)
+				      CORE_ADDR pc, const char *name)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   struct unwind_table_entry *u;
@@ -981,7 +981,7 @@ hppa64_hpux_search_dummy_call_sequence (
   ALL_OBJFILE_MSYMBOLS (obj, msym)
     {
       CORE_ADDR begin, end;
-      char *name;
+      const char *name;
       gdb_byte buf[2 * HPPA_INSN_SIZE];
       int offset;
 
Index: i386-linux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-linux-tdep.c,v
retrieving revision 1.83
diff -u -p -r1.83 i386-linux-tdep.c
--- i386-linux-tdep.c	4 Jan 2012 08:17:04 -0000	1.83
+++ i386-linux-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -254,7 +254,7 @@ static int
 i386_linux_sigtramp_p (struct frame_info *this_frame)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
 
@@ -279,7 +279,7 @@ i386_linux_dwarf_signal_frame_p (struct 
 				 struct frame_info *this_frame)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
 
Index: i386-nto-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-nto-tdep.c,v
retrieving revision 1.40
diff -u -p -r1.40 i386-nto-tdep.c
--- i386-nto-tdep.c	4 Jan 2012 08:17:04 -0000	1.40
+++ i386-nto-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -281,7 +281,7 @@ static int
 i386nto_sigtramp_p (struct frame_info *this_frame)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   return name && strcmp ("__signalstub", name) == 0;
Index: i386-sol2-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-sol2-tdep.c,v
retrieving revision 1.32
diff -u -p -r1.32 i386-sol2-tdep.c
--- i386-sol2-tdep.c	4 Jan 2012 08:17:04 -0000	1.32
+++ i386-sol2-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -55,7 +55,7 @@ static int
 i386_sol2_sigtramp_p (struct frame_info *this_frame)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   return (name && (strcmp ("sigacthandler", name) == 0
Index: i386-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-tdep.c,v
retrieving revision 1.343
diff -u -p -r1.343 i386-tdep.c
--- i386-tdep.c	28 Jan 2012 18:08:17 -0000	1.343
+++ i386-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -2036,7 +2036,7 @@ static int
 i386_in_stack_tramp_p (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   gdb_byte insn;
-  char *name;
+  const char *name;
 
   /* A stack trampoline is detected if no name is associated
     to the current pc and if it points inside a trampoline
@@ -3294,7 +3294,7 @@ int
 i386_sigtramp_p (struct frame_info *this_frame)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   return (name && strcmp ("_sigtramp", name) == 0);
@@ -3332,7 +3332,7 @@ static int
 i386_svr4_sigtramp_p (struct frame_info *this_frame)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   /* UnixWare uses _sigacthandler.  The origin of the other symbols is
      currently unknown.  */
Index: i386obsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386obsd-tdep.c,v
retrieving revision 1.42
diff -u -p -r1.42 i386obsd-tdep.c
--- i386obsd-tdep.c	4 Jan 2012 08:17:04 -0000	1.42
+++ i386obsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -81,7 +81,7 @@ i386obsd_sigtramp_p (struct frame_info *
   size_t buflen = sizeof sigreturn;
   const int *offset;
   gdb_byte *buf;
-  char *name;
+  const char *name;
 
   /* If the function has a valid symbol name, it isn't a
      trampoline.  */
@@ -348,7 +348,7 @@ i386obsd_trapframe_cache (struct frame_i
   struct trad_frame_cache *cache;
   CORE_ADDR func, sp, addr;
   ULONGEST cs;
-  char *name;
+  const char *name;
   int i;
 
   if (*this_cache)
@@ -413,7 +413,7 @@ i386obsd_trapframe_sniffer (const struct
 			    void **this_prologue_cache)
 {
   ULONGEST cs;
-  char *name;
+  const char *name;
 
   /* Check Current Privilege Level and bail out if we're not executing
      in kernel space.  */
Index: infcmd.c
===================================================================
RCS file: /cvs/src/src/gdb/infcmd.c,v
retrieving revision 1.295
diff -u -p -r1.295 infcmd.c
--- infcmd.c	20 Jan 2012 09:49:58 -0000	1.295
+++ infcmd.c	2 Feb 2012 18:19:26 -0000
@@ -1036,7 +1036,7 @@ step_once (int skip_subroutines, int sin
 	    tp->control.step_range_start = tp->control.step_range_end = 1;
 	  else if (tp->control.step_range_end == 0)
 	    {
-	      char *name;
+	      const char *name;
 
 	      if (find_pc_partial_function (pc, &name,
 					    &tp->control.step_range_start,
Index: infrun.c
===================================================================
RCS file: /cvs/src/src/gdb/infrun.c,v
retrieving revision 1.522
diff -u -p -r1.522 infrun.c
--- infrun.c	28 Jan 2012 18:08:18 -0000	1.522
+++ infrun.c	2 Feb 2012 18:19:26 -0000
@@ -2367,7 +2367,7 @@ struct execution_control_state
   int stop_func_filled_in;
   CORE_ADDR stop_func_start;
   CORE_ADDR stop_func_end;
-  char *stop_func_name;
+  const char *stop_func_name;
   int new_thread_event;
   int wait_some_more;
 };
Index: m32c-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/m32c-tdep.c,v
retrieving revision 1.44
diff -u -p -r1.44 m32c-tdep.c
--- m32c-tdep.c	4 Jan 2012 08:17:05 -0000	1.44
+++ m32c-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -1834,7 +1834,7 @@ m32c_analyze_prologue (struct gdbarch *a
 static CORE_ADDR
 m32c_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip)
 {
-  char *name;
+  const char *name;
   CORE_ADDR func_addr, func_end, sal_end;
   struct m32c_prologue p;
 
@@ -2353,7 +2353,7 @@ m32c_skip_trampoline_code (struct frame_
      someone loaded a new executable, and I'm not quite sure of the
      best way to do that.  find_pc_partial_function does do some
      caching, so we'll see how this goes.  */
-  char *name;
+  const char *name;
   CORE_ADDR start, end;
 
   if (find_pc_partial_function (stop_pc, &name, &start, &end))
@@ -2586,7 +2586,7 @@ m32c_virtual_frame_pointer (struct gdbar
 			    int *frame_regnum,
 			    LONGEST *frame_offset)
 {
-  char *name;
+  const char *name;
   CORE_ADDR func_addr, func_end, sal_end;
   struct m32c_prologue p;
 
Index: m32r-linux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/m32r-linux-tdep.c,v
retrieving revision 1.18
diff -u -p -r1.18 m32r-linux-tdep.c
--- m32r-linux-tdep.c	4 Jan 2012 08:17:05 -0000	1.18
+++ m32r-linux-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -173,7 +173,7 @@ m32r_linux_rt_sigtramp_start (CORE_ADDR 
 }
 
 static int
-m32r_linux_pc_in_sigtramp (CORE_ADDR pc, char *name,
+m32r_linux_pc_in_sigtramp (CORE_ADDR pc, const char *name,
 			   struct frame_info *this_frame)
 {
   /* If we have NAME, we can optimize the search.  The trampolines are
@@ -293,7 +293,7 @@ m32r_linux_sigtramp_frame_sniffer (const
 				   void **this_cache)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (m32r_linux_pc_in_sigtramp (pc, name, this_frame))
Index: mep-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mep-tdep.c,v
retrieving revision 1.33
diff -u -p -r1.33 mep-tdep.c
--- mep-tdep.c	4 Jan 2012 08:17:06 -0000	1.33
+++ mep-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -1911,7 +1911,7 @@ mep_analyze_prologue (struct gdbarch *gd
 static CORE_ADDR
 mep_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
-  char *name;
+  const char *name;
   CORE_ADDR func_addr, func_end;
   struct mep_prologue p;
 
Index: microblaze-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/microblaze-tdep.c,v
retrieving revision 1.7
diff -u -p -r1.7 microblaze-tdep.c
--- microblaze-tdep.c	4 Jan 2012 08:17:06 -0000	1.7
+++ microblaze-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -228,7 +228,7 @@ microblaze_analyze_prologue (struct gdba
 			     CORE_ADDR current_pc,
 			     struct microblaze_frame_cache *cache)
 {
-  char *name;
+  const char *name;
   CORE_ADDR func_addr, func_end, addr, stop, prologue_end_addr = 0;
   unsigned long insn;
   int rn, rd, ra, rb, imm;
Index: mips-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mips-tdep.c,v
retrieving revision 1.530
diff -u -p -r1.530 mips-tdep.c
--- mips-tdep.c	28 Jan 2012 18:08:18 -0000	1.530
+++ mips-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -5313,7 +5313,7 @@ static CORE_ADDR
 mips_skip_mips16_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
 {
   struct gdbarch *gdbarch = get_frame_arch (frame);
-  char *name;
+  const char *name;
   CORE_ADDR start_addr;
 
   /* Find the starting address and name of the function containing the PC.  */
Index: mn10300-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mn10300-tdep.c,v
retrieving revision 1.173
diff -u -p -r1.173 mn10300-tdep.c
--- mn10300-tdep.c	4 Jan 2012 08:17:08 -0000	1.173
+++ mn10300-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -1061,7 +1061,7 @@ mn10300_analyze_prologue (struct gdbarch
 static CORE_ADDR
 mn10300_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
-  char *name;
+  const char *name;
   CORE_ADDR func_addr, func_end;
   struct mn10300_prologue p;
 
Index: moxie-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/moxie-tdep.c,v
retrieving revision 1.13
diff -u -p -r1.13 moxie-tdep.c
--- moxie-tdep.c	4 Jan 2012 08:17:08 -0000	1.13
+++ moxie-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -218,7 +218,7 @@ static CORE_ADDR
 moxie_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr = 0, func_end = 0;
-  char *func_name;
+  const char *func_name;
 
   /* See if we can determine the end of the prologue via the symbol table.
      If so, then return either PC, or the PC after the prologue, whichever
Index: mt-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/mt-tdep.c,v
retrieving revision 1.38
diff -u -p -r1.38 mt-tdep.c
--- mt-tdep.c	4 Jan 2012 08:17:08 -0000	1.38
+++ mt-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -408,7 +408,7 @@ mt_skip_prologue (struct gdbarch *gdbarc
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   CORE_ADDR func_addr = 0, func_end = 0;
-  char *func_name;
+  const char *func_name;
   unsigned long instr;
 
   if (find_pc_partial_function (pc, &func_name, &func_addr, &func_end))
Index: nbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/nbsd-tdep.c,v
retrieving revision 1.13
diff -u -p -r1.13 nbsd-tdep.c
--- nbsd-tdep.c	4 Jan 2012 08:17:08 -0000	1.13
+++ nbsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -40,7 +40,7 @@ nbsd_lp64_solib_svr4_fetch_link_map_offs
 }
 
 int
-nbsd_pc_in_sigtramp (CORE_ADDR pc, char *func_name)
+nbsd_pc_in_sigtramp (CORE_ADDR pc, const char *func_name)
 {
   /* Check for libc-provided signal trampoline.  All such trampolines
      have function names which begin with "__sigtramp".  */
Index: nbsd-tdep.h
===================================================================
RCS file: /cvs/src/src/gdb/nbsd-tdep.h,v
retrieving revision 1.10
diff -u -p -r1.10 nbsd-tdep.h
--- nbsd-tdep.h	4 Jan 2012 08:17:08 -0000	1.10
+++ nbsd-tdep.h	2 Feb 2012 18:19:26 -0000
@@ -23,6 +23,6 @@
 struct link_map_offsets *nbsd_ilp32_solib_svr4_fetch_link_map_offsets (void);
 struct link_map_offsets *nbsd_lp64_solib_svr4_fetch_link_map_offsets (void);
 
-int nbsd_pc_in_sigtramp (CORE_ADDR, char *);
+int nbsd_pc_in_sigtramp (CORE_ADDR, const char *);
 
 #endif /* NBSD_TDEP_H */
Index: ppcobsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/ppcobsd-tdep.c,v
retrieving revision 1.28
diff -u -p -r1.28 ppcobsd-tdep.c
--- ppcobsd-tdep.c	4 Jan 2012 08:17:09 -0000	1.28
+++ ppcobsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -130,7 +130,7 @@ ppcobsd_sigtramp_frame_sniffer (const st
   CORE_ADDR pc = get_frame_pc (this_frame);
   CORE_ADDR start_pc = (pc & ~(ppcobsd_page_size - 1));
   const int *offset;
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (name)
Index: remote-mips.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-mips.c,v
retrieving revision 1.123
diff -u -p -r1.123 remote-mips.c
--- remote-mips.c	4 Jan 2012 08:17:10 -0000	1.123
+++ remote-mips.c	2 Feb 2012 18:19:26 -0000
@@ -1954,7 +1954,7 @@ mips_wait (struct target_ops *ops,
          is not a normal breakpoint.  */
       if (strcmp (target_shortname, "lsi") == 0)
 	{
-	  char *func_name;
+	  const char *func_name;
 	  CORE_ADDR func_start;
 	  CORE_ADDR pc = regcache_read_pc (get_current_regcache ());
 
Index: rs6000-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/rs6000-tdep.c,v
retrieving revision 1.355
diff -u -p -r1.355 rs6000-tdep.c
--- rs6000-tdep.c	28 Jan 2012 18:08:19 -0000	1.355
+++ rs6000-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -2189,7 +2189,7 @@ rs6000_frame_align (struct gdbarch *gdba
 
 static int
 rs6000_in_solib_return_trampoline (struct gdbarch *gdbarch,
-				   CORE_ADDR pc, char *name)
+				   CORE_ADDR pc, const char *name)
 {
   return name && !strncmp (name, "@FIX", 4);
 }
Index: rx-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/rx-tdep.c,v
retrieving revision 1.7
diff -u -p -r1.7 rx-tdep.c
--- rx-tdep.c	4 Jan 2012 08:17:10 -0000	1.7
+++ rx-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -353,7 +353,7 @@ rx_analyze_prologue (CORE_ADDR start_pc,
 static CORE_ADDR
 rx_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
-  char *name;
+  const char *name;
   CORE_ADDR func_addr, func_end;
   struct rx_prologue p;
 
Index: skip.c
===================================================================
RCS file: /cvs/src/src/gdb/skip.c,v
retrieving revision 1.4
diff -u -p -r1.4 skip.c
--- skip.c	4 Jan 2012 08:17:11 -0000	1.4
+++ skip.c	2 Feb 2012 18:19:26 -0000
@@ -67,7 +67,7 @@ static void skip_file_command (char *arg
 static void skip_info (char *arg, int from_tty);
 
 static void add_skiplist_entry (struct skiplist_entry *e);
-static void skip_function_pc (CORE_ADDR pc, char *name,
+static void skip_function_pc (CORE_ADDR pc, const char *name,
 			      struct gdbarch *arch,
 			      int pending);
 
@@ -133,7 +133,7 @@ static void
 skip_function_command (char *arg, int from_tty)
 {
   CORE_ADDR func_pc;
-  char *name = NULL;
+  const char *name = NULL;
 
   /* Default to the current function if no argument is given.  */
   if (arg == 0)
@@ -397,7 +397,7 @@ skip_delete_command (char *arg, int from
    function name and add it to the list.  */
 
 static void
-skip_function_pc (CORE_ADDR pc, char *name, struct gdbarch *arch,
+skip_function_pc (CORE_ADDR pc, const char *name, struct gdbarch *arch,
 		  int pending)
 {
   struct skiplist_entry *e = XZALLOC (struct skiplist_entry);
@@ -524,7 +524,7 @@ skip_re_set (void)
 	      CORE_ADDR pc = sal.pc;
 	      CORE_ADDR func_start = 0;
 	      struct gdbarch *arch = get_sal_arch (sal);
-              char *func_name;
+              const char *func_name;
 
 	      if (find_pc_partial_function (pc, &func_name, &func_start, 0))
 		{
Index: sparc-sol2-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sparc-sol2-tdep.c,v
retrieving revision 1.27
diff -u -p -r1.27 sparc-sol2-tdep.c
--- sparc-sol2-tdep.c	4 Jan 2012 08:17:11 -0000	1.27
+++ sparc-sol2-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -66,7 +66,7 @@ const struct sparc_gregset sparc32_sol2_
    ignore this.  */
 
 int
-sparc_sol2_pc_in_sigtramp (CORE_ADDR pc, char *name)
+sparc_sol2_pc_in_sigtramp (CORE_ADDR pc, const char *name)
 {
   return (name && (strcmp (name, "sigacthandler") == 0
 		   || strcmp (name, "ucbsigvechandler") == 0
@@ -152,7 +152,7 @@ sparc32_sol2_sigtramp_frame_sniffer (con
 				     void **this_cache)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (sparc_sol2_pc_in_sigtramp (pc, name))
Index: sparc-tdep.h
===================================================================
RCS file: /cvs/src/src/gdb/sparc-tdep.h,v
retrieving revision 1.29
diff -u -p -r1.29 sparc-tdep.h
--- sparc-tdep.h	4 Jan 2012 08:17:12 -0000	1.29
+++ sparc-tdep.h	2 Feb 2012 18:19:26 -0000
@@ -215,7 +215,7 @@ extern void sparc32_collect_fpregset (co
 /* Register offsets for Solaris 2.  */
 extern const struct sparc_gregset sparc32_sol2_gregset;
 
-extern int sparc_sol2_pc_in_sigtramp (CORE_ADDR pc, char *name);
+extern int sparc_sol2_pc_in_sigtramp (CORE_ADDR pc, const char *name);
 
 extern char *sparc_sol2_static_transform_name (char *name);
 
Index: sparc64-sol2-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sparc64-sol2-tdep.c,v
retrieving revision 1.25
diff -u -p -r1.25 sparc64-sol2-tdep.c
--- sparc64-sol2-tdep.c	4 Jan 2012 08:17:12 -0000	1.25
+++ sparc64-sol2-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -130,7 +130,7 @@ sparc64_sol2_sigtramp_frame_sniffer (con
 				     void **this_cache)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (sparc_sol2_pc_in_sigtramp (pc, name))
Index: sparc64fbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sparc64fbsd-tdep.c,v
retrieving revision 1.23
diff -u -p -r1.23 sparc64fbsd-tdep.c
--- sparc64fbsd-tdep.c	4 Jan 2012 08:17:12 -0000	1.23
+++ sparc64fbsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -84,7 +84,7 @@ sparc64fbsd_collect_fpregset (const stru
 /* Signal trampolines.  */
 
 static int
-sparc64fbsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
+sparc64fbsd_pc_in_sigtramp (CORE_ADDR pc, const char *name)
 {
   return (name && strcmp (name, "__sigtramp") == 0);
 }
@@ -189,7 +189,7 @@ sparc64fbsd_sigtramp_frame_sniffer (cons
 				    void **this_cache)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (sparc64fbsd_pc_in_sigtramp (pc, name))
Index: sparc64nbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sparc64nbsd-tdep.c,v
retrieving revision 1.29
diff -u -p -r1.29 sparc64nbsd-tdep.c
--- sparc64nbsd-tdep.c	4 Jan 2012 08:17:12 -0000	1.29
+++ sparc64nbsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -79,7 +79,7 @@ static const CORE_ADDR sparc64nbsd_sigtr
 static const CORE_ADDR sparc64nbsd_sigtramp_end = 0xffffffffffffe000ULL;
 
 static int
-sparc64nbsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
+sparc64nbsd_pc_in_sigtramp (CORE_ADDR pc, const char *name)
 {
   if (pc >= sparc64nbsd_sigtramp_start && pc < sparc64nbsd_sigtramp_end)
     return 1;
@@ -214,7 +214,7 @@ sparc64nbsd_sigtramp_frame_sniffer (cons
 				    void **this_cache)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (sparc64nbsd_pc_in_sigtramp (pc, name))
Index: sparc64obsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sparc64obsd-tdep.c,v
retrieving revision 1.32
diff -u -p -r1.32 sparc64obsd-tdep.c
--- sparc64obsd-tdep.c	4 Jan 2012 08:17:12 -0000	1.32
+++ sparc64obsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -93,7 +93,7 @@ static const int sparc64obsd_sigreturn_o
 };
 
 static int
-sparc64obsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
+sparc64obsd_pc_in_sigtramp (CORE_ADDR pc, const char *name)
 {
   CORE_ADDR start_pc = (pc & ~(sparc64obsd_page_size - 1));
   unsigned long insn;
@@ -182,7 +182,7 @@ sparc64obsd_sigtramp_frame_sniffer (cons
 				    void **this_cache)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (sparc64obsd_pc_in_sigtramp (pc, name))
@@ -259,7 +259,7 @@ sparc64obsd_trapframe_sniffer (const str
 {
   CORE_ADDR pc;
   ULONGEST pstate;
-  char *name;
+  const char *name;
 
   /* Check whether we are in privileged mode, and bail out if we're not.  */
   pstate = get_frame_register_unsigned (this_frame, SPARC64_PSTATE_REGNUM);
Index: sparcnbsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sparcnbsd-tdep.c,v
retrieving revision 1.43
diff -u -p -r1.43 sparcnbsd-tdep.c
--- sparcnbsd-tdep.c	4 Jan 2012 08:17:12 -0000	1.43
+++ sparcnbsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -87,7 +87,7 @@ static const CORE_ADDR sparc32nbsd_sigtr
 static const CORE_ADDR sparc32nbsd_sigtramp_end = 0xeffffff0;
 
 static int
-sparc32nbsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
+sparc32nbsd_pc_in_sigtramp (CORE_ADDR pc, const char *name)
 {
   if (pc >= sparc32nbsd_sigtramp_start && pc < sparc32nbsd_sigtramp_end)
     return 1;
@@ -238,7 +238,7 @@ sparc32nbsd_sigcontext_frame_sniffer (co
 				      void **this_cache)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (sparc32nbsd_pc_in_sigtramp (pc, name))
Index: sparcobsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sparcobsd-tdep.c,v
retrieving revision 1.22
diff -u -p -r1.22 sparcobsd-tdep.c
--- sparcobsd-tdep.c	4 Jan 2012 08:17:12 -0000	1.22
+++ sparcobsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -47,7 +47,7 @@
 static const int sparc32obsd_page_size = 4096;
 
 static int
-sparc32obsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
+sparc32obsd_pc_in_sigtramp (CORE_ADDR pc, const char *name)
 {
   CORE_ADDR start_pc = (pc & ~(sparc32obsd_page_size - 1));
   unsigned long insn;
@@ -127,7 +127,7 @@ sparc32obsd_sigtramp_frame_sniffer (cons
 				    void **this_cache)
 {
   CORE_ADDR pc = get_frame_pc (this_frame);
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (sparc32obsd_pc_in_sigtramp (pc, name))
Index: symtab.h
===================================================================
RCS file: /cvs/src/src/gdb/symtab.h,v
retrieving revision 1.201
diff -u -p -r1.201 symtab.h
--- symtab.h	1 Feb 2012 16:10:31 -0000	1.201
+++ symtab.h	2 Feb 2012 18:19:26 -0000
@@ -952,14 +952,14 @@ extern struct symbol *find_pc_function (
 
 extern struct symbol *find_pc_sect_function (CORE_ADDR, struct obj_section *);
 
-extern int find_pc_partial_function_gnu_ifunc (CORE_ADDR pc, char **name,
+extern int find_pc_partial_function_gnu_ifunc (CORE_ADDR pc, const char **name,
 					       CORE_ADDR *address,
 					       CORE_ADDR *endaddr,
 					       int *is_gnu_ifunc_p);
 
 /* lookup function from address, return name, start addr and end addr.  */
 
-extern int find_pc_partial_function (CORE_ADDR, char **, CORE_ADDR *,
+extern int find_pc_partial_function (CORE_ADDR, const char **, CORE_ADDR *,
 				     CORE_ADDR *);
 
 extern void clear_pc_function_cache (void);
Index: vaxobsd-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/vaxobsd-tdep.c,v
retrieving revision 1.11
diff -u -p -r1.11 vaxobsd-tdep.c
--- vaxobsd-tdep.c	4 Jan 2012 08:27:58 -0000	1.11
+++ vaxobsd-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -65,7 +65,7 @@ vaxobsd_sigtramp_sniffer (const struct f
   CORE_ADDR start_pc = (pc & ~(vaxobsd_page_size - 1));
   CORE_ADDR sigreturn_addr = start_pc + vaxobsd_sigreturn_offset;
   gdb_byte *buf;
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (name)
Index: windows-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/windows-nat.c,v
retrieving revision 1.223
diff -u -p -r1.223 windows-nat.c
--- windows-nat.c	4 Jan 2012 08:27:58 -0000	1.223
+++ windows-nat.c	2 Feb 2012 18:19:26 -0000
@@ -1118,7 +1118,7 @@ handle_exception (struct target_waitstat
 	   cygwin later in the process and will be sent as a
 	   cygwin-specific-signal.  So, ignore SEGVs if they show up
 	   within the text segment of the DLL itself.  */
-	char *fn;
+	const char *fn;
 	CORE_ADDR addr = (CORE_ADDR) (uintptr_t)
 	  current_event.u.Exception.ExceptionRecord.ExceptionAddress;
 
Index: xstormy16-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/xstormy16-tdep.c,v
retrieving revision 1.116
diff -u -p -r1.116 xstormy16-tdep.c
--- xstormy16-tdep.c	4 Jan 2012 08:27:58 -0000	1.116
+++ xstormy16-tdep.c	2 Feb 2012 18:19:26 -0000
@@ -413,7 +413,7 @@ static CORE_ADDR
 xstormy16_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr = 0, func_end = 0;
-  char *func_name;
+  const char *func_name;
 
   if (find_pc_partial_function (pc, &func_name, &func_addr, &func_end))
     {
Index: cli/cli-cmds.c
===================================================================
RCS file: /cvs/src/src/gdb/cli/cli-cmds.c,v
retrieving revision 1.126
diff -u -p -r1.126 cli-cmds.c
--- cli/cli-cmds.c	28 Jan 2012 18:08:21 -0000	1.126
+++ cli/cli-cmds.c	2 Feb 2012 18:19:26 -0000
@@ -1097,7 +1097,7 @@ disassemble_current_function (int flags)
   struct frame_info *frame;
   struct gdbarch *gdbarch;
   CORE_ADDR low, high, pc;
-  char *name;
+  const char *name;
 
   frame = get_selected_frame (_("No frame selected."));
   gdbarch = get_frame_arch (frame);
@@ -1135,7 +1135,7 @@ disassemble_command (char *arg, int from
 {
   struct gdbarch *gdbarch = get_current_arch ();
   CORE_ADDR low, high;
-  char *name;
+  const char *name;
   CORE_ADDR pc;
   int flags;
 
Index: tui/tui-stack.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui-stack.c,v
retrieving revision 1.44
diff -u -p -r1.44 tui-stack.c
--- tui/tui-stack.c	4 Jan 2012 08:27:59 -0000	1.44
+++ tui/tui-stack.c	2 Feb 2012 18:19:26 -0000
@@ -378,7 +378,8 @@ tui_show_frame_info (struct frame_info *
 	    }
 	  else
 	    {
-	      if (find_pc_partial_function (get_frame_pc (fi), (char **) NULL,
+	      if (find_pc_partial_function (get_frame_pc (fi),
+					    (const char **) NULL,
 					    &low, (CORE_ADDR) 0) == 0)
 		{
 		  /* There is no symbol available for current PC.  There is no