diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0f115d7368e..3ac95695f2c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2004-09-03  Andrew Cagney  <cagney@gnu.org>
 
+	* mips-tdep.c (PROC_DESC_IS_DUMMY, SET_PROC_DESC_IS_DUMMY)
+	(_PROC_MAGIC_, after_prologue, mips_dump_tdep): Delete macros and
+	only use.
+
 	* mips-tdep.c (temp_saved_regs): Delete.
 	(set_reg_offset): Replace saved_regs parameter with this_cache.
 	(heuristic_proc_desc, mips16_heuristic_proc_desc)
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index f17c3e4a191..3ba88772d1d 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -654,8 +654,6 @@ static unsigned int heuristic_fence_post = 0;
    this will corrupt pdr.iline.  Fortunately we don't use it.  */
 #define PROC_SYMBOL(proc) (*(struct symbol**)&(proc)->pdr.isym)
 #define _PROC_MAGIC_ 0x0F0F0F0F
-#define PROC_DESC_IS_DUMMY(proc) ((proc)->pdr.isym == _PROC_MAGIC_)
-#define SET_PROC_DESC_IS_DUMMY(proc) ((proc)->pdr.isym = _PROC_MAGIC_)
 
 /* Number of bytes of storage in the actual machine representation for
    register N.  NOTE: This defines the pseudo register type so need to
@@ -901,16 +899,14 @@ after_prologue (CORE_ADDR pc)
 	 THEN create a "heuristic" proc_desc (by analyzing the actual
 	 code) to replace the "official" proc_desc.  */
       struct symtab_and_line val;
-      struct symbol *proc_symbol =
-	PROC_DESC_IS_DUMMY (proc_desc) ? 0 : PROC_SYMBOL (proc_desc);
-
-      if (proc_symbol)
+      if (PROC_SYMBOL (proc_desc))
 	{
 	  val = find_pc_line (BLOCK_START
-			      (SYMBOL_BLOCK_VALUE (proc_symbol)), 0);
+			      (SYMBOL_BLOCK_VALUE (PROC_SYMBOL (proc_desc))),
+			      0);
 	  val.pc = val.end ? val.end : pc;
 	}
-      if (!proc_symbol || pc < val.pc)
+      if (!PROC_SYMBOL (proc_desc) || pc < val.pc)
 	{
 	  mips_extra_func_info_t found_heuristic =
 	    heuristic_proc_desc (PROC_LOW_ADDR (proc_desc), pc, NULL, NULL);
@@ -6549,8 +6545,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
 		      mips_abi_regsize (current_gdbarch));
   fprintf_unfiltered (file,
 		      "mips_dump_tdep: PRID_REGNUM = %d\n", PRID_REGNUM);
-  fprintf_unfiltered (file,
-		      "mips_dump_tdep: PROC_DESC_IS_DUMMY = function?\n");
   fprintf_unfiltered (file,
 		      "mips_dump_tdep: PROC_FRAME_ADJUST = function?\n");
   fprintf_unfiltered (file,
@@ -6579,8 +6573,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
   fprintf_unfiltered (file,
 		      "mips_dump_tdep: SETUP_ARBITRARY_FRAME # %s\n",
 		      XSTRING (SETUP_ARBITRARY_FRAME (NUMARGS, ARGS)));
-  fprintf_unfiltered (file,
-		      "mips_dump_tdep: SET_PROC_DESC_IS_DUMMY = function?\n");
   fprintf_unfiltered (file,
 		      "mips_dump_tdep: SKIP_TRAMPOLINE_CODE # %s\n",
 		      XSTRING (SKIP_TRAMPOLINE_CODE (PC)));
@@ -6646,8 +6638,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
 		      (long) VM_MIN_ADDRESS);
   fprintf_unfiltered (file,
 		      "mips_dump_tdep: ZERO_REGNUM = %d\n", ZERO_REGNUM);
-  fprintf_unfiltered (file,
-		      "mips_dump_tdep: _PROC_MAGIC_ = %d\n", _PROC_MAGIC_);
 }
 
 extern initialize_file_ftype _initialize_mips_tdep;	/* -Wmissing-prototypes */