* xcoffread.c (read_symbol_nvalue): Return CORE_ADDR.

	* rs6000-tdep.c (rs6000_pop_frame): Make addr CORE_ADDR type.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d438dda..88c921a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-07  David Edelsohn  <edelsohn@gnu.org>
+
+       * xcoffread.c (read_symbol_nvalue): Return CORE_ADDR.
+       * rs6000-tdep.c (rs6000_pop_frame): Make addr CORE_ADDR type.
+
 Fri Jul  7 18:29:51 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
        * config/mips/tm-mips.h (IEEE_FLOAT, SKIP_PROLOGUE,

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 6b22074..f61074b 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -687,10 +687,10 @@ extern int stop_stack_dummy;
 static void
 rs6000_pop_frame (void)
 {
-  CORE_ADDR pc, lr, sp, prev_sp;       /* %pc, %lr, %sp */
+  CORE_ADDR pc, lr, sp, prev_sp, addr; /* %pc, %lr, %sp */
   struct rs6000_framedata fdata;
   struct frame_info *frame = get_current_frame ();
-  int addr, ii, wordsize;
+  int ii, wordsize;
 
   pc = read_pc ();
   sp = FRAME_FP (frame);

diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 8fe39f1..00b99d5 100644 (file)
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -226,7 +226,7 @@ static void read_symbol (struct internal_syment *, int);
 
 static int read_symbol_lineno (int);
 
-static int read_symbol_nvalue (int);
+static CORE_ADDR read_symbol_nvalue (int);
 
 static struct symbol *process_xcoff_symbol (struct coff_symbol *,
                                            struct objfile *);
@@ -1673,7 +1673,7 @@ read_symbol (symbol, symno)
 
 /* Get value corresponding to symbol number symno in symtbl.  */
 
-static int
+static CORE_ADDR
 read_symbol_nvalue (symno)
      int symno;
 {