diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c33aac80745..df00489442f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-30  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	* config/rs6000/darwin.h (FRAME_POINTER_REGNUM): Rename to ...
+	(HARD_FRAME_POINTER_REGNUM): this.
+
 2005-06-30  Jan Hubicka  <jh@suse.cz>
 
 	* ipa-inline.c (cgraph_clone_inlined_nodes): Revert previous patch.
diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h
index f4f10c127de..a315a242dfd 100644
--- a/gcc/config/rs6000/darwin.h
+++ b/gcc/config/rs6000/darwin.h
@@ -151,8 +151,8 @@ do {									\
 
 /* Base register for access to local variables of the function.  */
 
-#undef  FRAME_POINTER_REGNUM
-#define FRAME_POINTER_REGNUM 30
+#undef  HARD_FRAME_POINTER_REGNUM
+#define HARD_FRAME_POINTER_REGNUM 30
 
 #undef  RS6000_PIC_OFFSET_TABLE_REGNUM
 #define RS6000_PIC_OFFSET_TABLE_REGNUM 31