libgloss: drop $(INCLUDES) when using $(AS)

Since $(AS) is the assembler, passing it a list of preprocessor include
flags doesn't make much sense.  The files aren't preprocessed which means
`#include` lines aren't respected, and while it would affect `.include`
usage, we never use that, and it's extremely unlikely to change.  Plus,
it's extremely unlikely we'd have .s files in common places to include vs
contained entirely within a specific arch dir, and at that point, it can
be included directly (with no flags), or the arch can add the unique set
of include paths that it needs for itself.

diff --git a/libgloss/config/default.mh b/libgloss/config/default.mh
index 81f0920f97a8964fa980da711dc39ba405a099f8..64dc02f05c644e689a4f4544a5d3be6a363b13aa 100644 (file)
--- a/libgloss/config/default.mh
+++ b/libgloss/config/default.mh
@@ -14,7 +14,7 @@ AR_FLAGS = rc
 .C.o:
        $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
 .s.o:
-       $(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
+       $(AS) $(ASFLAGS_FOR_TARGET) $(ASFLAGS) -o $*.o $<
 
 #
 # GCC knows to run the preprocessor on .S files before it assembles them.

diff --git a/libgloss/config/ppc.mh b/libgloss/config/ppc.mh
index a3d157bb8fd76f1a9464fd99b003be8cd2d2aec5..d1bfd7588e55333d04d233650586006d7ceeca7e 100644 (file)
--- a/libgloss/config/ppc.mh
+++ b/libgloss/config/ppc.mh
@@ -18,7 +18,7 @@ AR_FLAGS = qc
 .C.o:
        $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS_MRELOCATABLE) -O2 $(INCLUDES) -c $(CFLAGS) $<
 .s.o:
-       $(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
+       $(AS) $(ASFLAGS_FOR_TARGET) $(ASFLAGS) -o $*.o $<
 
 #
 # GCC knows to run the preprocessor on .S files before it assembles them.

diff --git a/libgloss/epiphany/Makefile.in b/libgloss/epiphany/Makefile.in
index 6cf55e25e69e5f62e382aa8fdd7143377dfb41aa..6670b79a08f192ef7fb7ead82bb29a48608c99eb 100644 (file)
--- a/libgloss/epiphany/Makefile.in
+++ b/libgloss/epiphany/Makefile.in
@@ -105,7 +105,7 @@ AR_FLAGS = qc
 .S.o:
        $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $(CFLAGS) $<
 .s.o:
-       $(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
+       $(AS) $(ASFLAGS_FOR_TARGET) $(ASFLAGS) -o $*.o $<
 
 #
 # GCC knows to run the preprocessor on .S files before it assembles them.

diff --git a/libgloss/hp74x/Makefile.in b/libgloss/hp74x/Makefile.in
index 12c51bf3bee7fa91017e399039b08fc411ca0b25..0167e1c62ee371a8fea3c0b88043ed3536b51564 100644 (file)
--- a/libgloss/hp74x/Makefile.in
+++ b/libgloss/hp74x/Makefile.in
@@ -117,7 +117,7 @@ install:
 
 .s.o:
        $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $<
-#      $(AS) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $<
+#      $(AS) $(CFLAGS_FOR_TARGET) -c $<
 
 .SUFFIXES: .S .c .o .s .lif
 #

diff --git a/libgloss/pru/Makefile.in b/libgloss/pru/Makefile.in
index 7a2f290a827c223cce08b46546252c2582580f6c..fc5905a5eaf406218e5b55ea52172804c5824445 100644 (file)
--- a/libgloss/pru/Makefile.in
+++ b/libgloss/pru/Makefile.in
@@ -89,7 +89,7 @@ LDFLAGS_FOR_TARGET = ${MULTILIB}
 .C.o:
        $(CC) $(CFLAGS_FOR_TARGET) -Os $(INCLUDES) -c $(CFLAGS) $<
 .s.o:
-       $(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
+       $(AS) $(ASFLAGS_FOR_TARGET) $(ASFLAGS) -o $*.o $<
 
 #
 # GCC knows to run the preprocessor on .S files before it assembles them.

diff --git a/libgloss/spu/Makefile.in b/libgloss/spu/Makefile.in
index bc8768baf183fe9cea89a881e66b866088c72a34..4be0783b987344133d9c95a1db9a8df12261c718 100644 (file)
--- a/libgloss/spu/Makefile.in
+++ b/libgloss/spu/Makefile.in
@@ -95,7 +95,7 @@ AR_FLAGS = qc
 .C.o:
        $(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
 .s.o:
-       $(AS) $(ASFLAGS_FOR_TARGET) $(INCLUDES) $(ASFLAGS) -o $*.o $<
+       $(AS) $(ASFLAGS_FOR_TARGET) $(ASFLAGS) -o $*.o $<
 
 #
 # GCC knows to run the preprocessor on .S files before it assembles them.