1999-07-19 Alexandre Oliva <oliva@dcc.unicamp.br>

	* Makefile.am (.s.lo): Avoid `#line' directives.
	* Makefile.in: Rebuilt.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28175 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/ChangeLog b/ChangeLog
index c157b9e01d260bc57280f380db9c21fa8e48dba1..40db8f39f8600b1ff720f5945aaabb8bf86eb70c 100644 (file)
--- a/ChangeLog
+++ b/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/Makefile.am b/Makefile.am
index 4f214f6daf0ede2c6f1a96ff68885bf156e30d4b..cb383d55913de15ad941b43d226f6f711b17e7df 100644 (file)
--- a/Makefile.am
+++ b/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/Makefile.in b/Makefile.in
index 83ede9c43cd9ebc1a1467fe46a95406915a96447..70ecbc45d96aaf02efbeda9a809a9416f6d71a1c 100644 (file)
--- a/Makefile.in
+++ b/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 \