From 6093d2eb3a94fe7f15abaec2ad363cffd46aa8cd Mon Sep 17 00:00:00 2001
From: Markus Deuling <deuling@de.ibm.com>
Date: Fri, 11 Jan 2008 13:20:02 +0000
Subject: [PATCH] 	* gdbarch.sh (skip_prologue): Add gdbarch 	as
 parameter. 	* gdbarch.{c,h}: Regenerate.

	* alpha-tdep.c (alpha_skip_prologue): Add gdbarch as parameter.
	* amd64-tdep.c (amd64_skip_prologue): Likewise.
	* avr-tdep.c (avr_skip_prologue): Likewise.
	* cris-tdep.c (cris_skip_prologue): Likewise.
	* frv-tdep.c (frv_skip_prologue): Likewise.
	* h8300-tdep.c (h8300_skip_prologue): Likewise.
	* hppa-tdep.c (hppa_skip_prologue): Likewise.
	* i386-tdep.c (i386_skip_prologue): Likewise.
	* ia64-tdep.c (ia64_skip_prologue): Likewise.
	* iq2000-tdep.c (iq2000_skip_prologue): Likewise.
	* m32r-tdep.c (m32r_skip_prologue): Likewise.
	* m68hc11-tdep.c (m68hc11_skip_prologue): Likewise.
	* m68k-tdep.c (m68k_skip_prologue): Likewise.
	* m88k-tdep.c (m88k_skip_prologue): Likewise.
	* mep-tdep.c (mep_skip_prologue): Likewise.
	* mips-tdep.c (mips_skip_prologue): Likewise.
	* mn10300-tdep.c (mn10300_skip_prologue): Likewise.
	* mt-tdep.c (mt_skip_prologue): Likewise.
	* rs6000-tdep.c (rs6000_skip_prologue): Likewise.
	* score-tdep.c (score_skip_prologue): Likewise.
	* sh64-tdep.c (sh64_skip_prologue): Likewise.
	* sh-tdep.c (sh_skip_prologue): Likewise.
	* sparc64-tdep.c (sparc64_skip_prologue): Likewise.
	* sparc-tdep.c (sparc32_skip_prologue): Likewise.
	* spu-tdep.c (spu_skip_prologue): Likewise.
	* v850-tdep.c (v850_skip_prologue): Likewise.
	* vax-tdep.c (vax_skip_prologue): Likewise.
	* xstormy16-tdep.c (xstormy16_skip_prologue): Likewise.
	* xtensa-tdep.c (xtensa_skip_prologue): Likewise.

	* arm-tdep.c (arm_skip_prologue): Add gdbarch as parameter. Replace
	current_gdbarch by gdbarch.
	* m32c-tdep.c (m32c_skip_prologue): Likewise.
	* s390-tdep.c (s390_skip_prologue): Likewise.
---
 gdb/ChangeLog        | 41 +++++++++++++++++++++++++++++++++++++++++
 gdb/alpha-tdep.c     |  2 +-
 gdb/amd64-tdep.c     |  2 +-
 gdb/arm-tdep.c       |  4 ++--
 gdb/avr-tdep.c       |  2 +-
 gdb/cris-tdep.c      |  2 +-
 gdb/frv-tdep.c       |  2 +-
 gdb/gdbarch.c        |  2 +-
 gdb/gdbarch.h        |  2 +-
 gdb/gdbarch.sh       |  2 +-
 gdb/h8300-tdep.c     |  2 +-
 gdb/hppa-tdep.c      |  2 +-
 gdb/i386-tdep.c      |  2 +-
 gdb/ia64-tdep.c      |  2 +-
 gdb/iq2000-tdep.c    |  2 +-
 gdb/m32c-tdep.c      |  4 ++--
 gdb/m32r-tdep.c      |  2 +-
 gdb/m68hc11-tdep.c   |  2 +-
 gdb/m68k-tdep.c      |  2 +-
 gdb/m88k-tdep.c      |  2 +-
 gdb/mep-tdep.c       |  2 +-
 gdb/mips-tdep.c      |  2 +-
 gdb/mn10300-tdep.c   |  2 +-
 gdb/mt-tdep.c        |  2 +-
 gdb/rs6000-tdep.c    |  2 +-
 gdb/s390-tdep.c      |  4 ++--
 gdb/score-tdep.c     |  2 +-
 gdb/sh-tdep.c        |  2 +-
 gdb/sh64-tdep.c      |  2 +-
 gdb/sparc-tdep.c     |  2 +-
 gdb/sparc64-tdep.c   |  2 +-
 gdb/spu-tdep.c       |  2 +-
 gdb/v850-tdep.c      |  2 +-
 gdb/vax-tdep.c       |  2 +-
 gdb/xstormy16-tdep.c |  2 +-
 gdb/xtensa-tdep.c    |  2 +-
 36 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dd31e8f495..b1b234165c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,44 @@
