diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 37a8e73974c..506029cd118 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-07  Thiemo Seufer  <ths@mips.com>
+
+	* sim-base.h (text_start, text_end, start_addr): Use bfd_vma type
+	for bfd text addresses.
+
 2006-08-29  Thiemo Seufer  <ths@mips.com>
             Nigel Stephens  <nigel@mips.com>
 
diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index fde98470bc8..831768bda90 100644
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@@ -181,13 +181,13 @@ typedef struct {
   /* The program's text section.  */
   struct bfd_section *text_section;
   /* Starting and ending text section addresses from the bfd.  */
-  SIM_ADDR text_start, text_end;
+  bfd_vma text_start, text_end;
 #define STATE_TEXT_SECTION(sd) ((sd)->base.text_section)
 #define STATE_TEXT_START(sd) ((sd)->base.text_start)
 #define STATE_TEXT_END(sd) ((sd)->base.text_end)
 
   /* Start address, set when the program is loaded from the bfd.  */
-  SIM_ADDR start_addr;
+  bfd_vma start_addr;
 #define STATE_START_ADDR(sd) ((sd)->base.start_addr)
 
   /* Size of the simulator's cache, if any.