diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f9eb986d04..ce4a621c06 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-22  Andrew Cagney  <cagney@redhat.com>
 
+	* frame-unwind.c (frame_unwind_find_by_frame): Add legacy_frame_p
+	to predicates for "seriously old code".
+
 	* hppa-tdep.c (hppa_gdbarch_init): Convert compile time #if0s into
 	runtime if(0).
 
diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index fc5a82122e..82eaf7c0ae 100644
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -74,7 +74,7 @@ frame_unwind_find_by_frame (struct frame_info *next_frame)
   int i;
   struct gdbarch *gdbarch = get_frame_arch (next_frame);
   struct frame_unwind_table *table = gdbarch_data (gdbarch, frame_unwind_data);
-  if (!DEPRECATED_USE_GENERIC_DUMMY_FRAMES)
+  if (!DEPRECATED_USE_GENERIC_DUMMY_FRAMES && legacy_frame_p (gdbarch))
     /* Seriously old code.  Don't even try to use this new mechanism.
        (Note: The variable USE_GENERIC_DUMMY_FRAMES is deprecated, not
        the dummy frame mechanism.  All architectures should be using