+2008-01-11  Markus Deuling  <deuling@de.ibm.com>
+
+	* gdbarch.sh (skip_prologue): Add gdbarch
+	as parameter.
+	* gdbarch.{c,h}: Regenerate.
+
+	* alpha-tdep.c (alpha_skip_prologue): Add gdbarch as parameter.
+	* amd64-tdep.c (amd64_skip_prologue): Likewise.
+	* avr-tdep.c (avr_skip_prologue): Likewise.
+	* cris-tdep.c (cris_skip_prologue): Likewise.
+	* frv-tdep.c (frv_skip_prologue): Likewise.
+	* h8300-tdep.c (h8300_skip_prologue): Likewise.
+	* hppa-tdep.c (hppa_skip_prologue): Likewise.
+	* i386-tdep.c (i386_skip_prologue): Likewise.
+	* ia64-tdep.c (ia64_skip_prologue): Likewise.
+	* iq2000-tdep.c (iq2000_skip_prologue): Likewise.
+	* m32r-tdep.c (m32r_skip_prologue): Likewise.
+	* m68hc11-tdep.c (m68hc11_skip_prologue): Likewise.
+	* m68k-tdep.c (m68k_skip_prologue): Likewise.
+	* m88k-tdep.c (m88k_skip_prologue): Likewise.
+	* mep-tdep.c (mep_skip_prologue): Likewise.
+	* mips-tdep.c (mips_skip_prologue): Likewise.
+	* mn10300-tdep.c (mn10300_skip_prologue): Likewise.
+	* mt-tdep.c (mt_skip_prologue): Likewise.
+	* rs6000-tdep.c (rs6000_skip_prologue): Likewise.
+	* score-tdep.c (score_skip_prologue): Likewise.
+	* sh64-tdep.c (sh64_skip_prologue): Likewise.
+	* sh-tdep.c (sh_skip_prologue): Likewise.
+	* sparc64-tdep.c (sparc64_skip_prologue): Likewise.
+	* sparc-tdep.c (sparc32_skip_prologue): Likewise.
+	* spu-tdep.c (spu_skip_prologue): Likewise.
+	* v850-tdep.c (v850_skip_prologue): Likewise.
+	* vax-tdep.c (vax_skip_prologue): Likewise.
+	* xstormy16-tdep.c (xstormy16_skip_prologue): Likewise.
+	* xtensa-tdep.c (xtensa_skip_prologue): Likewise.
+
+	* arm-tdep.c (arm_skip_prologue): Add gdbarch as parameter. Replace
+	current_gdbarch by gdbarch.
+	* m32c-tdep.c (m32c_skip_prologue): Likewise.
+	* s390-tdep.c (s390_skip_prologue): Likewise.
+
 2008-01-10  Doug Evans  <dje@google.com>
 
 	* defs.h (struct continuation_arg): Fix typo in comment.
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 29e9b67715..7d0eee96e6 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -651,7 +651,7 @@ alpha_read_insn (CORE_ADDR pc)
    anything which might clobber the registers which are being saved.  */
 
 static CORE_ADDR
