diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c
index 4cef5e9b8a..79b9af2875 100644
--- a/gas/config/obj-coff.c
+++ b/gas/config/obj-coff.c
@@ -2947,9 +2947,7 @@ write_object_file ()
 
   H_SET_STRING_SIZE (&headers, string_byte_count);
 
-  /* @@ Try this unconditionally for now.  Let me know if you encounter
-     cases that don't work.  -- Ken  */
-#if 1 /* !defined(TC_H8300) && !defined(TC_Z8K) */
+#if !defined(TC_H8300) && !defined(TC_Z8K)
   for (i = SEG_E0; i < SEG_UNKNOWN; i++)
     {
       fixup_mdeps (segment_info[i].frchainP->frch_root, &headers, i);
@@ -2991,6 +2989,10 @@ write_object_file ()
   TC_COFF_SET_MACHINE (&headers);
 #endif
 
+#ifndef COFF_FLAGS
+#define COFF_FLAGS 0
+#endif
+
 #ifdef KEEP_RELOC_INFO
   H_SET_FLAGS (&headers, ((H_GET_LINENO_SIZE(&headers) ? 0 : F_LNNO) |
 			  COFF_FLAGS | coff_flags));