diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d453520855..68d8d87228 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-06  Andrew Cagney  <ac131313@redhat.com>
+
+	* blockframe.c (get_prev_frame): Replace #ifdef
+	INIT_EXTRA_FRAME_INFO with run-time test.
+
 2001-11-05  Andrew Cagney  <ac131313@redhat.com>
 
 	* gdbarch.sh (push_return_address): Change to a function with
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index 1c6ec2c2d3..78331ce9c0 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -437,9 +437,8 @@ get_prev_frame (struct frame_info *next_frame)
 
   INIT_FRAME_PC_FIRST (fromleaf, prev);
 
-#ifdef INIT_EXTRA_FRAME_INFO
-  INIT_EXTRA_FRAME_INFO (fromleaf, prev);
-#endif
+  if (INIT_EXTRA_FRAME_INFO_P ())
+    INIT_EXTRA_FRAME_INFO (fromleaf, prev);
 
   /* This entry is in the frame queue now, which is good since
      FRAME_SAVED_PC may use that queue to figure out its value