-alpha_skip_prologue (CORE_ADDR pc)
+alpha_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   unsigned long inst;
   int offset;
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index f17e1ddda1..86423f7cbc 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -766,7 +766,7 @@ amd64_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
 /* Return PC of first real instruction.  */
 
 static CORE_ADDR
-amd64_skip_prologue (CORE_ADDR start_pc)
+amd64_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR start_pc)
 {
   struct amd64_frame_cache cache;
   CORE_ADDR pc;
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 2991ee7ec3..228b972394 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -411,7 +411,7 @@ thumb_analyze_prologue (struct gdbarch *gdbarch,
    sub fp, ip, #nn @@ nn == 20 or 4 depending on second insn */
 
 static CORE_ADDR
-arm_skip_prologue (CORE_ADDR pc)
+arm_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   unsigned long inst;
   CORE_ADDR skip_pc;
@@ -449,7 +449,7 @@ arm_skip_prologue (CORE_ADDR pc)
 
   /* Check if this is Thumb code.  */
   if (arm_pc_is_thumb (pc))
-    return thumb_analyze_prologue (current_gdbarch, pc, func_end, NULL);
+    return thumb_analyze_prologue (gdbarch, pc, func_end, NULL);
 
   for (skip_pc = pc; skip_pc < func_end; skip_pc += 4)
     {
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 9e1b90a01f..46c62584d3 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -744,7 +744,7 @@ avr_scan_prologue (CORE_ADDR pc, struct avr_unwind_cache *info)
 }
 
 static CORE_ADDR
-avr_skip_prologue (CORE_ADDR pc)
+avr_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr, func_end;
   CORE_ADDR prologue_end = pc;
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index eaacd188fe..5888a1b73c 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -1442,7 +1442,7 @@ crisv32_scan_prologue (CORE_ADDR pc, struct frame_info *next_frame,
    of the first instruction after the function prologue.  */
 
 static CORE_ADDR
-cris_skip_prologue (CORE_ADDR pc)
+cris_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr, func_end;
   struct symtab_and_line sal;
diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index 8a96b9fea5..d025399ad3 100644
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -968,7 +968,7 @@ frv_analyze_prologue (CORE_ADDR pc, struct frame_info *next_frame,
 
 
 static CORE_ADDR
-frv_skip_prologue (CORE_ADDR pc)
+frv_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr, func_end, new_pc;
 
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 1f3afdd415..90e3f47c42 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -2040,7 +2040,7 @@ gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip)
   gdb_assert (gdbarch->skip_prologue != NULL);
   if (gdbarch_debug >= 2)
     fprintf_unfiltered (gdb_stdlog, "gdbarch_skip_prologue called\n");
-  return gdbarch->skip_prologue (ip);
+  return gdbarch->skip_prologue (gdbarch, ip);
 }
 
 void
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index da5d617298..ebb8c60995 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -364,7 +364,7 @@ typedef enum return_value_convention (gdbarch_return_value_ftype) (struct gdbarc
 extern enum return_value_convention gdbarch_return_value (struct gdbarch *gdbarch, struct type *valtype, struct regcache *regcache, gdb_byte *readbuf, const gdb_byte *writebuf);
 extern void set_gdbarch_return_value (struct gdbarch *gdbarch, gdbarch_return_value_ftype *return_value);
 
-typedef CORE_ADDR (gdbarch_skip_prologue_ftype) (CORE_ADDR ip);
+typedef CORE_ADDR (gdbarch_skip_prologue_ftype) (struct gdbarch *gdbarch, CORE_ADDR ip);
 extern CORE_ADDR gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip);
 extern void set_gdbarch_skip_prologue (struct gdbarch *gdbarch, gdbarch_skip_prologue_ftype *skip_prologue);
 
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 83bdf22477..92b2316033 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -471,7 +471,7 @@ M:CORE_ADDR:integer_to_address:struct type *type, const gdb_byte *buf:type, buf
 
 M:enum return_value_convention:return_value:struct type *valtype, struct regcache *regcache, gdb_byte *readbuf, const gdb_byte *writebuf:valtype, regcache, readbuf, writebuf
 
-f:CORE_ADDR:skip_prologue:CORE_ADDR ip:ip:0:0
+m:CORE_ADDR:skip_prologue:CORE_ADDR ip:ip:0:0
 f:int:inner_than:CORE_ADDR lhs, CORE_ADDR rhs:lhs, rhs:0:0
 m:const gdb_byte *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr::0:
 M:CORE_ADDR:adjust_breakpoint_address:CORE_ADDR bpaddr:bpaddr
diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index 325fbedf90..9bc61c5281 100644
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -564,7 +564,7 @@ static const struct frame_base h8300_frame_base = {
 };
 
 static CORE_ADDR
-h8300_skip_prologue (CORE_ADDR pc)
+h8300_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr = 0 , func_end = 0;
 
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 69b388f823..b9791dea84 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -1759,7 +1759,7 @@ after_prologue (CORE_ADDR pc)
    skip over the branch in that case.  */
 
 static CORE_ADDR
-hppa_skip_prologue (CORE_ADDR pc)
+hppa_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   unsigned long inst;
   int offset;
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index d56862b1cf..c88fb25460 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -828,7 +828,7 @@ i386_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
 /* Return PC of first real instruction.  */
 
 static CORE_ADDR
-i386_skip_prologue (CORE_ADDR start_pc)
+i386_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR start_pc)
 {
   static gdb_byte pic_pat[6] =
   {
diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index 674940064f..fb47cbacaf 100644
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -1512,7 +1512,7 @@ examine_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, struct frame_info *next_frame,
 }
 
 CORE_ADDR
-ia64_skip_prologue (CORE_ADDR pc)
+ia64_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   struct ia64_frame_cache cache;
   cache.base = 0;
diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
index fcb32d4748..e5b558eda6 100644
--- a/gdb/iq2000-tdep.c
+++ b/gdb/iq2000-tdep.c
@@ -331,7 +331,7 @@ iq2000_init_frame_cache (struct iq2000_frame_cache *cache)
    stepped into a function call.  */
 
 static CORE_ADDR
-iq2000_skip_prologue (CORE_ADDR pc)
+iq2000_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr = 0 , func_end = 0;
 
diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c
index 5a0c8579ce..e68e9fec9d 100644
--- a/gdb/m32c-tdep.c
+++ b/gdb/m32c-tdep.c
@@ -1803,7 +1803,7 @@ m32c_analyze_prologue (struct gdbarch *arch,
 
 
 static CORE_ADDR
-m32c_skip_prologue (CORE_ADDR ip)
+m32c_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip)
 {
   char *name;
   CORE_ADDR func_addr, func_end, sal_end;
@@ -1814,7 +1814,7 @@ m32c_skip_prologue (CORE_ADDR ip)
     return ip;
 
   /* Find end by prologue analysis.  */
-  m32c_analyze_prologue (current_gdbarch, ip, func_end, &p);
+  m32c_analyze_prologue (gdbarch, ip, func_end, &p);
   /* Find end by line info.  */
   sal_end = skip_prologue_using_sal (ip);
   /* Return whichever is lower.  */
diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index 97b716fdfb..714a98cff3 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -448,7 +448,7 @@ decode_prologue (CORE_ADDR start_pc, CORE_ADDR scan_limit,
 #define DEFAULT_SEARCH_LIMIT 128
 
 CORE_ADDR
-m32r_skip_prologue (CORE_ADDR pc)
+m32r_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr, func_end;
   struct symtab_and_line sal;
diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index 0869de5c66..b85cb8f4ba 100644
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -739,7 +739,7 @@ m68hc11_scan_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
 }
 
 static CORE_ADDR
-m68hc11_skip_prologue (CORE_ADDR pc)
+m68hc11_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr, func_end;
   struct symtab_and_line sal;
diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c
index a42f699d74..1eed9295c3 100644
--- a/gdb/m68k-tdep.c
+++ b/gdb/m68k-tdep.c
@@ -812,7 +812,7 @@ m68k_analyze_prologue (CORE_ADDR pc, CORE_ADDR current_pc,
 /* Return PC of first real instruction.  */
 
 static CORE_ADDR
-m68k_skip_prologue (CORE_ADDR start_pc)
+m68k_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR start_pc)
 {
   struct m68k_frame_cache cache;
   CORE_ADDR pc;
diff --git a/gdb/m88k-tdep.c b/gdb/m88k-tdep.c
index 3dfa76e0a8..9b717794dd 100644
--- a/gdb/m88k-tdep.c
+++ b/gdb/m88k-tdep.c
@@ -626,7 +626,7 @@ const int m88k_max_prologue_size = 128 * M88K_INSN_SIZE;
    starting at PC.  */
 
 static CORE_ADDR
-m88k_skip_prologue (CORE_ADDR pc)
+m88k_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   struct symtab_and_line sal;
   CORE_ADDR func_start, func_end;
diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index bd4704e044..57f2415f17 100644
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -1894,7 +1894,7 @@ mep_analyze_prologue (CORE_ADDR start_pc, CORE_ADDR limit_pc,
 
 
 static CORE_ADDR
-mep_skip_prologue (CORE_ADDR pc)
+mep_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   char *name;
   CORE_ADDR func_addr, func_end;
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 7685bf744c..7e94f20864 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -4583,7 +4583,7 @@ mips_single_step_through_delay (struct gdbarch *gdbarch,
    delay slot of a non-prologue instruction).  */
 
 static CORE_ADDR
-mips_skip_prologue (CORE_ADDR pc)
+mips_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR limit_pc;
   CORE_ADDR func_addr;
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index 91a1d4ffa2..9fcae8a956 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -826,7 +826,7 @@ mn10300_analyze_prologue (struct frame_info *fi,
    Return the address of the first inst past the prologue of the function.  */
 
 static CORE_ADDR
-mn10300_skip_prologue (CORE_ADDR pc)
+mn10300_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   return mn10300_analyze_prologue (NULL, NULL, pc);
 }
diff --git a/gdb/mt-tdep.c b/gdb/mt-tdep.c
index 9565e617d3..a3098b25be 100644
--- a/gdb/mt-tdep.c
+++ b/gdb/mt-tdep.c
@@ -398,7 +398,7 @@ mt_return_value (struct gdbarch *gdbarch, struct type *type,
    call.  */
 
 static CORE_ADDR
-mt_skip_prologue (CORE_ADDR pc)
+mt_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr = 0, func_end = 0;
   char *func_name;
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index aee5ea9b2a..c5122e3366 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -754,7 +754,7 @@ read_memory_addr (CORE_ADDR memaddr, int len)
 }
 
 static CORE_ADDR
-rs6000_skip_prologue (CORE_ADDR pc)
+rs6000_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   struct rs6000_framedata frame;
   CORE_ADDR limit_pc, func_addr;
diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index 8fcceb59df..b448b2291b 100644
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -1093,11 +1093,11 @@ s390_analyze_prologue (struct gdbarch *gdbarch,
 /* Advance PC across any function entry prologue instructions to reach 
    some "real" code.  */
 static CORE_ADDR
-s390_skip_prologue (CORE_ADDR pc)
+s390_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   struct s390_prologue_data data;
   CORE_ADDR skip_pc;
-  skip_pc = s390_analyze_prologue (current_gdbarch, pc, (CORE_ADDR)-1, &data);
+  skip_pc = s390_analyze_prologue (gdbarch, pc, (CORE_ADDR)-1, &data);
   return skip_pc ? skip_pc : pc;
 }
 
diff --git a/gdb/score-tdep.c b/gdb/score-tdep.c
index 41828ce5af..f691753a80 100644
--- a/gdb/score-tdep.c
+++ b/gdb/score-tdep.c
@@ -680,7 +680,7 @@ score_fetch_inst (CORE_ADDR addr, char *memblock)
 }
 
 static CORE_ADDR
-score_skip_prologue (CORE_ADDR pc)
+score_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR cpc = pc;
   int iscan = 32, stack_sub = 0;
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index b3447a59f4..6aeb0e854c 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -710,7 +710,7 @@ after_prologue (CORE_ADDR pc)
 }
 
 static CORE_ADDR
-sh_skip_prologue (CORE_ADDR start_pc)
+sh_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR start_pc)
 {
   CORE_ADDR pc;
   struct sh_frame_cache cache;
diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c
index ec5a674731..d4d93d6491 100644
--- a/gdb/sh64-tdep.c
+++ b/gdb/sh64-tdep.c
@@ -651,7 +651,7 @@ sh64_skip_prologue_hard_way (CORE_ADDR start_pc)
 }
 
 static CORE_ADDR
-sh64_skip_prologue (CORE_ADDR pc)
+sh64_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR post_prologue_pc;
 
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index ae1bf7995e..27514fa07a 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -778,7 +778,7 @@ sparc_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame)
    START_PC.  */
 
 static CORE_ADDR
-sparc32_skip_prologue (CORE_ADDR start_pc)
+sparc32_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR start_pc)
 {
   struct symtab_and_line sal;
   CORE_ADDR func_start, func_end;
diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index 14558d6a3b..2d9c8e36a3 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -411,7 +411,7 @@ sparc64_pseudo_register_write (struct gdbarch *gdbarch,
    START_PC.  */
 
 static CORE_ADDR
-sparc64_skip_prologue (CORE_ADDR start_pc)
+sparc64_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR start_pc)
 {
   struct symtab_and_line sal;
   CORE_ADDR func_start, func_end;
diff --git a/gdb/spu-tdep.c b/gdb/spu-tdep.c
index e7e5fdd1f2..9fcb118592 100644
--- a/gdb/spu-tdep.c
+++ b/gdb/spu-tdep.c
@@ -700,7 +700,7 @@ spu_analyze_prologue (CORE_ADDR start_pc, CORE_ADDR end_pc,
 
 /* Return the first instruction after the prologue starting at PC.  */
 static CORE_ADDR
-spu_skip_prologue (CORE_ADDR pc)
+spu_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   struct spu_prologue_data data;
   return spu_analyze_prologue (pc, (CORE_ADDR)-1, &data);
diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
index bda8bb9b67..2891d1ac8d 100644
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -621,7 +621,7 @@ v850_analyze_prologue (CORE_ADDR func_addr, CORE_ADDR pc,
 /* Return the address of the first code past the prologue of the function.  */
 
 static CORE_ADDR
-v850_skip_prologue (CORE_ADDR pc)
+v850_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr, func_end;
 
diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
index 00d44d1d96..cd396458b0 100644
--- a/gdb/vax-tdep.c
+++ b/gdb/vax-tdep.c
@@ -267,7 +267,7 @@ vax_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pc, int *len)
    to reach some "real" code.  */
 
 static CORE_ADDR
-vax_skip_prologue (CORE_ADDR pc)
+vax_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   gdb_byte op = read_memory_unsigned_integer (pc, 1);
 
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 30dee9346c..78173cf913 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -404,7 +404,7 @@ xstormy16_analyze_prologue (CORE_ADDR start_addr, CORE_ADDR end_addr,
    stepped into a function call.  */
 
 static CORE_ADDR
-xstormy16_skip_prologue (CORE_ADDR pc)
+xstormy16_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   CORE_ADDR func_addr = 0, func_end = 0;
   char *func_name;
diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index 13c76a5dc9..d52addfd7d 100644
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -2396,7 +2396,7 @@ call0_frame_cache (struct frame_info *next_frame,
 /* #define DONT_SKIP_PROLOGUE  */
 
 CORE_ADDR
-xtensa_skip_prologue (CORE_ADDR start_pc)
+xtensa_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR start_pc)
 {
   struct symtab_and_line prologue_sal;
   CORE_ADDR body_pc;
-- 
2.34.1