diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4b656728f9..4b1d31ea7c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-31  Stan Shebs  <stan@codesourcery.com>
+
+	* coffread.c (coff_symtab_read): Remove FUNCTION_EPILOGUE_SIZE.
+
 2008-07-30  Stan Shebs  <stan@codesourcery.com>
 
 	* objfiles.c (TARGET_KEEP_SECTION): Remove.
diff --git a/gdb/coffread.c b/gdb/coffread.c
index e36b2f10c7..e6cc38951a 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -1026,22 +1026,9 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 
 	      finish_block (new->name, &local_symbols, new->old_blocks,
 			    new->start_addr,
-#if defined (FUNCTION_EPILOGUE_SIZE)
-	      /* This macro should be defined only on
-	         machines where the
-	         fcn_aux_saved.x_sym.x_misc.x_fsize
-	         field is always zero.
-	         So use the .bf record information that
-	         points to the epilogue and add the size
-	         of the epilogue.  */
-			    cs->c_value
-			    + FUNCTION_EPILOGUE_SIZE
-			    + ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)),
-#else
 			    fcn_cs_saved.c_value
 			    + fcn_aux_saved.x_sym.x_misc.x_fsize
 			    + ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)),
-#endif
 			    objfile
 		);
 	      within_function = 0;
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 6865945bf4..f56476ea8f 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-31  Stan Shebs  <stan@codesourcery.com>
+
+	* gdbint.texinfo: Remove FUNCTION_EPILOGUE_SIZE.
+
 2008-07-29  Stan Shebs  <stan@codesourcery.com>
 
 	* gdbint.texinfo: General round of cleanup and minor
diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
index 3bb816f387..23e3d250f7 100644
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -3657,13 +3657,6 @@ return gdbarch_addr_bits_remove (gdbarch, sp);
 @noindent
 @xref{TARGET_READ_SP}, which this method replaces.
 
-@item FUNCTION_EPILOGUE_SIZE
-@findex FUNCTION_EPILOGUE_SIZE
-For some COFF targets, the @code{x_sym.x_misc.x_fsize} field of the
-function end symbol is 0.  For such targets, you must define
-@code{FUNCTION_EPILOGUE_SIZE} to expand into the standard size of a
-function's epilogue.
-
 @item GCC_COMPILED_FLAG_SYMBOL
 @itemx GCC2_COMPILED_FLAG_SYMBOL
 @findex GCC2_COMPILED_FLAG_SYMBOL