Unconditionnaly disable -fcse-skip-blocks at -O2 on m68k, for it causes NULL

derefs in at least one case and I do not have time to debug this before the
release.
ok deraadt@

diff --git a/gnu/egcs/gcc/config/m68k/m68k.c b/gnu/egcs/gcc/config/m68k/m68k.c
index 72d305c..48aabd1 100644 (file)
--- a/gnu/egcs/gcc/config/m68k/m68k.c
+++ b/gnu/egcs/gcc/config/m68k/m68k.c
@@ -124,6 +124,13 @@ override_options ()
     }
   else
     m68k_align_funcs = def_align;
+
+#if defined(OPENBSD_NATIVE) || defined(OPENBSD_CROSS)
+  /* -fcse-skip-blocks causes NULL pointer dereferences in merge_blocks()
+     when invoked from delete_unreachable_blocks(). Disable it until the
+     real cause is found. */
+  flag_cse_skip_blocks = 0;
+#endif
 }
 \f
 /* This function generates the assembly code for function entry.