diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4dd827e..697b11a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-23  Neil Booth  <neil@cat.daikokuya.demon.co.uk>
+
+	* objc/Make-lang.in (objc-act.o): Depend on debug.h.
+	* objc/objc-act.c: Include debug.h.
+	(synth_module_prologue): Save and restore debug hooks too.
+
 2001-07-23  lars brinkhoff  <lars@nocrew.org>
 
 	* tm.texi (TARGET_FLOAT_FORMAT): Document IBM_FLOAT_FORMAT
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index 501ddae..0d1fd1a 100644
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -80,7 +80,7 @@ objc-act.o : $(srcdir)/objc/objc-act.c \
    $(CONFIG_H) $(TREE_H) $(RTL_H) $(SYSTEM_H) $(EXPR_H) \
    $(srcdir)/c-tree.h $(srcdir)/c-common.h $(srcdir)/c-lex.h \
    $(srcdir)/toplev.h $(srcdir)/flags.h $(srcdir)/objc/objc-act.h \
-   $(srcdir)/input.h $(srcdir)/function.h $(srcdir)/output.h
+   $(srcdir)/input.h $(srcdir)/function.h $(srcdir)/output.h $(srcdir)/debug.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -I$(srcdir)/objc \
 	-c $(srcdir)/objc/objc-act.c
 
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 3a19d28..0b99ece 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -56,6 +56,7 @@ Boston, MA 02111-1307, USA.  */
 #include "toplev.h"
 #include "ggc.h"
 #include "cpplib.h"
+#include "debug.h"
 
 /* This is the default way of generating a method name.  */
 /* I am not sure it is really correct.
@@ -1377,12 +1378,15 @@ synth_module_prologue ()
 	  /* Suppress outputting debug symbols, because
 	     dbxout_init hasn'r been called yet.  */
 	  enum debug_info_type save_write_symbols = write_symbols;
+	  struct gcc_debug_hooks *save_hooks = debug_hooks;
 	  write_symbols = NO_DEBUG;
+	  debug_hooks = &do_nothing_debug_hooks;
 
 	  build_selector_template ();
 	  temp_type = build_array_type (objc_selector_template, NULL_TREE);
 
 	  write_symbols = save_write_symbols;
+	  debug_hooks = save_hooks;
 	}
       else
 	temp_type = build_array_type (selector_type, NULL_TREE);