diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index c157b9e01d2..40db8f39f86 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-19  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* Makefile.am (.s.lo): Avoid `#line' directives.
+	* Makefile.in: Rebuilt.
+
 1999-07-19  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
 	* Makefile.am (*-recursive, *-am, *-multi): Automake does not
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index 4f214f6daf0..cb383d55913 100644
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -55,7 +55,9 @@ $(all_objs) : config.h gc_priv.h gc_hdrs.h gc.h gc_mark.h
 
 ## FIXME: we shouldn't have to do this, but automake forces us to.
 .s.lo:
-	$(LTCOMPILE) -x assembler-with-cpp -c $<
+## We use -Wp,-P to strip #line directives.  Irix `as' chokes on
+## these.
+	$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
 
 ## We have our own definition of LTCOMPILE because we want to use our
 ## CFLAGS, not those passed in from the top level make.
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index 83ede9c43cd..70ecbc45d96 100644
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -487,7 +487,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 $(all_objs) : config.h gc_priv.h gc_hdrs.h gc.h gc_mark.h
 
 .s.lo:
-	$(LTCOMPILE) -x assembler-with-cpp -c $<
+	$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
 
 # Multilib support.
 .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \