diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2dc768dbf07..4b99681681c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-07  Richard Henderson  <rth@redhat.com>
+
+	* unwind-dw2.c (_Unwind_GetGR): Cast pointer to _Unwind_Ptr,
+	not _Unwind_Word.
+
 2003-05-07  Zack Weinberg  <zack@codesourcery.com>
 
 	* stmt.c (force_label_rtx): New function, based on logic
diff --git a/gcc/unwind-dw2.c b/gcc/unwind-dw2.c
index 5a26d0b630e..f752ffe0f45 100644
--- a/gcc/unwind-dw2.c
+++ b/gcc/unwind-dw2.c
@@ -178,7 +178,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
 _Unwind_Word
 _Unwind_GetCFA (struct _Unwind_Context *context)
 {
-  return (_Unwind_Word)context->cfa;
+  return (_Unwind_Ptr) context->cfa;
 }
 
 /* Overwrite the saved value for register REG in CONTEXT with VAL.  */