Remove tdesc stuff. Remove FRAME_CHAIN_COMBINE from all tm-*.h files,

[deliverable/binutils-gdb.git] / gdb / tm-merlin.h

diff --git a/gdb/tm-merlin.h b/gdb/tm-merlin.h
index 3a4ac230e2b86bfa573a5de1ff6a05e726ffab6c..f782dd0ed6441e60e3283e0a75792d90bb19a889 100644 (file)
--- a/gdb/tm-merlin.h
+++ b/gdb/tm-merlin.h
@@ -210,12 +210,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* FRAME_CHAIN takes a frame's nominal address
    and produces the frame's chain-pointer.
 
-   FRAME_CHAIN_COMBINE takes the chain pointer and the frame's nominal address
-   and produces the nominal address of the caller frame.
-
    However, if FRAME_CHAIN_VALID returns zero,
-   it means the given frame is the outermost one and has no caller.
-   In that case, FRAME_CHAIN_COMBINE is not used.  */
+   it means the given frame is the outermost one and has no caller.  */
 
 /* In the case of the Merlin, the frame's nominal address is the FP value,
    and at that address is saved previous FP value as a 4-byte word.  */
@@ -228,8 +224,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define FRAME_CHAIN_VALID(chain, thisframe) \
   (chain != 0 && (outside_startup_file (FRAME_SAVED_PC (thisframe))))
 
-#define FRAME_CHAIN_COMBINE(chain, thisframe) (chain)
-
 /* Define other aspects of the stack frame.  */
 
 #define FRAME_SAVED_PC(FRAME) (read_memory_integer ((FRAME)->frame + 4, 4))